Skip to content

Commit 3e335c3

Browse files
bhufmannbhufmann
committed
Fix 2024-12 (e4.34) build for generated TSP Java client
The TSP Java Client generated by openapi-generator-maven-plugin maven plugin, version 7.15.0 requires a newer version of Jackson than the original e4.34 target was providing. Update the tracecompass-incubator-e4.34.target for this hence the Trace Server RCP with targed will use a newer Jackson version as well. Signed-off-by: Bernd Hufmann <[email protected]>
1 parent 14ed34b commit 3e335c3

File tree

1 file changed

+57
-33
lines changed

1 file changed

+57
-33
lines changed

‎common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.34.target‎

Lines changed: 57 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target name="tracecompass-incubator-e4.34" sequenceNumber="4">
3+
<target name="tracecompass-incubator-e4.34" sequenceNumber="5">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
66
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -25,20 +25,6 @@
2525
<unit id="bcpg" version="0.0.0"/>
2626
<unit id="bcprov" version="0.0.0"/>
2727
<unit id="ch.qos.logback.classic" version="0.0.0"/>
28-
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
29-
<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="0.0.0"/>
30-
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
31-
<unit id="com.fasterxml.jackson.core.jackson-core.source" version="0.0.0"/>
32-
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
33-
<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="0.0.0"/>
34-
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="0.0.0"/>
35-
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="0.0.0"/>
36-
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="0.0.0"/>
37-
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="0.0.0"/>
38-
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="0.0.0"/>
39-
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="0.0.0"/>
40-
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
41-
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="0.0.0"/>
4228
<unit id="com.google.gson" version="0.0.0"/>
4329
<unit id="com.google.guava" version="33.3.1.jre"/>
4430
<unit id="com.sun.xml.bind.jaxb-osgi" version="2.3.9"/>
@@ -63,30 +49,48 @@
6349
<unit id="org.apache.commons.math3" version="0.0.0"/>
6450
<unit id="org.apache.xml.serializer" version="0.0.0"/>
6551
<unit id="org.eclipse.jetty.servlet-api" version="0.0.0"/>
52+
<unit id="org.hamcrest" version="0.0.0"/>
53+
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
54+
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
55+
<unit id="slf4j.api" version="0.0.0"/>
56+
<unit id="slf4j.simple" version="0.0.0"/>
57+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.34.0/"/>
58+
</location>
59+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
60+
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
61+
<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="0.0.0"/>
62+
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
63+
<unit id="com.fasterxml.jackson.core.jackson-core.source" version="0.0.0"/>
64+
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
65+
<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="0.0.0"/>
66+
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="0.0.0"/>
67+
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="0.0.0"/>
68+
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="0.0.0"/>
69+
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="0.0.0"/>
70+
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="0.0.0"/>
71+
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.source" version="0.0.0"/>
72+
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations" version="0.0.0"/>
73+
<unit id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations.source" version="0.0.0"/>
74+
<unit id="io.github.classgraph.classgraph"/>
6675
<unit id="org.glassfish.hk2.api" version="2.6.1"/>
6776
<unit id="org.glassfish.hk2.api.source" version="2.6.1"/>
6877
<unit id="org.glassfish.hk2.locator" version="2.6.1"/>
6978
<unit id="org.glassfish.hk2.locator.source" version="2.6.1"/>
7079
<unit id="org.glassfish.hk2.utils" version="2.6.1"/>
7180
<unit id="org.glassfish.hk2.utils.source" version="2.6.1"/>
72-
<unit id="org.glassfish.jersey.containers.jersey-container-servlet" version="2.45.0"/>
73-
<unit id="org.glassfish.jersey.core.jersey-client" version="2.45.0"/>
74-
<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.45.0"/>
75-
<unit id="org.glassfish.jersey.core.jersey-common" version="2.45.0"/>
76-
<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.45.0"/>
77-
<unit id="org.glassfish.jersey.core.jersey-server" version="2.45.0"/>
78-
<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.45.0"/>
79-
<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.45.0"/>
80-
<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.45.0"/>
81-
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.45.0"/>
82-
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.45.0"/>
83-
<unit id="org.hamcrest" version="0.0.0"/>
84-
<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
85-
<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
86-
<unit id="slf4j.api" version="0.0.0"/>
87-
<unit id="slf4j.simple" version="0.0.0"/>
81+
<unit id="org.glassfish.jersey.containers.jersey-container-servlet" version="2.47.0"/>
82+
<unit id="org.glassfish.jersey.core.jersey-client" version="2.47.0"/>
83+
<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.47.0"/>
84+
<unit id="org.glassfish.jersey.core.jersey-common" version="2.47.0"/>
85+
<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.47.0"/>
86+
<unit id="org.glassfish.jersey.core.jersey-server" version="2.47.0"/>
87+
<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.47.0"/>
88+
<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.47.0"/>
89+
<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.47.0"/>
90+
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.47.0"/>
91+
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.47.0"/>
8892
<unit id="org.yaml.snakeyaml" version="0.0.0"/>
89-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.34.0/"/>
93+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0/"/>
9094
</location>
9195
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
9296
<unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -237,7 +241,7 @@
237241
<dependency>
238242
<groupId>io.swagger.core.v3</groupId>
239243
<artifactId>swagger-jaxrs2</artifactId>
240-
<version>2.2.19</version>
244+
<version>2.2.37</version>
241245
<type>jar</type>
242246
</dependency>
243247
</dependencies>
@@ -252,6 +256,26 @@
252256
</dependency>
253257
</dependencies>
254258
</location>
259+
<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
260+
<dependencies>
261+
<dependency>
262+
<groupId>org.glassfish.jersey.media</groupId>
263+
<artifactId>jersey-media-multipart</artifactId>
264+
<version>2.47</version>
265+
<type>jar</type>
266+
</dependency>
267+
</dependencies>
268+
</location>
269+
<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
270+
<dependencies>
271+
<dependency>
272+
<groupId>com.google.code.findbugs</groupId>
273+
<artifactId>jsr305</artifactId>
274+
<version>3.0.2</version>
275+
<type>jar</type>
276+
</dependency>
277+
</dependencies>
278+
</location>
255279
</locations>
256280
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
257281
<launcherArgs>

0 commit comments

Comments
 (0)