From 62c0c400e3ec37f46a46519567c245f0c0b3c336 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 2 Dec 2020 17:36:30 -0800 Subject: [PATCH] Build project with Java 11 Closes gh-228 --- ci/images/setup.sh | 2 +- pom.xml | 3 +++ .../io.spring.javaformat.eclipse.tests/pom.xml | 11 +++++++++++ .../spring-javaformat-intellij-plugin/pom.xml | 7 +++++++ .../src/it/apply/pom.xml | 2 ++ .../src/it/validate-bad/pom.xml | 2 ++ .../src/it/validate-gensource-exclude/pom.xml | 2 ++ .../src/it/validate-gensource-include/pom.xml | 2 ++ .../src/it/validate-ok/pom.xml | 2 ++ .../src/it/validate-skip/pom.xml | 2 ++ .../pom.xml | 3 +-- 11 files changed, 35 insertions(+), 3 deletions(-) diff --git a/ci/images/setup.sh b/ci/images/setup.sh index bd10576e..67b4550a 100755 --- 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 index a6a99750..1d2524fa 100644 --- a/pom.xml +++ b/pom.xml @@ -178,6 +178,9 @@ org.apache.maven.plugins maven-javadoc-plugin 3.2.0 + + 8 + org.apache.maven.plugins diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml b/spring-javaformat-eclipse/io.spring.javaformat.eclipse.tests/pom.xml index a3e11ae4..7cef959c 100644 --- 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 @@ runtime + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + diff --git a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml index 12270888..02e7865c 100644 --- a/spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml +++ b/spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml @@ -138,6 +138,13 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + org.apache.maven.plugins maven-shade-plugin 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 index 35a6dbe5..252e99b8 100644 --- 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 @@ 0.0.1.BUILD-SNAPSHOT UTF-8 + 1.8 + 1.8 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 index 9288d43a..7c23eaf4 100644 --- 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 @@ 0.0.1.BUILD-SNAPSHOT UTF-8 + 1.8 + 1.8 diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-exclude/pom.xml b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-exclude/pom.xml index 9e61971f..d213bc7b 100644 --- a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-exclude/pom.xml +++ b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-exclude/pom.xml @@ -8,6 +8,8 @@ 0.0.1.BUILD-SNAPSHOT UTF-8 + 1.8 + 1.8 diff --git a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-include/pom.xml b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-include/pom.xml index 9c522c95..820f2c24 100644 --- a/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-include/pom.xml +++ b/spring-javaformat-maven/spring-javaformat-maven-plugin/src/it/validate-gensource-include/pom.xml @@ -8,6 +8,8 @@ 0.0.1.BUILD-SNAPSHOT UTF-8 + 1.8 + 1.8 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 index 0641c178..61fde7ba 100644 --- 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 @@ 0.0.1.BUILD-SNAPSHOT UTF-8 + 1.8 + 1.8 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 index 7977c4fb..84c27feb 100644 --- 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 @@ 0.0.1.BUILD-SNAPSHOT UTF-8 + 1.8 + 1.8 diff --git a/spring-javaformat/spring-javaformat-formatter-eclipse-runtime/pom.xml b/spring-javaformat/spring-javaformat-formatter-eclipse-runtime/pom.xml index 02318338..76889c50 100644 --- a/spring-javaformat/spring-javaformat-formatter-eclipse-runtime/pom.xml +++ b/spring-javaformat/spring-javaformat-formatter-eclipse-runtime/pom.xml @@ -156,8 +156,7 @@ false - ${java.home}/lib/rt.jar - ${java.home}/lib/jsse.jar + ${java.home}/jmods