Skip to content

Commit 62c0c40

Browse files
committed
Build project with Java 11
Closes gh-228
1 parent c88a181 commit 62c0c40

File tree

11 files changed

+35
-3
lines changed
  • ci/images
  • spring-javaformat/spring-javaformat-formatter-eclipse-runtime
  • spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests
  • spring-javaformat-intellij/spring-javaformat-intellij-plugin
  • spring-javaformat-maven/spring-javaformat-maven-plugin/src/it

11 files changed

+35
-3
lines changed

ci/images/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/c
1515
###########################################################
1616
# JAVA
1717
###########################################################
18-
JDK_URL="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b04/OpenJDK8U-jdk_x64_linux_hotspot_8u212b04.tar.gz"
18+
JDK_URL="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.9%2B11.1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.9_11.tar.gz"
1919

2020
mkdir -p /opt/openjdk
2121
cd /opt/openjdk

pom.xml

+3
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@
178178
<groupId>org.apache.maven.plugins</groupId>
179179
<artifactId>maven-javadoc-plugin</artifactId>
180180
<version>3.2.0</version>
181+
<configuration>
182+
<source>8</source>
183+
</configuration>
181184
</plugin>
182185
<plugin>
183186
<groupId>org.apache.maven.plugins</groupId>

spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml

+11
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,15 @@
2626
<scope>runtime</scope>
2727
</dependency>
2828
</dependencies>
29+
<build>
30+
<plugins>
31+
<plugin>
32+
<groupId>org.apache.maven.plugins</groupId>
33+
<artifactId>maven-javadoc-plugin</artifactId>
34+
<configuration>
35+
<skip>true</skip>
36+
</configuration>
37+
</plugin>
38+
</plugins>
39+
</build>
2940
</project>

spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,13 @@
138138
</resource>
139139
</resources>
140140
<plugins>
141+
<plugin>
142+
<groupId>org.apache.maven.plugins</groupId>
143+
<artifactId>maven-javadoc-plugin</artifactId>
144+
<configuration>
145+
<skip>true</skip>
146+
</configuration>
147+
</plugin>
141148
<plugin>
142149
<groupId>org.apache.maven.plugins</groupId>
143150
<artifactId>maven-shade-plugin</artifactId>

spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/apply/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<version>0.0.1.BUILD-SNAPSHOT</version>
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10+
<maven.compiler.source>1.8</maven.compiler.source>
11+
<maven.compiler.target>1.8</maven.compiler.target>
1012
</properties>
1113
<build>
1214
<plugins>

spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-bad/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<version>0.0.1.BUILD-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
<maven.compiler.source>1.8</maven.compiler.source>
12+
<maven.compiler.target>1.8</maven.compiler.target>
1113
</properties>
1214
<build>
1315
<plugins>

spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-exclude/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<version>0.0.1.BUILD-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
<maven.compiler.source>1.8</maven.compiler.source>
12+
<maven.compiler.target>1.8</maven.compiler.target>
1113
</properties>
1214
<build>
1315
<plugins>

spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-include/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<version>0.0.1.BUILD-SNAPSHOT</version>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
<maven.compiler.source>1.8</maven.compiler.source>
12+
<maven.compiler.target>1.8</maven.compiler.target>
1113
</properties>
1214
<build>
1315
<plugins>

spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-ok/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<version>0.0.1.BUILD-SNAPSHOT</version>
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10+
<maven.compiler.source>1.8</maven.compiler.source>
11+
<maven.compiler.target>1.8</maven.compiler.target>
1012
</properties>
1113
<build>
1214
<plugins>

spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-skip/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<version>0.0.1.BUILD-SNAPSHOT</version>
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
10+
<maven.compiler.source>1.8</maven.compiler.source>
11+
<maven.compiler.target>1.8</maven.compiler.target>
1012
</properties>
1113
<build>
1214
<plugins>

spring-javaformat/spring-javaformat-formatter-eclipse-runtime/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,7 @@
156156
<configuration>
157157
<includeDependency>false</includeDependency>
158158
<libs>
159-
<lib>${java.home}/lib/rt.jar</lib>
160-
<lib>${java.home}/lib/jsse.jar</lib>
159+
<lib>${java.home}/jmods</lib>
161160
</libs>
162161
<options>
163162
<option>-dontobfuscate</option>

0 commit comments

Comments
 (0)