Build project with Java 11

Closes gh-228
spring-io · Dec 3, 2020 · 62c0c40 · 62c0c40
1 parent c88a181
commit 62c0c40
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 3 deletions.
diff --git a/ci/images/setup.sh b/ci/images/setup.sh
@@ -15,7 +15,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.2/c
 ###########################################################
 # JAVA
 ###########################################################
-JDK_URL="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u212-b04/OpenJDK8U-jdk_x64_linux_hotspot_8u212b04.tar.gz"
+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"
 
 mkdir -p /opt/openjdk
 cd /opt/openjdk

diff --git a/pom.xml b/pom.xml
@@ -178,6 +178,9 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
 					<version>3.2.0</version>
+					<configuration>
+						<source>8</source>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>

diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml
@@ -26,4 +26,15 @@
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml
@@ -138,6 +138,13 @@
 			</resource>
 		</resources>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>

diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/apply/pom.xml b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/apply/pom.xml
@@ -7,6 +7,8 @@
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<build>
 		<plugins>

diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-bad/pom.xml b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-bad/pom.xml
@@ -8,6 +8,8 @@
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<build>
 		<plugins>

diff --git a/...javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-exclude/pom.xml b/...javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-exclude/pom.xml
@@ -8,6 +8,8 @@
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<build>
 		<plugins>

diff --git a/...javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-include/pom.xml b/...javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-include/pom.xml
@@ -8,6 +8,8 @@
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<build>
 		<plugins>

diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-ok/pom.xml b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-ok/pom.xml
@@ -7,6 +7,8 @@
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<build>
 		<plugins>

diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-skip/pom.xml b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-skip/pom.xml
@@ -7,6 +7,8 @@
 	<version>0.0.1.BUILD-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<build>
 		<plugins>

diff --git a/spring-javaformat/spring-javaformat-formatter-eclipse-runtime/pom.xml b/spring-javaformat/spring-javaformat-formatter-eclipse-runtime/pom.xml
@@ -156,8 +156,7 @@
 						<configuration>
 							<includeDependency>false</includeDependency>
 							<libs>
-								<lib>${java.home}/lib/rt.jar</lib>
-								<lib>${java.home}/lib/jsse.jar</lib>
+								<lib>${java.home}/jmods</lib>
 							</libs>
 							<options>
 								<option>-dontobfuscate</option>