Skip to content

Commit 712e7d5

Browse files
committed
Upgrade to Java 17 baseline
Closes gh-1945
1 parent 09ea3e4 commit 712e7d5

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: github.repository == 'spring-projects/spring-session'
2323
strategy:
2424
matrix:
25-
jdk: [8, 11]
25+
jdk: [17]
2626
fail-fast: false
2727
steps:
2828
- uses: actions/checkout@v2
@@ -55,7 +55,7 @@ jobs:
5555
- name: Set up JDK
5656
uses: actions/setup-java@v1
5757
with:
58-
java-version: '8'
58+
java-version: '17'
5959
- name: Setup gradle user name
6060
run: |
6161
mkdir -p ~/.gradle
@@ -83,7 +83,7 @@ jobs:
8383
- name: Set up JDK
8484
uses: actions/setup-java@v1
8585
with:
86-
java-version: '8'
86+
java-version: '17'
8787
- name: Setup gradle user name
8888
run: |
8989
mkdir -p ~/.gradle

.github/workflows/pr-build-workflow.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: github.repository == 'spring-projects/spring-session'
1010
strategy:
1111
matrix:
12-
jdk: [8, 11]
12+
jdk: [17]
1313
fail-fast: false
1414
steps:
1515
- uses: actions/checkout@v2

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ subprojects {
3535
apply plugin: 'io.spring.javaformat'
3636

3737
plugins.withType(JavaPlugin) {
38-
sourceCompatibility = JavaVersion.VERSION_1_8
38+
sourceCompatibility = JavaVersion.VERSION_17
3939
}
4040

4141
tasks.withType(Test) {

buildSrc/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id "groovy"
55
}
66

7-
sourceCompatibility = 1.8
7+
sourceCompatibility = JavaVersion.VERSION_17
88

99
repositories {
1010
jcenter()

buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class JacocoPlugin implements Plugin<Project> {
3434
project.tasks.check.dependsOn project.tasks.jacocoTestReport
3535

3636
project.jacoco {
37-
toolVersion = '0.8.2'
37+
toolVersion = '0.8.7'
3838
}
3939
}
4040
}

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void multiModuleApi() throws Exception {
2828
.build();
2929
assertThat(result.task(":api").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
3030
File allClasses = new File(testKit.getRootDir(), "build/api/allclasses-noframe.html");
31-
File index = new File(testKit.getRootDir(), "build/api/allclasses.html");
31+
File index = new File(testKit.getRootDir(), "build/api/allclasses-index.html");
3232
File listing = allClasses.exists() ? allClasses : index;
3333
String listingText = FileUtils.readFileToString(listing);
3434
assertThat(listingText).contains("sample/Api.html");

0 commit comments

Comments
 (0)