Skip to content

S
spring-boot
Commit c2c8b7df authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Clarify the required changes to run certain samples with Java9 

This commit moves the Java9-specific profile to each sample rather than
impacting all samples. That way, affected samples are more self
contained.

Closes gh-12302
parent bb3a4da5
Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 19 deletions
spring-boot-samples/pom.xml
View file @ c2c8b7df
...@@ -247,23 +247,4 @@ ...@@ -247,23 +247,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base,java.xml.bind</argLine>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
View file @ c2c8b7df
...@@ -45,4 +45,30 @@ ...@@ -45,4 +45,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
View file @ c2c8b7df
...@@ -64,4 +64,30 @@ ...@@ -64,4 +64,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-flyway/pom.xml
View file @ c2c8b7df
...@@ -53,4 +53,30 @@ ...@@ -53,4 +53,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jersey/pom.xml
View file @ c2c8b7df
...@@ -54,4 +54,30 @@ ...@@ -54,4 +54,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jpa/pom.xml
View file @ c2c8b7df
...@@ -53,4 +53,30 @@ ...@@ -53,4 +53,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
View file @ c2c8b7df
...@@ -61,4 +61,30 @@ ...@@ -61,4 +61,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
View file @ c2c8b7df
...@@ -61,4 +61,30 @@ ...@@ -61,4 +61,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml
View file @ c2c8b7df
...@@ -60,4 +60,30 @@ ...@@ -60,4 +60,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</profiles>
</project> </project>
spring-boot-samples/spring-boot-sample-test/pom.xml
View file @ c2c8b7df
...@@ -61,4 +61,30 @@ ...@@ -61,4 +61,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>java9</id>
<activation>
<jdk>9</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</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>
</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