From 9df0c5a840b8d7eb9a53aaa3151d2e918e823b15 Mon Sep 17 00:00:00 2001
From: Christian Stein <sormuras@gmail.com>
Date: Wed, 28 May 2025 10:12:14 +0200
Subject: [PATCH] Update to use Maven 4

- https://maven.apache.org/docs/4.0.0-rc-3/release-notes.html
- Also reduce warnings by specifying plugin versions
---
 .../.mvn/wrapper/maven-wrapper.properties           |  2 +-
 junit-jupiter-starter-maven-kotlin/pom.xml          | 13 +++++++++----
 .../.mvn/wrapper/maven-wrapper.properties           |  2 +-
 junit-jupiter-starter-maven/pom.xml                 | 11 +++++++++--
 .../.mvn/wrapper/maven-wrapper.properties           |  2 +-
 junit-migration-maven/pom.xml                       | 11 +++++++++--
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/junit-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties b/junit-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties
index 2f94e616..2733d284 100644
--- a/junit-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties
+++ b/junit-jupiter-starter-maven-kotlin/.mvn/wrapper/maven-wrapper.properties
@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-3/apache-maven-4.0.0-rc-3-bin.zip
diff --git a/junit-jupiter-starter-maven-kotlin/pom.xml b/junit-jupiter-starter-maven-kotlin/pom.xml
index 8f966e27..3f2d7f4a 100644
--- a/junit-jupiter-starter-maven-kotlin/pom.xml
+++ b/junit-jupiter-starter-maven-kotlin/pom.xml
@@ -11,8 +11,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<kotlin.version>2.2.0</kotlin.version>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+		<maven.compiler.release>17</maven.compiler.release>
 	</properties>
 
 	<dependencyManagement>
@@ -73,9 +72,15 @@
 					</execution>
 				</executions>
 			</plugin>
-
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.1</version>
+			</plugin>
+			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.5.3</version>
 			</plugin>
diff --git a/junit-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties b/junit-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties
index 2f94e616..2733d284 100644
--- a/junit-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties
+++ b/junit-jupiter-starter-maven/.mvn/wrapper/maven-wrapper.properties
@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-3/apache-maven-4.0.0-rc-3-bin.zip
diff --git a/junit-jupiter-starter-maven/pom.xml b/junit-jupiter-starter-maven/pom.xml
index 3c82d6a9..0d3a4456 100644
--- a/junit-jupiter-starter-maven/pom.xml
+++ b/junit-jupiter-starter-maven/pom.xml
@@ -9,8 +9,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+		<maven.compiler.release>17</maven.compiler.release>
 	</properties>
 
 	<dependencyManagement>
@@ -35,6 +34,14 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.1</version>
+			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.5.3</version>
diff --git a/junit-migration-maven/.mvn/wrapper/maven-wrapper.properties b/junit-migration-maven/.mvn/wrapper/maven-wrapper.properties
index 2f94e616..2733d284 100644
--- a/junit-migration-maven/.mvn/wrapper/maven-wrapper.properties
+++ b/junit-migration-maven/.mvn/wrapper/maven-wrapper.properties
@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-3/apache-maven-4.0.0-rc-3-bin.zip
diff --git a/junit-migration-maven/pom.xml b/junit-migration-maven/pom.xml
index d8e9514a..feee8c50 100644
--- a/junit-migration-maven/pom.xml
+++ b/junit-migration-maven/pom.xml
@@ -9,8 +9,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
+		<maven.compiler.release>17</maven.compiler.release>
 		<junit.version>4.13.2</junit.version>
 	</properties>
 
@@ -52,6 +51,14 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.13.0</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.3.1</version>
+			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.5.3</version>