Browse Source

Downgrade to Java 8

Closes gh-761
pull/775/head
Steve Riesenberg 4 years ago
parent
commit
e204b6bced
No known key found for this signature in database
GPG Key ID: 5F311AB48A55D521
  1. 8
      .github/workflows/continuous-integration-workflow.yml
  2. 4
      README.adoc
  3. 2
      buildSrc/build.gradle
  4. 3
      buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java
  5. 2
      buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocApiPlugin.java
  6. 2
      buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocOptionsPlugin.java
  7. 2
      docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle
  8. 2
      docs/src/docs/asciidoc/getting-started.adoc
  9. 2
      samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle
  10. 2
      samples/default-authorizationserver/samples-default-authorizationserver.gradle
  11. 2
      samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle
  12. 2
      samples/messages-client/samples-messages-client.gradle
  13. 2
      samples/messages-resource/samples-messages-resource.gradle

8
.github/workflows/continuous-integration-workflow.yml

@ -34,7 +34,7 @@ jobs: @@ -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: @@ -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: @@ -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: @@ -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

4
README.adoc

@ -52,9 +52,9 @@ In the instructions below, https://vimeo.com/34436402[`./gradlew`] is invoked fr @@ -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]

2
buildSrc/build.gradle

@ -4,7 +4,7 @@ plugins { @@ -4,7 +4,7 @@ plugins {
id "groovy"
}
sourceCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_1_8
repositories {
gradlePluginPortal()

3
buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java

@ -73,14 +73,13 @@ public class SpringJavaPlugin implements Plugin<Project> { @@ -73,14 +73,13 @@ public class SpringJavaPlugin implements Plugin<Project> {
// 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<String, String> attributes = new HashMap<>();

2
buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocApiPlugin.java

@ -54,7 +54,7 @@ public class SpringJavadocApiPlugin implements Plugin<Project> { @@ -54,7 +54,7 @@ public class SpringJavadocApiPlugin implements Plugin<Project> {
api.doLast(new Action<Task>() {
@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")

2
buildSrc/src/main/java/org/springframework/gradle/docs/SpringJavadocOptionsPlugin.java

@ -30,8 +30,6 @@ public class SpringJavadocOptionsPlugin implements Plugin<Project> { @@ -30,8 +30,6 @@ public class SpringJavadocOptionsPlugin implements Plugin<Project> {
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);
});
}
}

2
docs/src/docs/asciidoc/examples/spring-authorization-server-docs-examples.gradle

@ -4,7 +4,7 @@ plugins { @@ -4,7 +4,7 @@ plugins {
group = project.rootProject.group
version = project.rootProject.version
sourceCompatibility = "11"
sourceCompatibility = "1.8"
repositories {
mavenCentral()

2
docs/src/docs/asciidoc/getting-started.adoc

@ -6,7 +6,7 @@ If you are just getting started with Spring Authorization Server, the following @@ -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

2
samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle

@ -6,7 +6,7 @@ plugins { @@ -6,7 +6,7 @@ plugins {
group = project.rootProject.group
version = project.rootProject.version
sourceCompatibility = "11"
sourceCompatibility = "1.8"
repositories {
mavenCentral()

2
samples/default-authorizationserver/samples-default-authorizationserver.gradle

@ -6,7 +6,7 @@ plugins { @@ -6,7 +6,7 @@ plugins {
group = project.rootProject.group
version = project.rootProject.version
sourceCompatibility = "11"
sourceCompatibility = "1.8"
repositories {
mavenCentral()

2
samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle

@ -6,7 +6,7 @@ plugins { @@ -6,7 +6,7 @@ plugins {
group = project.rootProject.group
version = project.rootProject.version
sourceCompatibility = "11"
sourceCompatibility = "1.8"
repositories {
mavenCentral()

2
samples/messages-client/samples-messages-client.gradle

@ -6,7 +6,7 @@ plugins { @@ -6,7 +6,7 @@ plugins {
group = project.rootProject.group
version = project.rootProject.version
sourceCompatibility = "11"
sourceCompatibility = "1.8"
repositories {
mavenCentral()

2
samples/messages-resource/samples-messages-resource.gradle

@ -6,7 +6,7 @@ plugins { @@ -6,7 +6,7 @@ plugins {
group = project.rootProject.group
version = project.rootProject.version
sourceCompatibility = "11"
sourceCompatibility = "1.8"
repositories {
mavenCentral()

Loading…
Cancel
Save