From a2e6bd4974f8ba2d020d0a4ee4c0e4db7f2659ea Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Mon, 1 Aug 2022 13:47:41 -0400 Subject: [PATCH] Upgrade to Java 17 Closes gh-832 --- README.adoc | 4 ++-- buildSrc/build.gradle | 2 +- .../java/org/springframework/gradle/SpringJavaPlugin.java | 4 ++-- .../springframework/gradle/docs/SpringJavadocApiPlugin.java | 2 +- .../examples/spring-authorization-server-docs-examples.gradle | 2 +- docs/src/docs/asciidoc/getting-started.adoc | 2 +- .../samples-custom-consent-authorizationserver.gradle | 2 +- .../samples-default-authorizationserver.gradle | 2 +- .../samples-federated-identity-authorizationserver.gradle | 2 +- samples/messages-client/samples-messages-client.gradle | 2 +- samples/messages-resource/samples-messages-resource.gradle | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.adoc b/README.adoc index ca229065..0a93a427 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[JDK8 build]. +https://help.github.com/set-up-git-redirect[Git] and the https://www.oracle.com/technetwork/java/javase/downloads[JDK17 build]. -Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder extracted from the JDK download. +Be sure that your `JAVA_HOME` environment variable points to the `jdk17` folder extracted from the JDK download. === Check out sources [indent=0] diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 562ff59d..6bfa6ac5 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,7 +4,7 @@ plugins { id "groovy" } -sourceCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_17 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 ba687416..960f288c 100644 --- a/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java +++ b/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java @@ -73,7 +73,7 @@ public class SpringJavaPlugin implements Plugin { // Apply Java source compatibility version JavaPluginExtension java = project.getExtensions().getByType(JavaPluginExtension.class); - java.setTargetCompatibility(JavaVersion.VERSION_1_8); + java.setTargetCompatibility(JavaVersion.VERSION_17); // Configure Java tasks project.getTasks().withType(JavaCompile.class, (javaCompile) -> { @@ -81,7 +81,7 @@ public class SpringJavaPlugin implements Plugin { options.setEncoding("UTF-8"); options.getCompilerArgs().add("-parameters"); if (JavaVersion.current().isJava11Compatible()) { - options.getRelease().set(8); + options.getRelease().set(17); } }); project.getTasks().withType(Jar.class, (jar) -> jar.manifest((manifest) -> { 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 e161e775..dac79b1d 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().isJava8Compatible()) { + if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { project.copy((copy) -> copy.from(api.getDestinationDir()) .into(api.getDestinationDir()) .include("element-list") 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 9da0263a..24bbc4d5 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 = "1.8" +sourceCompatibility = "17" repositories { mavenCentral() diff --git a/docs/src/docs/asciidoc/getting-started.adoc b/docs/src/docs/asciidoc/getting-started.adoc index 8ddf13ae..b6d3843c 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 8 or higher Runtime Environment. +Spring Authorization Server requires a Java 17 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 a08c49ed..35eb1e15 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 = "1.8" +sourceCompatibility = "17" repositories { mavenCentral() diff --git a/samples/default-authorizationserver/samples-default-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle index 68a05721..a569441e 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 = "1.8" +sourceCompatibility = "17" 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 c0b2d0d7..9a7f785b 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 = "1.8" +sourceCompatibility = "17" repositories { mavenCentral() diff --git a/samples/messages-client/samples-messages-client.gradle b/samples/messages-client/samples-messages-client.gradle index 47948cf9..446a066c 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 = "1.8" +sourceCompatibility = "17" repositories { mavenCentral() diff --git a/samples/messages-resource/samples-messages-resource.gradle b/samples/messages-resource/samples-messages-resource.gradle index e72e82f7..d04a83e5 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 = "1.8" +sourceCompatibility = "17" repositories { mavenCentral()