diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 7f3b1d67..68c64eef 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -22,7 +22,7 @@ jobs: if: github.repository == 'spring-projects/spring-session' strategy: matrix: - jdk: [8, 11] + jdk: [17] fail-fast: false steps: - uses: actions/checkout@v2 @@ -55,7 +55,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: '8' + java-version: '17' - name: Setup gradle user name run: | mkdir -p ~/.gradle @@ -83,7 +83,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: '8' + java-version: '17' - name: Setup gradle user name run: | mkdir -p ~/.gradle diff --git a/.github/workflows/pr-build-workflow.yml b/.github/workflows/pr-build-workflow.yml index 4bf8d1b8..b21d28cc 100644 --- a/.github/workflows/pr-build-workflow.yml +++ b/.github/workflows/pr-build-workflow.yml @@ -9,7 +9,7 @@ jobs: if: github.repository == 'spring-projects/spring-session' strategy: matrix: - jdk: [8, 11] + jdk: [17] fail-fast: false steps: - uses: actions/checkout@v2 diff --git a/build.gradle b/build.gradle index e415ab1a..c986cd3f 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ subprojects { apply plugin: 'io.spring.javaformat' plugins.withType(JavaPlugin) { - sourceCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 } tasks.withType(Test) { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index b4ac6088..6e47cd30 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -4,7 +4,7 @@ plugins { id "groovy" } -sourceCompatibility = 1.8 +sourceCompatibility = JavaVersion.VERSION_17 repositories { jcenter() diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy index 900cf9f1..8f558eab 100644 --- a/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy +++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy @@ -34,7 +34,7 @@ class JacocoPlugin implements Plugin { project.tasks.check.dependsOn project.tasks.jacocoTestReport project.jacoco { - toolVersion = '0.8.2' + toolVersion = '0.8.7' } } } diff --git a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java index 681d5c49..ae43f387 100644 --- a/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java +++ b/buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java @@ -28,7 +28,7 @@ public class JavadocApiPluginITest { .build(); assertThat(result.task(":api").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); File allClasses = new File(testKit.getRootDir(), "build/api/allclasses-noframe.html"); - File index = new File(testKit.getRootDir(), "build/api/allclasses.html"); + File index = new File(testKit.getRootDir(), "build/api/allclasses-index.html"); File listing = allClasses.exists() ? allClasses : index; String listingText = FileUtils.readFileToString(listing); assertThat(listingText).contains("sample/Api.html");