diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index b6ecef1a..01b44803 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -34,7 +34,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest] - jdk: [11] + jdk: [8,11,17] fail-fast: false runs-on: ${{ matrix.os }} if: needs.prerequisites.outputs.runjobs @@ -70,7 +70,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 8 - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Snapshot Tests @@ -90,7 +90,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 8 - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Deploy Artifacts @@ -114,7 +114,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 8 - name: Setup Gradle uses: gradle/gradle-build-action@v2 - name: Deploy Docs diff --git a/README.adoc b/README.adoc index 965b7935..ca229065 100644 --- a/README.adoc +++ b/README.adoc @@ -52,9 +52,9 @@ In the instructions below, https://vimeo.com/34436402[`./gradlew`] is invoked fr a cross-platform, self-contained bootstrap mechanism for the build. === Prerequisites -https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK11 build]. +https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK8 build]. -Be sure that your `JAVA_HOME` environment variable points to the `jdk11` folder extracted from the JDK download. +Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder extracted from the JDK download. === Check out sources [indent=0] diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1b48f80e..562ff59d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,7 +4,7 @@ plugins { id "groovy" } -sourceCompatibility = JavaVersion.VERSION_11 +sourceCompatibility = JavaVersion.VERSION_1_8 repositories { gradlePluginPortal() diff --git a/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java index 96f0d966..b43afd83 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java +++ b/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java @@ -73,14 +73,13 @@ public class SpringJavaPlugin implements Plugin { // Apply Java source compatibility version JavaPluginExtension java = project.getExtensions().getByType(JavaPluginExtension.class); - java.setTargetCompatibility(JavaVersion.VERSION_11); + java.setTargetCompatibility(JavaVersion.VERSION_1_8); // Configure Java tasks project.getTasks().withType(JavaCompile.class, (javaCompile) -> { CompileOptions options = javaCompile.getOptions(); options.setEncoding("UTF-8"); options.getCompilerArgs().add("-parameters"); - options.getRelease().set(11); }); project.getTasks().withType(Jar.class, (jar) -> jar.manifest((manifest) -> { Map attributes = new HashMap<>(); diff --git a/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocApiPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocApiPlugin.java index b922bc12..e161e775 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocApiPlugin.java +++ b/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocApiPlugin.java @@ -54,7 +54,7 @@ public class SpringJavadocApiPlugin implements Plugin { api.doLast(new Action() { @Override public void execute(Task task) { - if (JavaVersion.current().isJava11Compatible()) { + if (JavaVersion.current().isJava8Compatible()) { project.copy((copy) -> copy.from(api.getDestinationDir()) .into(api.getDestinationDir()) .include("element-list") diff --git a/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocOptionsPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocOptionsPlugin.java index 9967f59c..04d9073d 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocOptionsPlugin.java +++ b/buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocOptionsPlugin.java @@ -30,8 +30,6 @@ public class SpringJavadocOptionsPlugin implements Plugin { project.getTasks().withType(Javadoc.class, (javadoc) -> { StandardJavadocDocletOptions options = (StandardJavadocDocletOptions) javadoc.getOptions(); options.addStringOption("Xdoclint:none", "-quiet"); - // Workaround for Java 11 javadoc search bug. Can be removed with Java 17. - options.addBooleanOption("-no-module-directories", true); }); } } diff --git a/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle b/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle index ed2b7cad..9da0263a 100644 --- a/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle +++ b/docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle @@ -4,7 +4,7 @@ plugins { group = project.rootProject.group version = project.rootProject.version -sourceCompatibility = "11" +sourceCompatibility = "1.8" repositories { mavenCentral() diff --git a/docs/src/docs/asciidoc/getting-started.adoc b/docs/src/docs/asciidoc/getting-started.adoc index 8614704b..8ddf13ae 100644 --- a/docs/src/docs/asciidoc/getting-started.adoc +++ b/docs/src/docs/asciidoc/getting-started.adoc @@ -6,7 +6,7 @@ If you are just getting started with Spring Authorization Server, the following [[system-requirements]] == System Requirements -Spring Authorization Server requires a Java 11 or higher Runtime Environment. +Spring Authorization Server requires a Java 8 or higher Runtime Environment. [[installing-spring-authorization-server]] == Installing Spring Authorization Server diff --git a/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle index 868ca59f..a08c49ed 100644 --- a/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle +++ b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle @@ -6,7 +6,7 @@ plugins { group = project.rootProject.group version = project.rootProject.version -sourceCompatibility = "11" +sourceCompatibility = "1.8" repositories { mavenCentral() diff --git a/samples/default-authorizationserver/samples-default-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle index fafc054c..68a05721 100644 --- a/samples/default-authorizationserver/samples-default-authorizationserver.gradle +++ b/samples/default-authorizationserver/samples-default-authorizationserver.gradle @@ -6,7 +6,7 @@ plugins { group = project.rootProject.group version = project.rootProject.version -sourceCompatibility = "11" +sourceCompatibility = "1.8" repositories { mavenCentral() diff --git a/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle b/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle index 25dea5fe..c0b2d0d7 100644 --- a/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle +++ b/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle @@ -6,7 +6,7 @@ plugins { group = project.rootProject.group version = project.rootProject.version -sourceCompatibility = "11" +sourceCompatibility = "1.8" repositories { mavenCentral() diff --git a/samples/messages-client/samples-messages-client.gradle b/samples/messages-client/samples-messages-client.gradle index 5b17446f..47948cf9 100644 --- a/samples/messages-client/samples-messages-client.gradle +++ b/samples/messages-client/samples-messages-client.gradle @@ -6,7 +6,7 @@ plugins { group = project.rootProject.group version = project.rootProject.version -sourceCompatibility = "11" +sourceCompatibility = "1.8" repositories { mavenCentral() diff --git a/samples/messages-resource/samples-messages-resource.gradle b/samples/messages-resource/samples-messages-resource.gradle index cec410c1..e72e82f7 100644 --- a/samples/messages-resource/samples-messages-resource.gradle +++ b/samples/messages-resource/samples-messages-resource.gradle @@ -6,7 +6,7 @@ plugins { group = project.rootProject.group version = project.rootProject.version -sourceCompatibility = "11" +sourceCompatibility = "1.8" repositories { mavenCentral()