Skip to content

Commit 8608202

Browse files
wilkinsonawilkinsona
committed
Remove Surefire workarounds that are not needed with 2.21
Closes gh-12721
1 parent 4a47ab4 commit 8608202

File tree

10 files changed

+0
-120
lines changed

10 files changed

+0
-120
lines changed

‎spring-boot-samples/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,16 +247,4 @@
247247
</plugin>
248248
</plugins>
249249
</build>
250-
<profiles>
251-
<profile>
252-
<id>java10</id>
253-
<activation>
254-
<jdk>10</jdk>
255-
</activation>
256-
<properties>
257-
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
258-
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
259-
</properties>
260-
</profile>
261-
</profiles>
262250
</project>

‎spring-boot-samples/spring-boot-sample-data-jpa/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,6 @@
5757
<artifactId>jaxb-api</artifactId>
5858
</dependency>
5959
</dependencies>
60-
<!-- workaround for SUREFIRE-1424 -->
61-
<build>
62-
<plugins>
63-
<plugin>
64-
<groupId>org.apache.maven.plugins</groupId>
65-
<artifactId>maven-surefire-plugin</artifactId>
66-
<configuration>
67-
<argLine>--add-modules java.base</argLine>
68-
</configuration>
69-
</plugin>
70-
</plugins>
71-
</build>
7260
</profile>
7361
</profiles>
7462
</project>

‎spring-boot-samples/spring-boot-sample-data-rest/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,6 @@
7676
<artifactId>jaxb-api</artifactId>
7777
</dependency>
7878
</dependencies>
79-
<!-- workaround for SUREFIRE-1424 -->
80-
<build>
81-
<plugins>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-surefire-plugin</artifactId>
85-
<configuration>
86-
<argLine>--add-modules java.base</argLine>
87-
</configuration>
88-
</plugin>
89-
</plugins>
90-
</build>
9179
</profile>
9280
</profiles>
9381
</project>

‎spring-boot-samples/spring-boot-sample-flyway/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@
6565
<artifactId>jaxb-api</artifactId>
6666
</dependency>
6767
</dependencies>
68-
<!-- workaround for SUREFIRE-1424 -->
69-
<build>
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-surefire-plugin</artifactId>
74-
<configuration>
75-
<argLine>--add-modules java.base</argLine>
76-
</configuration>
77-
</plugin>
78-
</plugins>
79-
</build>
8068
</profile>
8169
</profiles>
8270
</project>

‎spring-boot-samples/spring-boot-sample-jersey/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,18 +66,6 @@
6666
<artifactId>jaxb-api</artifactId>
6767
</dependency>
6868
</dependencies>
69-
<!-- workaround for SUREFIRE-1424 -->
70-
<build>
71-
<plugins>
72-
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-surefire-plugin</artifactId>
75-
<configuration>
76-
<argLine>--add-modules java.base</argLine>
77-
</configuration>
78-
</plugin>
79-
</plugins>
80-
</build>
8169
</profile>
8270
</profiles>
8371
</project>

‎spring-boot-samples/spring-boot-sample-jersey1/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,6 @@
7676
<artifactId>jaxb-api</artifactId>
7777
</dependency>
7878
</dependencies>
79-
<!-- workaround for SUREFIRE-1424 -->
80-
<build>
81-
<plugins>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-surefire-plugin</artifactId>
85-
<configuration>
86-
<argLine>--add-modules java.base</argLine>
87-
</configuration>
88-
</plugin>
89-
</plugins>
90-
</build>
9179
</profile>
9280
</profiles>
9381
</project>

‎spring-boot-samples/spring-boot-sample-jpa/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@
6565
<artifactId>jaxb-api</artifactId>
6666
</dependency>
6767
</dependencies>
68-
<!-- workaround for SUREFIRE-1424 -->
69-
<build>
70-
<plugins>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-surefire-plugin</artifactId>
74-
<configuration>
75-
<argLine>--add-modules java.base</argLine>
76-
</configuration>
77-
</plugin>
78-
</plugins>
79-
</build>
8068
</profile>
8169
</profiles>
8270
</project>

‎spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,6 @@
7373
<artifactId>jaxb-api</artifactId>
7474
</dependency>
7575
</dependencies>
76-
<!-- workaround for SUREFIRE-1424 -->
77-
<build>
78-
<plugins>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-surefire-plugin</artifactId>
82-
<configuration>
83-
<argLine>--add-modules java.base</argLine>
84-
</configuration>
85-
</plugin>
86-
</plugins>
87-
</build>
8876
</profile>
8977
</profiles>
9078
</project>

‎spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,6 @@
7373
<artifactId>jaxb-api</artifactId>
7474
</dependency>
7575
</dependencies>
76-
<!-- workaround for SUREFIRE-1424 -->
77-
<build>
78-
<plugins>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-surefire-plugin</artifactId>
82-
<configuration>
83-
<argLine>--add-modules java.base</argLine>
84-
</configuration>
85-
</plugin>
86-
</plugins>
87-
</build>
8876
</profile>
8977
</profiles>
9078
</project>

‎spring-boot-samples/spring-boot-sample-test/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,6 @@
7373
<artifactId>jaxb-api</artifactId>
7474
</dependency>
7575
</dependencies>
76-
<!-- workaround for SUREFIRE-1424 -->
77-
<build>
78-
<plugins>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-surefire-plugin</artifactId>
82-
<configuration>
83-
<argLine>--add-modules java.base</argLine>
84-
</configuration>
85-
</plugin>
86-
</plugins>
87-
</build>
8876
</profile>
8977
</profiles>
9078
</project>

0 commit comments

Comments
 (0)