GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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
pull/12324/head
Stephane Nicoll 8 years ago
parent
bb3a4da500
commit
c2c8b7dfe8
10 changed files with 234 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      spring-boot-samples/pom.xml
  2. 26
      spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
  3. 26
      spring-boot-samples/spring-boot-sample-data-rest/pom.xml
  4. 26
      spring-boot-samples/spring-boot-sample-flyway/pom.xml
  5. 26
      spring-boot-samples/spring-boot-sample-jersey/pom.xml
  6. 26
      spring-boot-samples/spring-boot-sample-jpa/pom.xml
  7. 26
      spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
  8. 26
      spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
  9. 26
      spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml
  10. 26
      spring-boot-samples/spring-boot-sample-test/pom.xml

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

@ -247,23 +247,4 @@ @@ -247,23 +247,4 @@
</plugin>
</plugins>
</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>

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

@ -45,4 +45,30 @@ @@ -45,4 +45,30 @@
</plugin>
</plugins>
</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>

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

@ -64,4 +64,30 @@ @@ -64,4 +64,30 @@
</plugin>
</plugins>
</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>

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

@ -53,4 +53,30 @@ @@ -53,4 +53,30 @@
</plugin>
</plugins>
</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>

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

@ -54,4 +54,30 @@ @@ -54,4 +54,30 @@
</plugin>
</plugins>
</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>

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

@ -53,4 +53,30 @@ @@ -53,4 +53,30 @@
</plugin>
</plugins>
</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>

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

@ -61,4 +61,30 @@ @@ -61,4 +61,30 @@
</plugin>
</plugins>
</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>

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

@ -61,4 +61,30 @@ @@ -61,4 +61,30 @@
</plugin>
</plugins>
</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>

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

@ -60,4 +60,30 @@ @@ -60,4 +60,30 @@
</plugin>
</plugins>
</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>

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

@ -61,4 +61,30 @@ @@ -61,4 +61,30 @@
</plugin>
</plugins>
</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>

Write Preview
Loading…
Cancel
Save