Skip to content

S
spring-boot
Commit 8608202e authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Remove Surefire workarounds that are not needed with 2.21 

Closes gh-12721
parent 4a47ab4b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 120 deletions
spring-boot-samples/pom.xml
View file @ 8608202e
...@@ -247,16 +247,4 @@ ...@@ -247,16 +247,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java10</id>
<activation>
<jdk>10</jdk>
</activation>
<properties>
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
</properties>
</profile>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
View file @ 8608202e
...@@ -57,18 +57,6 @@ ...@@ -57,18 +57,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
View file @ 8608202e
...@@ -76,18 +76,6 @@ ...@@ -76,18 +76,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-flyway/pom.xml
View file @ 8608202e
...@@ -65,18 +65,6 @@ ...@@ -65,18 +65,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jersey/pom.xml
View file @ 8608202e
...@@ -66,18 +66,6 @@ ...@@ -66,18 +66,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jersey1/pom.xml
View file @ 8608202e
...@@ -76,18 +76,6 @@ ...@@ -76,18 +76,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jpa/pom.xml
View file @ 8608202e
...@@ -65,18 +65,6 @@ ...@@ -65,18 +65,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
View file @ 8608202e
...@@ -73,18 +73,6 @@ ...@@ -73,18 +73,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
View file @ 8608202e
...@@ -73,18 +73,6 @@ ...@@ -73,18 +73,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-test/pom.xml
View file @ 8608202e
...@@ -73,18 +73,6 @@ ...@@ -73,18 +73,6 @@
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- workaround for SUREFIRE-1424 -->
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment