restore compatibility with eclipse 2023-12

fix #198
15knots · Dec 22, 2023 · 39df3d2 · 39df3d2
1 parent b3429d2
commit 39df3d2
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 70 deletions.
diff --git a/de.marw.cmake4eclipse.mbs.ui/META-INF/MANIFEST.MF b/de.marw.cmake4eclipse.mbs.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %bundleName
 Bundle-SymbolicName: de.marw.cmake4eclipse.mbs.ui;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: Martin Weber
 Bundle-Localization: plugin
 Automatic-Module-Name: de.marw.cmake4eclipse.mbs.ui
@@ -33,6 +33,7 @@ Import-Package: com.google.gson;version="2.8.7",
  org.eclipse.swt.graphics,
  org.eclipse.swt.layout,
  org.eclipse.swt.widgets,
+ org.eclipse.tools.templates.core,
  org.eclipse.ui,
  org.eclipse.ui.actions,
  org.eclipse.ui.dialogs,

diff --git a/de.marw.cmake4eclipse.mbs.ui/pom.xml b/de.marw.cmake4eclipse.mbs.ui/pom.xml
@@ -12,6 +12,6 @@
   <artifactId>de.marw.cmake4eclipse.mbs.ui</artifactId>
   <!-- always use .qualifier in manifest, we do not plan to publish this plugin
     to a maven repo. (The repository version is a different thing) -->
-  <version>2.2.0-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/de.marw.cmake4eclipse.mbs/META-INF/MANIFEST.MF b/de.marw.cmake4eclipse.mbs/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %bundleName
 Bundle-Description: CDT CMake build integration
 Bundle-Copyright: 2013 Martin Weber
 Bundle-SymbolicName: de.marw.cmake4eclipse.mbs;singleton:=true
-Bundle-Version: 2.0.4.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Vendor: Martin Weber
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
@@ -17,7 +17,7 @@ Import-Package: com.google.gson;version="2.8.7",
  org.eclipse.core.runtime.jobs,
  org.eclipse.core.runtime.preferences;version="3.4.0",
  org.eclipse.e4.core.contexts;version="1.7.0",
- org.eclipse.jetty.util;version="[10.0.12,12.0.0)",
+ org.eclipse.jetty.util;version="[12.0.0,13.0.0)",
  org.osgi.framework,
  org.osgi.service.prefs;version="1.1.1"
 Bundle-Activator: de.marw.cmake4eclipse.mbs.internal.Activator
@@ -29,8 +29,9 @@ Export-Package: de.marw.cmake4eclipse.mbs.cmakecache,
  de.marw.cmake4eclipse.mbs.preferences;x-friends:="de.marw.cmake4eclipse.mbs.ui",
  de.marw.cmake4eclipse.mbs.settings
 Automatic-Module-Name: de.marw.cmake4eclipse.mbs
-Require-Bundle: org.eclipse.cdt.core;bundle-version="[8.0.0,8.4.0)",
- org.eclipse.cdt.managedbuilder.core;bundle-version="[9.5.0,9.6.200)",
+Require-Bundle: org.eclipse.cdt.core;bundle-version="8.3.0",
+ org.eclipse.cdt.managedbuilder.core;bundle-version="9.6.200",
  org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0",
  org.eclipse.core.variables,
- org.eclipse.jdt.annotation;bundle-version="2.2.700";resolution:=optional
+ org.eclipse.jdt.annotation;resolution:=optional,
+ org.eclipse.cdt.managedbuilder.gnu.ui
diff --git a/de.marw.cmake4eclipse.mbs/pom.xml b/de.marw.cmake4eclipse.mbs/pom.xml
@@ -12,6 +12,6 @@
   <artifactId>de.marw.cmake4eclipse.mbs</artifactId>
   <!-- always use .qualifier in manifest, we do not plan to publish this plugin
     to a maven repo. (The repository version is a different thing) -->
-  <version>2.0.4-SNAPSHOT</version>
+  <version>3.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/...ke4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java b/...ke4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java
@@ -19,9 +19,9 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.EnumSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
-import java.util.StringTokenizer;
 import java.util.function.Predicate;
 
 import org.eclipse.cdt.core.CCorePlugin;
@@ -565,9 +565,9 @@ private List<String> buildCommandline(IPath srcDir, Optional<BuildToolKitDefinit
       String otherArguments = prefs.getOtherArguments();
       if (otherArguments != null) {
         // handle Unix shell quoting
-        StringTokenizer tokenizer = new QuotedStringTokenizer(otherArguments, " \t\n\r\f");
-        while (tokenizer.hasMoreTokens()) {
-          args.add(tokenizer.nextToken());
+        QuotedStringTokenizer tokenizer = QuotedStringTokenizer.builder().delimiters( " \t\n\r\f").build();
+        for (Iterator<String> iter = tokenizer.tokenize(otherArguments); iter.hasNext();) {
+          args.add(iter.next());
         }
       }
     }

diff --git a/releng/cmake4eclipse.launch b/releng/cmake4eclipse.launch
@@ -9,11 +9,11 @@
     <booleanAttribute key="clearConfig" value="true"/>
     <booleanAttribute key="clearws" value="true"/>
     <booleanAttribute key="clearwslog" value="true"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/cmake4eclipse"/>
+    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/cmake4eclipse-2023-12"/>
     <booleanAttribute key="default" value="false"/>
     <setAttribute key="deselected_workspace_bundles"/>
     <booleanAttribute key="generateProfile" value="true"/>
-    <booleanAttribute key="includeOptional" value="true"/>
+    <booleanAttribute key="includeOptional" value="false"/>
     <stringAttribute key="location" value="${system_property:user.home}/.cache/runtime-cmake4eclipse"/>
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
@@ -27,71 +27,62 @@
     <stringAttribute key="product" value="org.eclipse.sdk.ide"/>
     <setAttribute key="selected_target_bundles">
         <setEntry value="bcpg@default:default"/>
+        <setEntry value="bcpkix@default:default"/>
         <setEntry value="bcprov@default:default"/>
+        <setEntry value="bcutil@default:default"/>
         <setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
         <setEntry value="com.fasterxml.jackson.core.jackson-core@default:default"/>
         <setEntry value="com.fasterxml.jackson.core.jackson-databind@default:default"/>
+        <setEntry value="com.fasterxml.jackson.module.jackson-module-jaxb-annotations@default:default"/>
+        <setEntry value="com.github.jnr.a64asm@default:default"/>
         <setEntry value="com.github.jnr.constants@default:default"/>
         <setEntry value="com.github.jnr.enxio@default:default"/>
         <setEntry value="com.github.jnr.ffi@default:default"/>
         <setEntry value="com.github.jnr.jffi.native@default:false"/>
         <setEntry value="com.github.jnr.jffi@default:default"/>
         <setEntry value="com.github.jnr.posix@default:default"/>
         <setEntry value="com.github.jnr.unixsocket@default:default"/>
-        <setEntry value="com.github.jnr.x86asm@default:default"/>
-        <setEntry value="com.google.auth.google-auth-library-credentials@default:default"/>
-        <setEntry value="com.google.auth.oauth2-http@default:default"/>
-        <setEntry value="com.google.auto.value.auto-value-annotations@default:default"/>
         <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava.failureaccess@default:default"/>
         <setEntry value="com.google.guava@default:default"/>
-        <setEntry value="com.google.http-client.google-http-client-jackson2@default:default"/>
-        <setEntry value="com.google.http-client.google-http-client@default:default"/>
-        <setEntry value="com.google.j2objc.j2objc-annotations@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.jcraft.jsch@default:default"/>
+        <setEntry value="com.sun.el.javax.el@default:default"/>
         <setEntry value="com.sun.jna.platform@default:default"/>
         <setEntry value="com.sun.jna@default:default"/>
         <setEntry value="com.sun.xml.bind@default:default"/>
-        <setEntry value="io.grpc.grpc-context@default:default"/>
-        <setEntry value="io.opencensus.opencensus-api@default:default"/>
-        <setEntry value="io.opencensus.opencensus-contrib-http-util@default:default"/>
         <setEntry value="jakarta.activation@default:default"/>
-        <setEntry value="jakarta.servlet-api@default:default"/>
-        <setEntry value="jakarta.xml.bind@default:default"/>
+        <setEntry value="jakarta.annotation-api@default:default"/>
+        <setEntry value="jakarta.inject.jakarta.inject-api@default:default"/>
+        <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="javassist@default:default"/>
         <setEntry value="javax.activation@default:default"/>
         <setEntry value="javax.annotation@default:default"/>
-        <setEntry value="javax.el@default:default"/>
         <setEntry value="javax.inject@default:default"/>
-        <setEntry value="javax.servlet.jsp-api@default:default"/>
         <setEntry value="javax.ws.rs@default:default"/>
-        <setEntry value="javax.xml@default:default"/>
+        <setEntry value="jnr.x86asm@default:default"/>
         <setEntry value="org.aopalliance@default:default"/>
         <setEntry value="org.apache.ant@default:default"/>
+        <setEntry value="org.apache.aries.spifly.dynamic.bundle@default:default"/>
         <setEntry value="org.apache.batik.constants@default:default"/>
         <setEntry value="org.apache.batik.css@default:default"/>
         <setEntry value="org.apache.batik.i18n@default:default"/>
         <setEntry value="org.apache.batik.util@default:default"/>
-        <setEntry value="org.apache.commons.codec@default:default"/>
-        <setEntry value="org.apache.commons.compress@default:default"/>
-        <setEntry value="org.apache.commons.io@default:default"/>
+        <setEntry value="org.apache.commons.commons-compress@default:default"/>
+        <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.jxpath@default:default"/>
-        <setEntry value="org.apache.commons.lang@default:default"/>
         <setEntry value="org.apache.commons.logging@default:default"/>
         <setEntry value="org.apache.felix.gogo.command@default:default"/>
         <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
         <setEntry value="org.apache.felix.gogo.shell@default:default"/>
         <setEntry value="org.apache.felix.scr@1:true"/>
         <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
         <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
-        <setEntry value="org.apache.jasper.glassfish@default:default"/>
-        <setEntry value="org.apache.lucene.analyzers-common@default:default"/>
-        <setEntry value="org.apache.lucene.analyzers-smartcn@default:default"/>
+        <setEntry value="org.apache.lucene.analysis-common@default:default"/>
+        <setEntry value="org.apache.lucene.analysis-smartcn@default:default"/>
         <setEntry value="org.apache.lucene.core@default:default"/>
         <setEntry value="org.apache.xmlgraphics@default:default"/>
         <setEntry value="org.apiguardian.api@default:default"/>
-        <setEntry value="org.bouncycastle.bcpkix@default:default"/>
-        <setEntry value="org.bouncycastle.bcutil@default:default"/>
         <setEntry value="org.eclipse.ant.core@default:default"/>
         <setEntry value="org.eclipse.cdt.core.linux.x86_64@default:false"/>
         <setEntry value="org.eclipse.cdt.core.linux@default:false"/>
@@ -104,7 +95,6 @@
         <setEntry value="org.eclipse.cdt.dsf.gdb@default:default"/>
         <setEntry value="org.eclipse.cdt.dsf.ui@default:default"/>
         <setEntry value="org.eclipse.cdt.dsf@default:default"/>
-        <setEntry value="org.eclipse.cdt.gdb.ui@default:default"/>
         <setEntry value="org.eclipse.cdt.gdb@default:default"/>
         <setEntry value="org.eclipse.cdt.jsoncdb.core.doc@default:default"/>
         <setEntry value="org.eclipse.cdt.jsoncdb.core.ui@default:default"/>
@@ -170,9 +160,6 @@
         <setEntry value="org.eclipse.equinox.common@2:true"/>
         <setEntry value="org.eclipse.equinox.console@default:default"/>
         <setEntry value="org.eclipse.equinox.event@default:default"/>
-        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>
-        <setEntry value="org.eclipse.equinox.http.registry@default:default"/>
-        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>
         <setEntry value="org.eclipse.equinox.jsp.jasper.registry@default:default"/>
         <setEntry value="org.eclipse.equinox.jsp.jasper@default:default"/>
         <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
@@ -191,16 +178,10 @@
         <setEntry value="org.eclipse.help.webapp@default:default"/>
         <setEntry value="org.eclipse.help@default:default"/>
         <setEntry value="org.eclipse.jdt.annotation@default:default"/>
-        <setEntry value="org.eclipse.jdt.core@default:default"/>
-        <setEntry value="org.eclipse.jetty.http@default:default"/>
-        <setEntry value="org.eclipse.jetty.io@default:default"/>
-        <setEntry value="org.eclipse.jetty.security@default:default"/>
-        <setEntry value="org.eclipse.jetty.server@default:default"/>
-        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
-        <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
+        <setEntry value="org.eclipse.jdt.core.compiler.batch@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
         <setEntry value="org.eclipse.jetty.util@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
-        <setEntry value="org.eclipse.jface.notifications@default:default"/>
         <setEntry value="org.eclipse.jface.text@default:default"/>
         <setEntry value="org.eclipse.jface@default:default"/>
         <setEntry value="org.eclipse.launchbar.core@default:default"/>
@@ -209,10 +190,11 @@
         <setEntry value="org.eclipse.linuxtools.docker.ui@default:default"/>
         <setEntry value="org.eclipse.ltk.core.refactoring@default:default"/>
         <setEntry value="org.eclipse.ltk.ui.refactoring@default:default"/>
+        <setEntry value="org.eclipse.orbit.xml-apis-ext@default:default"/>
         <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
         <setEntry value="org.eclipse.osgi.services@default:default"/>
-        <setEntry value="org.eclipse.osgi.util@default:default"/>
-        <setEntry value="org.eclipse.osgi@-1:true"/>
+        <setEntry value="org.eclipse.osgi@1:true"/>
+        <setEntry value="org.eclipse.search.core@default:default"/>
         <setEntry value="org.eclipse.search@default:default"/>
         <setEntry value="org.eclipse.swt.gtk.linux.x86_64@default:false"/>
         <setEntry value="org.eclipse.swt@default:default"/>
@@ -228,7 +210,6 @@
         <setEntry value="org.eclipse.ui.console@default:default"/>
         <setEntry value="org.eclipse.ui.editors@default:default"/>
         <setEntry value="org.eclipse.ui.forms@default:default"/>
-        <setEntry value="org.eclipse.ui.genericeditor@default:default"/>
         <setEntry value="org.eclipse.ui.ide.application@default:default"/>
         <setEntry value="org.eclipse.ui.ide@default:default"/>
         <setEntry value="org.eclipse.ui.navigator.resources@default:default"/>
@@ -244,22 +225,24 @@
         <setEntry value="org.glassfish.hk2.locator@default:default"/>
         <setEntry value="org.glassfish.hk2.osgi-resource-locator@default:default"/>
         <setEntry value="org.glassfish.hk2.utils@default:default"/>
-        <setEntry value="org.glassfish.jersey.apache.connector@default:default"/>
-        <setEntry value="org.glassfish.jersey.containers.servlet.core@default:default"/>
-        <setEntry value="org.glassfish.jersey.containers.servlet@default:default"/>
+        <setEntry value="org.glassfish.jersey.connectors.jersey-apache-connector@default:default"/>
+        <setEntry value="org.glassfish.jersey.containers.jersey-container-servlet-core@default:default"/>
+        <setEntry value="org.glassfish.jersey.containers.jersey-container-servlet@default:default"/>
         <setEntry value="org.glassfish.jersey.core.jersey-client@default:default"/>
         <setEntry value="org.glassfish.jersey.core.jersey-common@default:default"/>
         <setEntry value="org.glassfish.jersey.core.jersey-server@default:default"/>
-        <setEntry value="org.glassfish.jersey.ext.entityfiltering@default:default"/>
+        <setEntry value="org.glassfish.jersey.ext.jersey-entity-filtering@default:default"/>
         <setEntry value="org.glassfish.jersey.inject.jersey-hk2@default:default"/>
         <setEntry value="org.glassfish.jersey.media.jersey-media-json-jackson@default:default"/>
-        <setEntry value="org.hamcrest.core*1.1.0.v20090501071000@default:default"/>
         <setEntry value="org.hamcrest.core*1.3.0.v20180420-1519@default:default"/>
+        <setEntry value="org.junit*4.13.0.v20200204-1500@default:default"/>
         <setEntry value="org.junit.platform.commons@default:default"/>
         <setEntry value="org.junit.platform.engine@default:default"/>
         <setEntry value="org.junit.platform.launcher@default:default"/>
         <setEntry value="org.mandas.docker-client@default:default"/>
-        <setEntry value="org.objectweb.asm.analysis@default:default"/>
+        <setEntry value="org.mortbay.jasper.apache-jsp@default:default"/>
+        <setEntry value="org.objectweb.asm.commons@default:default"/>
+        <setEntry value="org.objectweb.asm.tree.analysis@default:default"/>
         <setEntry value="org.objectweb.asm.tree@default:default"/>
         <setEntry value="org.objectweb.asm.util@default:default"/>
         <setEntry value="org.objectweb.asm@default:default"/>
@@ -275,16 +258,9 @@
         <setEntry value="org.osgi.service.useradmin@default:default"/>
         <setEntry value="org.osgi.service.wireadmin@default:default"/>
         <setEntry value="org.osgi.util.function@default:default"/>
-        <setEntry value="org.osgi.util.measurement@default:default"/>
-        <setEntry value="org.osgi.util.position@default:default"/>
         <setEntry value="org.osgi.util.promise@default:default"/>
-        <setEntry value="org.osgi.util.xml@default:default"/>
         <setEntry value="org.slf4j.api@default:default"/>
         <setEntry value="org.tukaani.xz@default:default"/>
-        <setEntry value="org.w3c.css.sac@default:default"/>
-        <setEntry value="org.w3c.dom.events@default:default"/>
-        <setEntry value="org.w3c.dom.smil@default:default"/>
-        <setEntry value="org.w3c.dom.svg@default:default"/>
     </setAttribute>
     <setAttribute key="selected_workspace_bundles">
         <setEntry value="de.marw.cmake4eclipse.mbs.ui@default:default"/>

diff --git a/releng/targetplatform/targetplatform.target b/releng/targetplatform/targetplatform.target
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt/11.0-eclipse/2022-12" sequenceNumber="25">
+<target name="cdt/11.4-eclipse/2023-12" sequenceNumber="25">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-    <repository location="https://download.eclipse.org/releases/2022-12/202212071000"/>
+    <repository location="https://download.eclipse.org/releases/2023-12/202312061001"/>
 	<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
 	<unit id="org.eclipse.rcp.source.feature.group" version="0.0.0"/>
 	<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 	<unit id="org.eclipse.platform.source.feature.group" version="0.0.0"/>
 	<unit id="org.eclipse.cdt.docker.launcher.feature.group" version="0.0.0"/>
 </location>
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <repository location="https://download.eclipse.org/tools/cdt/releases/11.0"/>
+      <repository location="https://download.eclipse.org/tools/cdt/releases/11.4"/>
       <unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.cdt.jsoncdb.arm" version="0.0.0"/>
@@ -89,6 +89,6 @@
 <vmArgs>-Xms40m
 -Xmx512M
 -XX:MaxPermSize=256m</vmArgs>
-<programArgs>-consolelog</programArgs>
+<programArgs>-consolelog -console</programArgs>
 </launcherArgs>
 </target>