From 11bbdc9b1450d011e0c5520cf5e3f01ebffce097 Mon Sep 17 00:00:00 2001
From: "Pabst, Andreas" <andreas.pabst@zeiss.com>
Date: Sun, 12 Feb 2023 00:07:31 +0100
Subject: [PATCH] [SUREFIRE-2149] Make all ITs run with Maven 3.9.0

---
 .../apache/maven/surefire/its/fixture/MavenLauncher.java | 3 ++-
 .../test/resources/surefire-946-dummy-dependency/pom.xml | 6 ++++++
 .../src/test/resources/unicode-testnames/pom.xml         | 9 +++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index 9b484b518b..08a3f5bf6f 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -218,7 +218,8 @@ public MavenLauncher offline()
 
     public MavenLauncher skipClean()
     {
-        writeGoal( "-Dclean.skip=true" );
+        writeGoal( "-Dclean.skip=true" /* for maven-clean-plugin < 3.0 */ );
+        writeGoal( "-Dmaven.clean.skip=true" /* for maven-clean-plugin 3.0+ */ );
         return this;
     }
 
diff --git a/surefire-its/src/test/resources/surefire-946-dummy-dependency/pom.xml b/surefire-its/src/test/resources/surefire-946-dummy-dependency/pom.xml
index d2fdf862a1..ed6c4ea21e 100644
--- a/surefire-its/src/test/resources/surefire-946-dummy-dependency/pom.xml
+++ b/surefire-its/src/test/resources/surefire-946-dummy-dependency/pom.xml
@@ -34,6 +34,12 @@
                     <classifier>${distinct.classifier}</classifier>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <version>2.5.2</version>
+                <!-- Version has to be pinned because of https://issues.apache.org/jira/browse/MINSTALL-151 -->
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/surefire-its/src/test/resources/unicode-testnames/pom.xml b/surefire-its/src/test/resources/unicode-testnames/pom.xml
index c186f83c47..fe43d47075 100644
--- a/surefire-its/src/test/resources/unicode-testnames/pom.xml
+++ b/surefire-its/src/test/resources/unicode-testnames/pom.xml
@@ -51,6 +51,15 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${surefire.version}</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.1</version>
+        <!-- Version pinned because version 3.9.0 and higher of the maven-compiler-plugin throw an -->
+        <!-- UnmappableCharacterException when trying to compile the tests in this project -->
+        <!-- This happens only on Windows and only if the Java version is 8 - 17. Not with JDK 19. -->
+        <!-- Further investigation needed to find the cause and a proper fix. -->
+      </plugin>
     </plugins>
   </build>