From c18d06e84d7865aa0542ab3a24fccf5f35827336 Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Mon, 13 Mar 2023 14:25:58 -0400
Subject: [PATCH] Upgrade to Tycho 3.0.3 (latest)

Part of #320
See also #308
---
 .github/workflows/build-test.yml                     |  4 ----
 .github/workflows/code-cleanliness.yml               |  4 ----
 .mvn/extensions.xml                                  |  2 +-
 build/org.eclipse.cdt.autotools.docs/pom.xml         |  8 +++++++-
 build/org.eclipse.cdt.meson.docs/pom.xml             |  8 +++++++-
 debug/org.eclipse.cdt.debug.application.doc/pom.xml  |  8 +++++++-
 .../pom.xml                                          | 12 ------------
 doc/org.eclipse.cdt.doc.isv/pom.xml                  |  7 ++++++-
 doc/org.eclipse.cdt.doc.user/pom.xml                 |  8 +++++++-
 pom.xml                                              | 12 +++++++++---
 10 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 37a8f38dee4..b3bbdabf96d 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -31,10 +31,6 @@ jobs:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
-    - name: Setup Maven
-      uses: stCarolas/setup-maven@v.4.5
-      with:
-        maven-version: 3.8.7
     - name: Install GCC & GDB & other build essentials
       run: |
         sudo apt-get -y install build-essential gcc g++ gdb gdbserver
diff --git a/.github/workflows/code-cleanliness.yml b/.github/workflows/code-cleanliness.yml
index f24270ad5eb..ca667e81b9e 100644
--- a/.github/workflows/code-cleanliness.yml
+++ b/.github/workflows/code-cleanliness.yml
@@ -21,10 +21,6 @@ jobs:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
-    - name: Setup Maven
-      uses: stCarolas/setup-maven@v.4.5
-      with:
-        maven-version: 3.8.7
     - name: Install dependencies
       run: |
         sudo apt-get update && sudo apt-get install -y --no-install-recommends \
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 8cac6c9235b..f41af146d2d 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho-build</artifactId>
-    <version>2.7.1</version>
+    <version>3.0.3</version>
   </extension>
 </extensions>
diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml
index 980ba0611a1..53dcdfd2a34 100644
--- a/build/org.eclipse.cdt.autotools.docs/pom.xml
+++ b/build/org.eclipse.cdt.autotools.docs/pom.xml
@@ -59,7 +59,13 @@
 						<artifactId>tycho-eclipserun-plugin</artifactId>
 						<version>${tycho-version}</version>
 						<configuration>
-							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
+							<applicationArgs>
+								<arg>-application</arg>
+								<arg>org.eclipse.ant.core.antRunner</arg>
+								<arg>-buildfile</arg>
+								<arg>build-index.xml</arg>
+								<arg>build.index</arg>
+							</applicationArgs>
 							<dependencies>
 								<dependency>
 									<artifactId>org.apache.ant</artifactId>
diff --git a/build/org.eclipse.cdt.meson.docs/pom.xml b/build/org.eclipse.cdt.meson.docs/pom.xml
index aeb754d4953..13e76573a9c 100644
--- a/build/org.eclipse.cdt.meson.docs/pom.xml
+++ b/build/org.eclipse.cdt.meson.docs/pom.xml
@@ -59,7 +59,13 @@
 						<artifactId>tycho-eclipserun-plugin</artifactId>
 						<version>${tycho-version}</version>
 						<configuration>
-							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine>
+							<applicationArgs>
+								<arg>-application</arg>
+								<arg>org.eclipse.ant.core.antRunner</arg>
+								<arg>-buildfile</arg>
+								<arg>build-index.xml</arg>
+								<arg>build.index</arg>
+							</applicationArgs>
 							<dependencies>
 								<dependency>
 									<artifactId>org.apache.ant</artifactId>
diff --git a/debug/org.eclipse.cdt.debug.application.doc/pom.xml b/debug/org.eclipse.cdt.debug.application.doc/pom.xml
index e033e4317f1..0e20a92cb10 100644
--- a/debug/org.eclipse.cdt.debug.application.doc/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.doc/pom.xml
@@ -59,7 +59,13 @@
 						<artifactId>tycho-eclipserun-plugin</artifactId>
 						<version>${tycho-version}</version>
 						<configuration>
-							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
+							<applicationArgs>
+								<arg>-application</arg>
+								<arg>org.eclipse.ant.core.antRunner</arg>
+								<arg>-buildfile</arg>
+								<arg>customBuildCallbacks.xml</arg>
+								<arg>build.index</arg>
+							</applicationArgs>
 							<dependencies>
 								<dependency>
 									<artifactId>org.apache.ant</artifactId>
diff --git a/debug/org.eclipse.cdt.debug.application.product/pom.xml b/debug/org.eclipse.cdt.debug.application.product/pom.xml
index ae17cf436a3..254cd4f034e 100644
--- a/debug/org.eclipse.cdt.debug.application.product/pom.xml
+++ b/debug/org.eclipse.cdt.debug.application.product/pom.xml
@@ -49,12 +49,6 @@
 						<goals>
 							<goal>archive-products</goal>
 						</goals>
-						<configuration>
-							<formats>
-								<linux>tar.gz</linux>
-								<macosx>tar.gz</macosx>
-							</formats>
-						</configuration>
 					</execution>
 				</executions>
 				<configuration>
@@ -129,12 +123,6 @@
 								<goals>
 									<goal>archive-products</goal>
 								</goals>
-								<configuration>
-									<formats>
-										<linux>tar.gz</linux>
-										<macosx>tar.gz</macosx>
-									</formats>
-								</configuration>
 							</execution>
 						</executions>
 						<configuration>
diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml
index 98a8611ca6a..2bdc21cae10 100644
--- a/doc/org.eclipse.cdt.doc.isv/pom.xml
+++ b/doc/org.eclipse.cdt.doc.isv/pom.xml
@@ -60,7 +60,12 @@
 						<artifactId>tycho-eclipserun-plugin</artifactId>
 						<version>${tycho-version}</version>
 						<configuration>
-							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine>
+							<applicationArgs>
+								<arg>-application</arg>
+								<arg>org.eclipse.ant.core.antRunner</arg>
+								<arg>-buildfile</arg>
+								<arg>buildDoc.xml</arg>
+							</applicationArgs>
 							<dependencies>
 								<dependency>
 									<artifactId>org.apache.ant</artifactId>
diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml
index a71b7e3bd75..6fe47e88bcf 100644
--- a/doc/org.eclipse.cdt.doc.user/pom.xml
+++ b/doc/org.eclipse.cdt.doc.user/pom.xml
@@ -59,7 +59,13 @@
 						<artifactId>tycho-eclipserun-plugin</artifactId>
 						<version>${tycho-version}</version>
 						<configuration>
-							<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
+							<applicationArgs>
+								<arg>-application</arg>
+								<arg>org.eclipse.ant.core.antRunner</arg>
+								<arg>-buildfile</arg>
+								<arg>customBuildCallbacks.xml</arg>
+								<arg>build.index</arg>
+							</applicationArgs>
 							<dependencies>
 								<dependency>
 									<artifactId>org.apache.ant</artifactId>
diff --git a/pom.xml b/pom.xml
index cd789c17be8..7ccb48fbd38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 			 runs with. It may work with older versions, but this is not
 			 tested or supported. -->
 		<required-maven-version>3.6.3</required-maven-version>
-		<tycho-version>2.7.5</tycho-version>
+		<tycho-version>3.0.3</tycho-version>
 		<cbi-plugins.version>1.3.4</cbi-plugins.version>
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
@@ -831,7 +831,7 @@
 					</configuration>
 					<dependencies>
 						<dependency>
-							<groupId>org.eclipse.tycho.extras</groupId>
+							<groupId>org.eclipse.tycho</groupId>
 							<artifactId>tycho-buildtimestamp-jgit</artifactId>
 							<version>${tycho-version}</version>
 						</dependency>
@@ -948,7 +948,13 @@
 				<artifactId>tycho-eclipserun-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine>
+					<applicationArgs>
+						<arg>-application</arg>
+						<arg>org.eclipse.ant.core.antRunner</arg>
+						<arg>-buildfile</arg>
+						<arg>customBuildCallbacks.xml</arg>
+						<arg>build.index</arg>
+					</applicationArgs>
 					<dependencies>
 						<dependency>
 							<artifactId>org.apache.ant</artifactId>