Skip to content

Commit

Permalink
releng: Upgrade to current latest Orbit (2023-06)
Browse files Browse the repository at this point in the history 
Upgrade to the current latest Orbit drop R20230531010532.

Finishing upgrading from R20220302172233 to R20230302014618 solely
doesn't suffice for the goal of this change.

Adapt to the currently used versions of org.eclipse.jetty and
javax.servlet, without pinning Jetty's version anymore.

Since Orbit R20220531185310, javax.servlet is no longer provided as a
bundle. Use a Maven location to download it for now. Do the same for the
other related org.javassist, to finish building the change successfully.

Adapt both e4.20 and master target files for this. The former can be
used by means of copying [1] and [3] as [2] and [4] respectively,
locally. This change adapts [3] similarly to [4], except for the
javax.xml.bind removal which only [4] requires to build. Below [5] and
[6] show which Maven options to use for building.

Add jakarta.activation-api to the incubator.rcp feature and pom. Without
this, using the Jaeger dialog generates exceptions about related missing
classes. This happens when using the rcp binary only, so not from within
the IDE. That dialog is opened from the right-click menu on the Traces
folder while in the application.

[1]rcp/org.eclipse.tracecompass.incubator.rcp.product/legacy/tracing.incubator.product
[2]rcp/org.eclipse.tracecompass.incubator.rcp.product/tracing.incubator.product
[3]trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
[4]trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
[5]https://ci.eclipse.org/tracecompass/job/tracecompass-master-nightly-2021-06/configure
[6]https://ci.eclipse.org/tracecompass/job/tracecompass-incubator-nightly-2021-06/configure

Change-Id: Icc8d254c1a4b8705a36e4daa7cf7b351913a1fe2
Signed-off-by: Marco Miller <marco.miller@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/202433
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
  • Loading branch information
@marco-miller
marco-miller committed Jun 21, 2023
1 parent dbec39d commit 7319667
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 34 deletions.
16 changes: 12 additions & 4 deletions common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.20.target
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="tracecompass-incubator-e4.20" sequenceNumber="6">
<target name="tracecompass-incubator-e4.20" sequenceNumber="7">
<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"/>
Expand Down Expand Up @@ -42,10 +42,8 @@
<unit id="javax.ws.rs" 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="javax.servlet.jsp" 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="0.0.0"/>
Expand Down Expand Up @@ -223,11 +221,21 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<launcherArgs>
<vmArgs>-Xms40m
-Xmx512M</vmArgs>
<programArgs>-consolelog</programArgs>
</launcherArgs>
</target>
</target>
45 changes: 26 additions & 19 deletions common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="tracecompass-incubator-master" sequenceNumber="70">
<target name="tracecompass-incubator-master" sequenceNumber="71">
<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"/>
Expand Down Expand Up @@ -45,8 +45,8 @@
<unit id="org.glassfish.hk2.utils.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.inject.jersey-hk2" version="0.0.0"/>
<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="0.0.0"/>
<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3.v20200509-0149"/>
<unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.3.v20200509-0149"/>
<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3.v20221203-1659"/>
<unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.3.v20221203-1659"/>
<unit id="org.glassfish.jersey.core.jersey-client" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-client.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.core.jersey-common" version="0.0.0"/>
Expand All @@ -61,9 +61,6 @@
<unit id="org.glassfish.jersey.containers.servlet.core.source" version="0.0.0"/>
<unit id="org.glassfish.jersey.ext.entityfiltering" version="0.0.0"/>
<unit id="org.glassfish.jersey.ext.entityfiltering.source" version="0.0.0"/>
<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="30.1.0.v20221112-0806"/>
<unit id="jakarta.xml.bind" version="2.3.3.v20221203-1659"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
Expand All @@ -76,20 +73,10 @@
<unit id="org.mozilla.javascript" version="1.7.10.v20221112-0806"/>
<unit id="org.slf4j.api" version="0.0.0"/>
<unit id="org.slf4j.binding.simple" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/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="javax.servlet.jsp" version="0.0.0"/>
<unit id="javax.activation" version="1.2.2.v20221203-1659"/>
<unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
<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"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -226,6 +213,26 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.29.2-GA</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<launcherArgs>
Expand Down
7 changes: 7 additions & 0 deletions rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml
View file
Expand Up @@ -49,6 +49,13 @@
<import feature="org.eclipse.platform" version="0.0.0" match="greaterOrEqual"/>
</requires>

<plugin
id="jakarta.activation-api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="javax.ws.rs"
download-size="0"
Expand Down
1 change: 1 addition & 0 deletions rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
View file
Expand Up @@ -38,6 +38,7 @@
</goals>
<configuration>
<excludes>
<plugin id="jakarta.activation-api"/>
<plugin id="javax.ws.rs"/>
<plugin id="org.eclipse.lsp4j"/>
<plugin id="org.eclipse.lsp4j.jsonrpc"/>
Expand Down
11 changes: 5 additions & 6 deletions ...ver/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
View file
Expand Up @@ -10,11 +10,11 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jetty.http;bundle-version="9.4.5",
org.eclipse.jetty.server;bundle-version="9.4.5",
org.eclipse.jetty.servlet;bundle-version="9.4.5",
org.eclipse.jetty.util;bundle-version="9.4.5",
javax.servlet;bundle-version="3.1.0",
org.eclipse.jetty.http,
org.eclipse.jetty.server,
org.eclipse.jetty.servlet,
org.eclipse.jetty.util,
javax.servlet-api,
javax.ws.rs,
org.eclipse.tracecompass.common.core,
org.eclipse.tracecompass.tmf.core,
Expand All @@ -29,7 +29,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.glassfish.hk2.api,
org.glassfish.jersey.containers.servlet.core,
org.aopalliance,
javax.servlet.jsp,
com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider,
com.fasterxml.jackson.core.jackson-annotations,
com.fasterxml.jackson.core.jackson-core,
Expand Down
3 changes: 1 addition & 2 deletions ...server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
View file
Expand Up @@ -121,8 +121,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="javax.annotation"/>
<plugin id="javax.el"/>
<plugin id="javax.inject"/>
<plugin id="javax.servlet"/>
<plugin id="javax.servlet.jsp"/>
<plugin id="javax.servlet-api"/>
<plugin id="javax.ws.rs"/>
<plugin id="javax.xml"/>
<plugin id="javax.xml.bind"/>
Expand Down
4 changes: 1 addition & 3 deletions trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
View file
Expand Up @@ -121,11 +121,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="javax.annotation"/>
<plugin id="javax.el-api"/>
<plugin id="javax.inject"/>
<plugin id="javax.servlet"/>
<plugin id="javax.servlet.jsp"/>
<plugin id="javax.servlet-api"/>
<plugin id="javax.ws.rs"/>
<plugin id="javax.xml"/>
<plugin id="javax.xml.bind"/>
<plugin id="javax.xml.stream"/>
<plugin id="org.antlr.runtime"/>
<plugin id="org.aopalliance"/>
Expand Down

0 comments on commit 7319667

Please sign in to comment.