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

Configure build to be compatible with Java 11 

See gh-14028
pull/13997/merge
Stephane Nicoll 7 years ago
parent
930c838da9
commit
d1ac774af2
16 changed files with 91 additions and 41 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. 28
      spring-boot-project/spring-boot-autoconfigure/pom.xml
  2. 26
      spring-boot-project/spring-boot-cli/pom.xml
  3. 6
      spring-boot-project/spring-boot-dependencies/pom.xml
  4. 17
      spring-boot-project/spring-boot-parent/pom.xml
  5. 2
      spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
  6. 2
      spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
  7. 2
      spring-boot-samples/spring-boot-sample-data-rest/pom.xml
  8. 2
      spring-boot-samples/spring-boot-sample-flyway/pom.xml
  9. 2
      spring-boot-samples/spring-boot-sample-jersey/pom.xml
  10. 2
      spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml
  11. 2
      spring-boot-samples/spring-boot-sample-jpa/pom.xml
  12. 2
      spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
  13. 2
      spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
  14. 2
      spring-boot-samples/spring-boot-sample-test/pom.xml
  15. 2
      spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
  16. 33
      spring-boot-samples/spring-boot-sample-webservices/pom.xml

28
spring-boot-project/spring-boot-autoconfigure/pom.xml
Unescape View File

@ -796,4 +796,32 @@ @@ -796,4 +796,32 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>java9-10</id>
<activation>
<jdk>[9,10]</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
<profile>
<id>java11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
</project>

26
spring-boot-project/spring-boot-cli/pom.xml
Unescape View File

@ -454,5 +454,31 @@ @@ -454,5 +454,31 @@
<spring.profiles.active>integration</spring.profiles.active>
</properties>
</profile>
<profile>
<id>java9-10</id>
<activation>
<jdk>[9,10]</jdk>
</activation>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
<profile>
<id>java11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</profile>
</profiles>
</project>

6
spring-boot-project/spring-boot-dependencies/pom.xml
Unescape View File

@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
<freemarker.version>2.3.28</freemarker.version>
<elasticsearch.version>6.3.2</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<glassfixh-jaxb.version>2.4.0-b180725.0644</glassfixh-jaxb.version>
<groovy.version>2.5.2</groovy.version>
<gson.version>2.8.5</gson.version>
<h2.version>1.4.197</h2.version>
@ -1832,6 +1833,11 @@ @@ -1832,6 +1833,11 @@
<artifactId>javax.el</artifactId>
<version>${glassfish-el.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${glassfixh-jaxb.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey</groupId>
<artifactId>jersey-bom</artifactId>

17
spring-boot-project/spring-boot-parent/pom.xml
Unescape View File

@ -720,22 +720,5 @@ @@ -720,22 +720,5 @@
<m2e.cdi.activation>false</m2e.cdi.activation>
</properties>
</profile>
<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>

2
spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml
Unescape View File

@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

2
spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml
Unescape View File

@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

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

@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

2
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
Unescape View File

@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9+</id>
<activation>
<jdk>[9,)</jdk>
</activation>

33
spring-boot-samples/spring-boot-sample-webservices/pom.xml
Unescape View File

@ -49,21 +49,28 @@ @@ -49,21 +49,28 @@
</build>
<profiles>
<profile>
<id>java9</id>
<id>java9-10</id>
<activation>
<jdk>[9,)</jdk>
<jdk>[9,10]</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>--add-modules java.base,java.xml.ws</argLine>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies>
</profile>
<profile>
<id>java11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>

Write Preview
Loading…
Cancel
Save