Skip to content

Commit 11bbdc9

Browse files
andpabslawekjaranowski
authored andcommitted
[SUREFIRE-2149] Make all ITs run with Maven 3.9.0
1 parent 1f0c261 commit 11bbdc9

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ public MavenLauncher offline()
218218

219219
public MavenLauncher skipClean()
220220
{
221-
writeGoal( "-Dclean.skip=true" );
221+
writeGoal( "-Dclean.skip=true" /* for maven-clean-plugin < 3.0 */ );
222+
writeGoal( "-Dmaven.clean.skip=true" /* for maven-clean-plugin 3.0+ */ );
222223
return this;
223224
}
224225

surefire-its/src/test/resources/surefire-946-dummy-dependency/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<classifier>${distinct.classifier}</classifier>
3535
</configuration>
3636
</plugin>
37+
<plugin>
38+
<groupId>org.apache.maven.plugins</groupId>
39+
<artifactId>maven-install-plugin</artifactId>
40+
<version>2.5.2</version>
41+
<!-- Version has to be pinned because of https://issues.apache.org/jira/browse/MINSTALL-151 -->
42+
</plugin>
3743
</plugins>
3844
</build>
3945
</project>

surefire-its/src/test/resources/unicode-testnames/pom.xml

+9
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
<artifactId>maven-surefire-plugin</artifactId>
5252
<version>${surefire.version}</version>
5353
</plugin>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-compiler-plugin</artifactId>
57+
<version>3.8.1</version>
58+
<!-- Version pinned because version 3.9.0 and higher of the maven-compiler-plugin throw an -->
59+
<!-- UnmappableCharacterException when trying to compile the tests in this project -->
60+
<!-- This happens only on Windows and only if the Java version is 8 - 17. Not with JDK 19. -->
61+
<!-- Further investigation needed to find the cause and a proper fix. -->
62+
</plugin>
5463
</plugins>
5564
</build>
5665

0 commit comments

Comments
 (0)