mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Configure build to be compatible with Java 11
See gh-14028
This commit is contained in:
parent
930c838da9
commit
d1ac774af2
@ -796,4 +796,32 @@
|
|||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</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>
|
</project>
|
||||||
|
@ -454,5 +454,31 @@
|
|||||||
<spring.profiles.active>integration</spring.profiles.active>
|
<spring.profiles.active>integration</spring.profiles.active>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</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>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
@ -62,6 +62,7 @@
|
|||||||
<freemarker.version>2.3.28</freemarker.version>
|
<freemarker.version>2.3.28</freemarker.version>
|
||||||
<elasticsearch.version>6.3.2</elasticsearch.version>
|
<elasticsearch.version>6.3.2</elasticsearch.version>
|
||||||
<glassfish-el.version>3.0.0</glassfish-el.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>
|
<groovy.version>2.5.2</groovy.version>
|
||||||
<gson.version>2.8.5</gson.version>
|
<gson.version>2.8.5</gson.version>
|
||||||
<h2.version>1.4.197</h2.version>
|
<h2.version>1.4.197</h2.version>
|
||||||
@ -1832,6 +1833,11 @@
|
|||||||
<artifactId>javax.el</artifactId>
|
<artifactId>javax.el</artifactId>
|
||||||
<version>${glassfish-el.version}</version>
|
<version>${glassfish-el.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.glassfish.jaxb</groupId>
|
||||||
|
<artifactId>jaxb-runtime</artifactId>
|
||||||
|
<version>${glassfixh-jaxb.version}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.glassfish.jersey</groupId>
|
<groupId>org.glassfish.jersey</groupId>
|
||||||
<artifactId>jersey-bom</artifactId>
|
<artifactId>jersey-bom</artifactId>
|
||||||
|
@ -720,22 +720,5 @@
|
|||||||
<m2e.cdi.activation>false</m2e.cdi.activation>
|
<m2e.cdi.activation>false</m2e.cdi.activation>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</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>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
@ -105,7 +105,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -66,7 +66,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -56,7 +56,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9+</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,)</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
|
@ -49,21 +49,28 @@
|
|||||||
</build>
|
</build>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>java9</id>
|
<id>java9-10</id>
|
||||||
<activation>
|
<activation>
|
||||||
<jdk>[9,)</jdk>
|
<jdk>[9,10]</jdk>
|
||||||
</activation>
|
</activation>
|
||||||
<build>
|
<dependencies>
|
||||||
<plugins>
|
<dependency>
|
||||||
<plugin>
|
<groupId>javax.xml.bind</groupId>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<artifactId>jaxb-api</artifactId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
</dependency>
|
||||||
<configuration>
|
</dependencies>
|
||||||
<argLine>--add-modules java.base,java.xml.ws</argLine>
|
</profile>
|
||||||
</configuration>
|
<profile>
|
||||||
</plugin>
|
<id>java11+</id>
|
||||||
</plugins>
|
<activation>
|
||||||
</build>
|
<jdk>[11,)</jdk>
|
||||||
|
</activation>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.glassfish.jaxb</groupId>
|
||||||
|
<artifactId>jaxb-runtime</artifactId>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
Loading…
Reference in New Issue
Block a user