Skip to content

Commit d1ac774

Browse files
snicollsnicoll
committed
Configure build to be compatible with Java 11
See gh-14028
1 parent 930c838 commit d1ac774

File tree

16 files changed

+91
-41
lines changed
  • spring-boot-project
  • spring-boot-samples
    • spring-boot-sample-data-cassandra
    • spring-boot-sample-data-jpa
    • spring-boot-sample-data-rest
    • spring-boot-sample-flyway
    • spring-boot-sample-jersey
    • spring-boot-sample-jetty-jsp
    • spring-boot-sample-jpa
    • spring-boot-sample-jta-atomikos
    • spring-boot-sample-jta-bitronix
    • spring-boot-sample-test
    • spring-boot-sample-web-groovy-templates
    • spring-boot-sample-webservices

16 files changed

+91
-41
lines changed

‎spring-boot-project/spring-boot-autoconfigure/pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,4 +796,32 @@
796796
<scope>test</scope>
797797
</dependency>
798798
</dependencies>
799+
<profiles>
800+
<profile>
801+
<id>java9-10</id>
802+
<activation>
803+
<jdk>[9,10]</jdk>
804+
</activation>
805+
<dependencies>
806+
<dependency>
807+
<groupId>javax.xml.bind</groupId>
808+
<artifactId>jaxb-api</artifactId>
809+
<optional>true</optional>
810+
</dependency>
811+
</dependencies>
812+
</profile>
813+
<profile>
814+
<id>java11+</id>
815+
<activation>
816+
<jdk>[11,)</jdk>
817+
</activation>
818+
<dependencies>
819+
<dependency>
820+
<groupId>org.glassfish.jaxb</groupId>
821+
<artifactId>jaxb-runtime</artifactId>
822+
<optional>true</optional>
823+
</dependency>
824+
</dependencies>
825+
</profile>
826+
</profiles>
799827
</project>

‎spring-boot-project/spring-boot-cli/pom.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,5 +454,31 @@
454454
<spring.profiles.active>integration</spring.profiles.active>
455455
</properties>
456456
</profile>
457+
<profile>
458+
<id>java9-10</id>
459+
<activation>
460+
<jdk>[9,10]</jdk>
461+
</activation>
462+
<dependencies>
463+
<dependency>
464+
<groupId>javax.xml.bind</groupId>
465+
<artifactId>jaxb-api</artifactId>
466+
<optional>true</optional>
467+
</dependency>
468+
</dependencies>
469+
</profile>
470+
<profile>
471+
<id>java11+</id>
472+
<activation>
473+
<jdk>[11,)</jdk>
474+
</activation>
475+
<dependencies>
476+
<dependency>
477+
<groupId>org.glassfish.jaxb</groupId>
478+
<artifactId>jaxb-runtime</artifactId>
479+
<optional>true</optional>
480+
</dependency>
481+
</dependencies>
482+
</profile>
457483
</profiles>
458484
</project>

‎spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<freemarker.version>2.3.28</freemarker.version>
6363
<elasticsearch.version>6.3.2</elasticsearch.version>
6464
<glassfish-el.version>3.0.0</glassfish-el.version>
65+
<glassfixh-jaxb.version>2.4.0-b180725.0644</glassfixh-jaxb.version>
6566
<groovy.version>2.5.2</groovy.version>
6667
<gson.version>2.8.5</gson.version>
6768
<h2.version>1.4.197</h2.version>
@@ -1832,6 +1833,11 @@
18321833
<artifactId>javax.el</artifactId>
18331834
<version>${glassfish-el.version}</version>
18341835
</dependency>
1836+
<dependency>
1837+
<groupId>org.glassfish.jaxb</groupId>
1838+
<artifactId>jaxb-runtime</artifactId>
1839+
<version>${glassfixh-jaxb.version}</version>
1840+
</dependency>
18351841
<dependency>
18361842
<groupId>org.glassfish.jersey</groupId>
18371843
<artifactId>jersey-bom</artifactId>

‎spring-boot-project/spring-boot-parent/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -720,22 +720,5 @@
720720
<m2e.cdi.activation>false</m2e.cdi.activation>
721721
</properties>
722722
</profile>
723-
<profile>
724-
<id>java9</id>
725-
<activation>
726-
<jdk>[9,)</jdk>
727-
</activation>
728-
<build>
729-
<plugins>
730-
<plugin>
731-
<groupId>org.apache.maven.plugins</groupId>
732-
<artifactId>maven-surefire-plugin</artifactId>
733-
<configuration>
734-
<argLine>--add-modules java.base,java.xml.bind</argLine>
735-
</configuration>
736-
</plugin>
737-
</plugins>
738-
</build>
739-
</profile>
740723
</profiles>
741724
</project>

‎spring-boot-samples/spring-boot-sample-data-cassandra/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
</build>
106106
<profiles>
107107
<profile>
108-
<id>java9</id>
108+
<id>java9+</id>
109109
<activation>
110110
<jdk>[9,)</jdk>
111111
</activation>

‎spring-boot-samples/spring-boot-sample-data-jpa/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</build>
4848
<profiles>
4949
<profile>
50-
<id>java9</id>
50+
<id>java9+</id>
5151
<activation>
5252
<jdk>[9,)</jdk>
5353
</activation>

‎spring-boot-samples/spring-boot-sample-data-rest/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</build>
6767
<profiles>
6868
<profile>
69-
<id>java9</id>
69+
<id>java9+</id>
7070
<activation>
7171
<jdk>[9,)</jdk>
7272
</activation>

‎spring-boot-samples/spring-boot-sample-flyway/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</build>
5656
<profiles>
5757
<profile>
58-
<id>java9</id>
58+
<id>java9+</id>
5959
<activation>
6060
<jdk>[9,)</jdk>
6161
</activation>

‎spring-boot-samples/spring-boot-sample-jersey/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</build>
5757
<profiles>
5858
<profile>
59-
<id>java9</id>
59+
<id>java9+</id>
6060
<activation>
6161
<jdk>[9,)</jdk>
6262
</activation>

‎spring-boot-samples/spring-boot-sample-jetty-jsp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</build>
7272
<profiles>
7373
<profile>
74-
<id>java9</id>
74+
<id>java9+</id>
7575
<activation>
7676
<jdk>[9,)</jdk>
7777
</activation>

0 commit comments

Comments
 (0)