Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify the required changes to run certain samples with Java9

Browse Source 
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
This commit is contained in:
Stephane Nicoll
2018-03-02 12:58:25 +01:00
parent bb3a4da500
commit c2c8b7dfe8
10 changed files with 234 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-boot-samples/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-flyway/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-jersey/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-jpa/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml
View File

@@ -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>

26
spring-boot-samples/spring-boot-sample-test/pom.xml
View File

@@ -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>