From aaedfafbccf2d94c68cd50dd0da923e4ace3a1c3 Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bernd.hufmann@ericsson.com>
Date: Fri, 17 Oct 2025 10:46:19 -0400
Subject: [PATCH] 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 <bernd.hufmann@ericsson.com>
---
 .../tracecompass-incubator-e4.34.target       | 90 ++++++++++++-------
 1 file changed, 57 insertions(+), 33 deletions(-)

diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.34.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.34.target
index 53ef53bc2..9d2bcb698 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.34.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.34.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="tracecompass-incubator-e4.34" sequenceNumber="4">
+<target name="tracecompass-incubator-e4.34" sequenceNumber="5">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.14/"/>
@@ -25,20 +25,6 @@
 <unit id="bcpg" version="0.0.0"/>
 <unit id="bcprov" version="0.0.0"/>
 <unit id="ch.qos.logback.classic" 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"/>
-<unit id="com.fasterxml.jackson.core.jackson-core.source" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="0.0.0"/>
-<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.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="com.google.gson" version="0.0.0"/>
 <unit id="com.google.guava" version="33.3.1.jre"/>
 <unit id="com.sun.xml.bind.jaxb-osgi" version="2.3.9"/>
@@ -63,30 +49,48 @@
 <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.hamcrest" version="0.0.0"/>
+<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
+<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
+<unit id="slf4j.api" version="0.0.0"/>
+<unit id="slf4j.simple" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.34.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<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"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider.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="io.github.classgraph.classgraph"/>
 <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.45.0"/>
-<unit id="org.glassfish.jersey.core.jersey-client" version="2.45.0"/>
-<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.45.0"/>
-<unit id="org.glassfish.jersey.core.jersey-common" version="2.45.0"/>
-<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.45.0"/>
-<unit id="org.glassfish.jersey.core.jersey-server" version="2.45.0"/>
-<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.45.0"/>
-<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.45.0"/>
-<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.45.0"/>
-<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.45.0"/>
-<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.45.0"/>
-<unit id="org.hamcrest" version="0.0.0"/>
-<unit id="org.mortbay.jasper.apache-jsp" version="0.0.0"/>
-<unit id="org.osgi.service.component.annotations" version="0.0.0"/>
-<unit id="slf4j.api" version="0.0.0"/>
-<unit id="slf4j.simple" version="0.0.0"/>
+<unit id="org.glassfish.jersey.containers.jersey-container-servlet" version="2.47.0"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="2.47.0"/>
+<unit id="org.glassfish.jersey.core.jersey-client.source" version="2.47.0"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="2.47.0"/>
+<unit id="org.glassfish.jersey.core.jersey-common.source" version="2.47.0"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="2.47.0"/>
+<unit id="org.glassfish.jersey.core.jersey-server.source" version="2.47.0"/>
+<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.47.0"/>
+<unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="2.47.0"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.47.0"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="2.47.0"/>
 <unit id="org.yaml.snakeyaml" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.34.0/"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -237,7 +241,7 @@
 			<dependency>
 				<groupId>io.swagger.core.v3</groupId>
 				<artifactId>swagger-jaxrs2</artifactId>
-				<version>2.2.19</version>
+				<version>2.2.37</version>
 				<type>jar</type>
 			</dependency>
 		</dependencies>
@@ -252,6 +256,26 @@
 			</dependency>
 		</dependencies>
 	</location>
+	<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
+		<dependencies>
+			<dependency>
+				<groupId>org.glassfish.jersey.media</groupId>
+				<artifactId>jersey-media-multipart</artifactId>
+				<version>2.47</version>
+				<type>jar</type>
+			</dependency>
+		</dependencies>
+	</location>
+	<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
+		<dependencies>
+			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>jsr305</artifactId>
+				<version>3.0.2</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-17"/>
 <launcherArgs>