releng: Upgrade target to dependencies of 2024-03 (Eclipse 4.31) release

Trace Compass 9.3.0 Signed-off-by: Patrick Tasse <[email protected]>
eclipse-tracecompass-incubator · Mar 22, 2024 · 45dabcc · 45dabcc
1 parent cbbd65c
commit 45dabcc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 25 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="74">
+<target name="tracecompass-incubator-master" sequenceNumber="75">
 <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/11.4/cdt-11.4.0/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/11.5/cdt-11.5.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"/>
@@ -36,10 +36,12 @@
 <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
 <unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="0.0.0"/>
 <unit id="com.google.gson" version="0.0.0"/>
-<unit id="com.google.guava" version="32.1.3.jre"/>
+<unit id="com.google.guava" version="33.0.0.jre"/>
 <unit id="com.sun.xml.bind.jaxb-osgi" version="2.3.9"/>
 <unit id="jakarta.activation-api" version="1.2.2"/>
+<unit id="jakarta.el-api" version="5.0.1"/>
 <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
+<unit id="jakarta.servlet.jsp-api" version="3.1.1"/>
 <unit id="jakarta.servlet-api" version="0.0.0"/>
 <unit id="jakarta.xml.bind-api" version="2.3.3"/>
 <unit id="jakarta.ws.rs-api" version="2.1.6"/>
@@ -56,30 +58,30 @@
 <unit id="org.apache.commons.math3" version="0.0.0"/>
 <unit id="org.apache.xml.serializer" version="0.0.0"/>
 <unit id="org.eclipse.jetty.servlet-api" version="0.0.0"/>
-<unit id="org.glassfish.hk2.api" version="0.0.0"/>
-<unit id="org.glassfish.hk2.api.source" version="0.0.0"/>
-<unit id="org.glassfish.hk2.locator" version="0.0.0"/>
-<unit id="org.glassfish.hk2.locator.source" version="0.0.0"/>
-<unit id="org.glassfish.hk2.utils" version="0.0.0"/>
-<unit id="org.glassfish.hk2.utils.source" version="0.0.0"/>
-<unit id="org.glassfish.jersey.containers.jersey-container-servlet" version="0.0.0"/>
-<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"/>
-<unit id="org.glassfish.jersey.core.jersey-common.source" version="0.0.0"/>
-<unit id="org.glassfish.jersey.core.jersey-server" version="0.0.0"/>
-<unit id="org.glassfish.jersey.core.jersey-server.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.jersey.media.jersey-media-json-jackson" version="0.0.0"/>
-<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="0.0.0"/>
+<unit id="org.glassfish.hk2.api" version="2.6.1"/>
+<unit id="org.glassfish.hk2.api.source" version="2.6.1"/>
+<unit id="org.glassfish.hk2.locator" version="2.6.1"/>
+<unit id="org.glassfish.hk2.locator.source" version="2.6.1"/>
+<unit id="org.glassfish.hk2.utils" version="2.6.1"/>
+<unit id="org.glassfish.hk2.utils.source" version="2.6.1"/>
+<unit id="org.glassfish.jersey.containers.jersey-container-servlet" version="2.41.0"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.41.0"/>
+<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.41.0"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.41.0"/>
+<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.41.0"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.41.0"/>
+<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.41.0"/>
+<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.41.0"/>
+<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.41.0"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.41.0"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.41.0"/>
 <unit id="org.hamcrest" version="0.0.0"/>
 <unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
 <unit id="org.mozilla.rhino" version="1.7.14"/>
 <unit id="slf4j.api" version="0.0.0"/>
 <unit id="slf4j.simple" version="0.0.0"/>
 <unit id="org.yaml.snakeyaml" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0/"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -100,17 +102,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.30/R-4.30-202312010110/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/"/>
 </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.32.0/R-3.32.0-20231114230950/repository/"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/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.36.0/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.37.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>

diff --git a/...g.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/META-INF/MANIFEST.MF b/...g.eclipse.tracecompass.incubator.trace.server.jersey.rest.core.tests/META-INF/MANIFEST.MF
@@ -33,6 +33,7 @@ Import-Package: com.fasterxml.jackson.annotation,
  com.fasterxml.jackson.jaxrs.json,
  com.google.common.base,
  com.google.common.collect,
+ jakarta.ws.rs.core,
  javax.ws.rs,
  javax.ws.rs.client,
  javax.ws.rs.core,

diff --git a/...mpass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderServiceTest.java b/...mpass/incubator/trace/server/jersey/rest/core/tests/services/DataProviderServiceTest.java
@@ -603,7 +603,6 @@ public void testTableDataProvider() throws InterruptedException {
      */
     @Test
     public void testTimeGraphMetaDataSerializer() {
-        @SuppressWarnings("resource")
         Response treeResponse = null;
         try {
             ExperimentModelStub exp = assertPostExperiment(CONTEXT_SWITCHES_UST_STUB.getName(), CONTEXT_SWITCHES_UST_STUB);

diff --git a/...ver/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF b/...ver/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
@@ -43,6 +43,7 @@ Import-Package: com.fasterxml.jackson.module.jaxb,
  com.google.common.base,
  com.google.common.collect,
  com.google.common.primitives,
+ jakarta.ws.rs.core,
  javax.annotation,
  javax.validation;version="2.0.2",
  javax.validation.bootstrap;version="2.0.2",