From 4adfb39fde338d021b12b136f258da6bb1820694 Mon Sep 17 00:00:00 2001
From: Patrick Tasse <patrick.tasse@gmail.com>
Date: Thu, 16 Nov 2023 11:13:38 -0500
Subject: [PATCH] releng: Upgrade to Tycho 4.0.3

Update pom.xml files accordingly

It requires maven 3.9.x

Remove org.javassit from target since it's not needed.
Get org.yaml.snakeyaml from orbit.

Change-Id: I9a9523e0b8a2725c294575375fc0b206343f9791
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass.incubator/org.eclipse.tracecompass.incubator/+/205533
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
---
 .../tracecompass-incubator-master.target      | 11 +--
 pom.xml                                       | 71 +++----------------
 .../pom.xml                                   | 11 +--
 .../pom.xml                                   | 12 ++--
 4 files changed, 25 insertions(+), 80 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
index 8d15b413..9ee4ca32 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -83,6 +83,7 @@
 <unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="0.0.0"/>
 <unit id="org.slf4j.api" version="0.0.0"/>
 <unit id="org.slf4j.binding.simple" version="0.0.0"/>
+<unit id="org.yaml.snakeyaml" 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">
@@ -230,16 +231,6 @@
 			</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>
diff --git a/pom.xml b/pom.xml
index 08ad71c6..8e777f62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
   </licenses>
 
   <properties>
-    <required-maven-version>3.6.3</required-maven-version>
+    <required-maven-version>3.9</required-maven-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <testArgLine></testArgLine>
@@ -50,8 +50,8 @@
     <jdk.version>17</jdk.version>
     <jdk.release>17</jdk.release>
 
-    <tycho-version>2.7.3</tycho-version>
-    <tycho-extras-version>2.7.3</tycho-extras-version>
+    <tycho-version>4.0.3</tycho-version>
+    <tycho-extras-version>4.0.3</tycho-extras-version>
     <tycho-use-project-settings>true</tycho-use-project-settings>
     <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tracecompass.incubator/org.eclipse.tracecompass.incubator.git</tycho.scmUrl>
     <cbi-plugins.version>1.4.2</cbi-plugins.version>
@@ -119,21 +119,6 @@
       <id>sign-update-site</id>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho-extras-version}</version>
-            <executions>
-              <execution>
-                <id>pack200-normalize</id>
-                <goals>
-                  <goal>normalize</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
-
           <plugin>
             <groupId>org.eclipse.cbi.maven.plugins</groupId>
             <artifactId>eclipse-jarsigner-plugin</artifactId>
@@ -148,21 +133,6 @@
               </execution>
             </executions>
           </plugin>
-
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho-extras-version}</version>
-            <executions>
-              <execution>
-                <id>pack200-pack</id>
-                <goals>
-                  <goal>pack</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
@@ -401,7 +371,6 @@
         <artifactId>target-platform-configuration</artifactId>
         <configuration>
           <executionEnvironment>JavaSE-${jdk.version}</executionEnvironment>
-          <includePackedArtifacts>true</includePackedArtifacts>
           <environments>
             <environment>
                 <os>win32</os>
@@ -441,45 +410,22 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-source-plugin</artifactId>
         <version>${tycho-version}</version>
-        <executions>
-          <execution>
-            <id>plugin-source</id>
-            <goals>
-              <goal>plugin-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
-        <version>${tycho-extras-version}</version>
         <configuration>
           <includeBinaryFeature>false</includeBinaryFeature>
         </configuration>
         <executions>
           <execution>
-            <id>source-feature</id>
-            <phase>package</phase>
+            <id>plugin-source</id>
             <goals>
-              <goal>source-feature</goal>
+              <goal>plugin-source</goal>
             </goals>
           </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-pack200b-plugin</artifactId>
-        <version>${tycho-extras-version}</version>
-        <executions>
           <execution>
-            <id>pack200-pack</id>
+            <id>feature-source</id>
+            <phase>package</phase>
             <goals>
-              <goal>pack</goal>
+              <goal>feature-source</goal>
             </goals>
-            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
@@ -596,6 +542,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-toolchains-plugin</artifactId>
+          <version>3.1.0</version>
           <executions>
             <execution>
               <goals>
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml b/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml
index f0aa6f93..020dcab9 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp.branding.feature/pom.xml
@@ -27,15 +27,18 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
         <version>${tycho-version}</version>
+        <configuration>
+          <includeBinaryFeature>false</includeBinaryFeature>
+        </configuration>
         <executions>
           <execution>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <phase>package</phase>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <excludes>
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml b/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
index 73fb194f..3781983b 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
@@ -27,14 +27,18 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <includeBinaryFeature>false</includeBinaryFeature>
+        </configuration>
         <executions>
           <execution>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <phase>package</phase>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <excludes>