Skip to content

Commit

Permalink
releng: Upgrade to dependencies of 2022-06 release (Eclipse 4.24)
Browse files Browse the repository at this point in the history 
Change-Id: I1f2861319a099344f1cdaf700be98145920ddd09
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/194369
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
@PatrickTasse
PatrickTasse committed Jun 23, 2022
1 parent 320552a commit 876112b
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 45 deletions.
108 changes: 64 additions & 44 deletions common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="tracecompass-incubator-master" sequenceNumber="57">
<target name="tracecompass-incubator-master" sequenceNumber="58">
<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"/>
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/cdt/releases/10.6/cdt-10.6.0/"/>
<unit id="org.eclipse.remote.core" version="0.0.0"/>
<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/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
Expand All @@ -14,30 +18,14 @@
<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.eclipse.remote.core" version="0.0.0"/>
<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/ptp/builds/remote/3.0/2021-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<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="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.commons.lang3" 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.json" version="0.0.0"/>
<unit id="org.apache.derby" version="0.0.0"/>
<unit id="org.hamcrest" version="0.0.0"/>
<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
<unit id="javax.xml.bind" version="0.0.0"/>
<unit id="javax.activation" version="1.1.0.v201211130549"/>
<unit id="javax.xml.stream" version="0.0.0"/>
<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"/>
Expand All @@ -54,10 +42,7 @@
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="0.0.0"/>
<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="javassist" version="0.0.0"/>
<unit id="javax.annotation" version="1.2.0.v201602091430"/>
<unit id="javax.inject" version="0.0.0"/>
<unit id="javax.servlet" version="0.0.0"/>
<unit id="javax.ws.rs" version="0.0.0"/>
<unit id="org.aopalliance" version="0.0.0"/>
<unit id="org.glassfish.hk2.api" version="0.0.0"/>
Expand All @@ -84,6 +69,21 @@
<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="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="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/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
Expand All @@ -104,17 +104,17 @@
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<unit id="org.eclipse.ui.views.log" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.23/R-4.23-202203080310/"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</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.25.0/R-3.25.0-20220224093948/repository/"/>
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/R-3.26.0-20220526191850/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.29/"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtchart.feature.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -171,34 +171,54 @@
<repository location="https://archive.eclipse.org/tracecompass/tracecompass-test-traces/repository/1.8.0/"/>
</location>
<location includeDependencyScope="provided" includeSource="true" missingManifest="generate" type="Maven">
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<type>jar</type>
<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyScope="provided" includeSource="true" missingManifest="generate" type="Maven">
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.3</version>
<type>jar</type>
<dependencies>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>2.3.3</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyScope="provided" includeSource="true" missingManifest="generate" type="Maven">
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>2.0.2</version>
<type>jar</type>
<dependencies>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>2.0.2</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyScope="provided" includeSource="true" missingManifest="generate" type="Maven">
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
<version>2.30</version>
<type>jar</type>
<dependencies>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
<version>2.30</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyScope="provided" includeSource="true" missingManifest="generate" type="Maven">
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>2.1.13</version>
<type>jar</type>
<dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-jaxrs2</artifactId>
<version>2.1.13</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"/>
Expand Down
8 changes: 7 additions & 1 deletion trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<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.2.0.qualifier" useFeatures="false" includeLaunchers="true">
<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.2.0.qualifier" useFeatures="false" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>
Expand Down Expand Up @@ -216,6 +216,12 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="org.hamcrest.core"/>
<plugin id="org.json"/>
<plugin id="org.junit"/>
<plugin id="org.osgi.service.prefs"/>
<plugin id="org.osgi.util.function"/>
<plugin id="org.osgi.util.measurement"/>
<plugin id="org.osgi.util.position"/>
<plugin id="org.osgi.util.promise"/>
<plugin id="org.osgi.util.xml"/>
<plugin id="org.slf4j.api"/>
<plugin id="org.yaml.snakeyaml"/>
</plugins>
Expand Down

0 comments on commit 876112b

Please sign in to comment.