From cb16e93d8425120724da80e9400b1b3c2b1b1a4e Mon Sep 17 00:00:00 2001
From: Emanuel Rabina <emanuelrabina@gmail.com>
Date: Fri, 20 Oct 2023 22:50:09 +1300
Subject: [PATCH] Try get the build going again w/ Tycho 3, Groovy 4

---
 .github/workflows/build.yml                   |  2 +-
 .mvn/extensions.xml                           |  7 ++
 build.gradle                                  |  1 +
 .../META-INF/MANIFEST.MF                      |  4 +-
 .../build.properties                          |  8 +-
 .../pom.xml                                   | 73 -------------------
 pom.xml                                       | 49 ++++++-------
 7 files changed, 40 insertions(+), 104 deletions(-)
 create mode 100644 .mvn/extensions.xml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fc6e816..f2b95a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,4 +12,4 @@ jobs:
           java-version: 17
           cache: maven
       - run: ./gradlew downloadDependencies
-      - run: mvn --batch-mode --update-snapshots verify
+      - run: mvn verify
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 0000000..5b780e4
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions>
+	<extension>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>tycho-build</artifactId>
+		<version>3.0.5</version>
+	</extension>
+</extensions>
diff --git a/build.gradle b/build.gradle
index 81e0421..9e17e38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,6 +56,7 @@ dependencies {
 	contentassist(
 		'javax.annotation:javax.annotation-api:1.3.2',
 		'javax.inject:javax.inject:1',
+		'nz.net.ultraq.jaxb:jaxb-utilities:3.0.0-SNAPSHOT',
 		'nz.net.ultraq.groovy:groovy-extensions:2.2.0',
 		'nz.net.ultraq.groovy:groovy-profiling-extensions:0.7.0',
 		'org.attoparser:attoparser:2.0.5.RELEASE',
diff --git a/org.thymeleaf.extras.eclipse.contentassist/META-INF/MANIFEST.MF b/org.thymeleaf.extras.eclipse.contentassist/META-INF/MANIFEST.MF
index 1e4a2ff..6d124aa 100644
--- a/org.thymeleaf.extras.eclipse.contentassist/META-INF/MANIFEST.MF
+++ b/org.thymeleaf.extras.eclipse.contentassist/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@ Bundle-ClassPath: .,
  lib/javax.annotation-api-1.3.2.jar,
  lib/javax.inject-1.jar,
  lib/jaxb-impl-2.3.5.jar,
- lib/jaxb-utilities-2.1.0.jar,
+ lib/jaxb-utilities-3.0.0-SNAPSHOT.jar,
  lib/junit-jupiter-5.7.2.jar,
  lib/junit-jupiter-api-5.7.2.jar,
  lib/junit-jupiter-engine-5.7.2.jar,
@@ -54,7 +54,7 @@ Bundle-ClassPath: .,
  lib/mockito-core-3.12.4.jar,
  lib/objenesis-3.2.jar,
  lib/opentest4j-1.2.0.jar,
- lib/slf4j-api-1.7.32.jar,
+ lib/slf4j-api-1.7.36.jar,
  lib/spring-aop-5.2.0.RELEASE.jar,
  lib/spring-beans-5.2.0.RELEASE.jar,
  lib/spring-context-5.2.0.RELEASE.jar,
diff --git a/org.thymeleaf.extras.eclipse.contentassist/build.properties b/org.thymeleaf.extras.eclipse.contentassist/build.properties
index 48794ab..c1b2acc 100644
--- a/org.thymeleaf.extras.eclipse.contentassist/build.properties
+++ b/org.thymeleaf.extras.eclipse.contentassist/build.properties
@@ -10,13 +10,17 @@ bin.includes = .,\
                lib/attoparser-2.0.5.RELEASE.jar,\
                lib/byte-buddy-1.11.13.jar,\
                lib/byte-buddy-agent-1.11.13.jar,\
+               lib/groovy-4.0.15.jar,\
+               lib/groovy-extensions-2.2.0.jar,\
+               lib/groovy-profiling-extensions-0.7.0.jar,\
+               lib/groovy-xml-4.0.15.jar,\
                lib/jakarta.activation-1.2.2.jar,\
                lib/jakarta.activation-api-1.2.2.jar,\
                lib/jakarta.xml.bind-api-2.3.3.jar,\
                lib/javax.annotation-api-1.3.2.jar,\
                lib/javax.inject-1.jar,\
                lib/jaxb-impl-2.3.5.jar,\
-               lib/jaxb-utilities-2.1.0.jar,\
+               lib/jaxb-utilities-3.0.0-SNAPSHOT.jar,\
                lib/junit-jupiter-5.7.2.jar,\
                lib/junit-jupiter-api-5.7.2.jar,\
                lib/junit-jupiter-engine-5.7.2.jar,\
@@ -26,7 +30,7 @@ bin.includes = .,\
                lib/mockito-core-3.12.4.jar,\
                lib/objenesis-3.2.jar,\
                lib/opentest4j-1.2.0.jar,\
-               lib/slf4j-api-1.7.32.jar,\
+               lib/slf4j-api-1.7.36.jar,\
                lib/spring-aop-5.2.0.RELEASE.jar,\
                lib/spring-beans-5.2.0.RELEASE.jar,\
                lib/spring-context-5.2.0.RELEASE.jar,\
diff --git a/org.thymeleaf.extras.eclipse.contentassist/pom.xml b/org.thymeleaf.extras.eclipse.contentassist/pom.xml
index 53cc678..5cf26e3 100644
--- a/org.thymeleaf.extras.eclipse.contentassist/pom.xml
+++ b/org.thymeleaf.extras.eclipse.contentassist/pom.xml
@@ -27,77 +27,4 @@
 		</plugins>
 	</build>
 
-	<dependencies>
-		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.3.2</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<version>1</version>
-		</dependency>
-		<dependency>
-			<groupId>nz.net.ultraq.jaxb</groupId>
-			<artifactId>jaxb-utilities</artifactId>
-			<version>2.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>nz.net.ultraq.extensions</groupId>
-			<artifactId>groovy-extensions</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>nz.net.ultraq.extensions</groupId>
-			<artifactId>profiling-extensions</artifactId>
-			<version>0.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.attoparser</groupId>
-			<artifactId>attoparser</artifactId>
-			<version>2.0.5.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<version>3.0.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<version>1.7.32</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>5.2.0.RELEASE</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-xml</artifactId>
-			<version>3.0.9</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter</artifactId>
-			<version>5.7.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>3.12.4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>5.2.0.RELEASE</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 9ac6873..10a78e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,37 +67,26 @@
 	</repositories>
 
 	<properties>
-		<tycho.version>2.4.0</tycho.version>
+		<tycho.version>3.0.5</tycho.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
-		<thymeleaf.plugin-update-site>https://raw.githubusercontent.com/thymeleaf/thymeleaf-extras-eclipse-plugin/update-site/${project.version}/</thymeleaf.plugin-update-site>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
+		<thymeleaf.plugin-update-site>https://raw.githubusercontent.com/thymeleaf/thymeleaf-extras-eclipse-plugin/update-site/${project.version}/</thymeleaf.plugin-update-site>
 	</properties>
 
 	<build>
 		<testSourceDirectory>src/test/groovy</testSourceDirectory>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-p2-director-plugin</artifactId>
+					<version>${tycho.version}</version>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>enforce-maven</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireMavenVersion>
-									<version>3.6.3</version>
-								</requireMavenVersion>
-							</rules>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
@@ -109,6 +98,7 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
+					<executionEnvironment>JavaSE-17</executionEnvironment>
 					<environments>
 						<environment>
 							<os>win32</os>
@@ -145,7 +135,7 @@
 			<plugin>
 				<groupId>org.codehaus.gmavenplus</groupId>
 				<artifactId>gmavenplus-plugin</artifactId>
-				<version>1.12.1</version>
+				<version>3.0.2</version>
 				<executions>
 					<execution>
 						<goals>
@@ -161,13 +151,20 @@
 					</execution>
 				</executions>
 			</plugin>
+			<!--Enable the replacement of the SNAPSHOT version in the final product configuration-->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-packaging-plugin</artifactId>
 				<version>${tycho.version}</version>
-				<configuration>
-					<archiveSite>true</archiveSite>
-				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<id>package-feature</id>
+						<configuration>
+							<finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>