releng: Upgrade target to dependencies of 2022-12 (Eclipse 4.26) release

Update also required Java version 17 for trace server and incubator RCP. Build with Java 17 by default as well. Update module-doc generation to use the correct doclet for Java 17. Change-Id: I17cddfff81f29afc1c52e024c2b152201bc976d6 Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com> Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/197688 Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org> Tested-by: Patrick Tasse <patrick.tasse@gmail.com> Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
eclipse-tracecompass-incubator · Dec 14, 2022 · 503b7e3 · 503b7e3
1 parent 7128110
commit 503b7e3
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 37 deletions.
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="tracecompass-incubator-master" sequenceNumber="61">
+<target name="tracecompass-incubator-master" sequenceNumber="62">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -9,7 +9,7 @@
 <unit id="org.eclipse.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/releases/10.7/cdt-10.7.0/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/11.0/cdt-11.0.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -18,16 +18,9 @@
 <repository location="https://download.eclipse.org/technology/swtbot/releases/3.1.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.compress" version="0.0.0"/>
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.commons.lang" version="0.0.0"/>
 <unit id="org.apache.xml.serializer" version="0.0.0"/>
 <unit id="org.apache.commons.math3" version="0.0.0"/>
-<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
-<unit id="org.hamcrest" version="0.0.0"/>
-<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
 <unit id="org.apache.felix.scr" version="0.0.0"/>
-<unit id="org.mozilla.javascript" version="0.0.0"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="0.0.0"/>
 <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
@@ -72,15 +65,27 @@
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="27.1.0.v20221112-0806"/>
+<unit id="jakarta.xml.bind" version="2.3.3.v20221112-0806"/>
+<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
+<unit id="org.antlr.runtime.source" version="3.2.0.v20220404-1927"/>
+<unit id="org.apache.commons.cli" version="0.0.0"/>
+<unit id="org.apache.commons.compress" version="0.0.0"/>
+<unit id="org.apache.commons.io" version="0.0.0"/>
+<unit id="org.apache.commons.lang" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<unit id="org.mozilla.javascript" version="1.7.10.v20221112-0806"/>
+<unit id="org.slf4j.api" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="javassist" version="0.0.0"/>
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
 <unit id="javax.annotation" version="1.2.0.v201602091430"/>
 <unit id="javax.servlet" version="0.0.0"/>
 <unit id="javax.xml.bind" version="0.0.0"/>
 <unit id="javax.xml.stream" version="0.0.0"/>
-<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
-<unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/>
-<unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
+<unit id="javax.servlet.jsp" version="0.0.0"/>
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
 <unit id="org.apache.derby" version="0.0.0"/>
 <unit id="org.json" version="0.0.0"/>
@@ -105,17 +110,17 @@
 <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
 <unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
 <unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
-<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/R-3.26.0-20220526191850/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.28.0/R-3.28.0-20221120050827/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
@@ -134,10 +139,10 @@
 <unit id="org.eclipse.tracecompass.lttng2.control.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.jsontrace.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.tmf.cli.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tracecompass/master/4.24/repository/"/>
+<repository location="https://download.eclipse.org/tracecompass/master/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/tracecompass/master/4.24/rcp-repository/"/>
+<repository location="https://download.eclipse.org/tracecompass/master/rcp-repository/"/>
 <unit id="org.eclipse.tracecompass.rcp.feature.group" version="0.0.0"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

diff --git a/pom.xml b/pom.xml
@@ -47,8 +47,8 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <testArgLine></testArgLine>
 
-    <jdk.version>11</jdk.version>
-    <jdk.release>11</jdk.release>
+    <jdk.version>17</jdk.version>
+    <jdk.release>17</jdk.release>
 
     <tycho-version>2.7.3</tycho-version>
     <tycho-extras-version>2.7.3</tycho-extras-version>

diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product b/rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product
@@ -29,11 +29,11 @@ SPDX-License-Identifier: EPL-2.0
       </programArgs>
       <programArgsLin>--launcher.GTK_version 3
       </programArgsLin>
-      <vmArgsLin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=11
+      <vmArgsLin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=17
       </vmArgsLin>
-      <vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=11 -Dorg.eclipse.swt.internal.carbon.smallFonts
+      <vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=17 -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
-      <vmArgsWin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=11
+      <vmArgsWin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=17
       </vmArgsWin>
    </launcherArgs>
 
@@ -51,10 +51,10 @@ SPDX-License-Identifier: EPL-2.0
    </launcher>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
       <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
    </vm>
 
    <license>

diff --git a/scripting/pom.xml b/scripting/pom.xml
@@ -56,15 +56,15 @@
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <version>2.9.1</version>
+                    <version>3.1.0</version>
                     <configuration>
                         <outputDirectory>${project.build.directory}/../mydocs </outputDirectory>
-                        <doclet>org.eclipse.ease.helpgenerator.V8ModuleDoclet</doclet>
+                        <doclet>org.eclipse.ease.helpgenerator.V9ModuleDoclet</doclet>
                         <docletPath>${doclet.path}</docletPath>
 			<additionalparam>-root ${basedir} -failOnHTMLError true
                                            -failOnMissingDocs true</additionalparam>
 
-                        <useStandardDocletOptions>true</useStandardDocletOptions>
+                        <useStandardDocletOptions>false</useStandardDocletOptions>
                         <excludePackageNames>org.eclipse.tracecompass.incubator.internal.*:*.test*</excludePackageNames>
                         <links>
                             <link>https://osgi.org/javadoc/r6/cmpn</link>

diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
@@ -3,6 +3,7 @@
 
 <product name="Trace Compass Trace Server (Jersey Rest)" uid="traceserver" id="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.id" application="org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.id" version="0.4.0.qualifier" useFeatures="false" includeLaunchers="true" autoIncludeRequirements="true">
 
+
    <configIni use="default">
    </configIni>
 
@@ -11,29 +12,30 @@
 -noSplash
 -data @noDefault
       </programArgs>
-      <programArgsLin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=11
+      <programArgsLin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=17
       </programArgsLin>
-      <programArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=11 -Dorg.eclipse.swt.internal.carbon.smallFonts
+      <programArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=17 -Dorg.eclipse.swt.internal.carbon.smallFonts
       </programArgsMac>
-      <programArgsWin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=11
+      <programArgsWin>-Xms512m -Xmx1024m  -Dosgi.requiredJavaVersion=17
       </programArgsWin>
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
       </vmArgsMac>
    </launcherArgs>
 
    <windowImages/>
 
+
    <launcher name="tracecompass-server">
       <win useIco="false">
          <bmp/>
       </win>
    </launcher>
 
+
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
-      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
    </vm>
 
    <license>
@@ -217,7 +219,16 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.json"/>
       <plugin id="org.junit"/>
       <plugin id="org.mozilla.javascript"/>
+      <plugin id="org.osgi.service.cm"/>
+      <plugin id="org.osgi.service.component"/>
+      <plugin id="org.osgi.service.device"/>
+      <plugin id="org.osgi.service.event"/>
+      <plugin id="org.osgi.service.metatype"/>
       <plugin id="org.osgi.service.prefs"/>
+      <plugin id="org.osgi.service.provisioning"/>
+      <plugin id="org.osgi.service.upnp"/>
+      <plugin id="org.osgi.service.useradmin"/>
+      <plugin id="org.osgi.service.wireadmin"/>
       <plugin id="org.osgi.util.function"/>
       <plugin id="org.osgi.util.measurement"/>
       <plugin id="org.osgi.util.position"/>

diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core.tests/META-INF/MANIFEST.MF b/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core.tests/META-INF/MANIFEST.MF
@@ -17,8 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.tracecompass.analysis.os.linux.core,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
  org.apache.commons.io,
- org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ftrace,
- org.junit.jupiter.api
+ org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ftrace
 Export-Package: org.eclipse.tracecompass.incubator.ftrace.core.tests,
  org.eclipse.tracecompass.incubator.ftrace.core.tests.event,
  org.eclipse.tracecompass.incubator.ftrace.core.tests.trace