diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3c93696..d012e1fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,11 @@ jobs: - name: Set up Java uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 with: - java-version: "11" + java-version: "17" distribution: "temurin" - name: Set up Gradle uses: gradle/actions/setup-gradle@ac396bf1a80af16236baf54bd7330ae21dc6ece5 # v6 - + - name: Run copyright and code format checks run: ./gradlew --no-daemon spotlessCheck diff --git a/build.gradle b/build.gradle index ab292b3b..8e476ad7 100644 --- a/build.gradle +++ b/build.gradle @@ -14,13 +14,8 @@ subprojects { } java { - if(project.property("springBootPluginVersion") == "2.7.13") { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } else { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } ext { diff --git a/docker/github/Dockerfile b/docker/github/Dockerfile index 9a5836a6..9ae87f81 100644 --- a/docker/github/Dockerfile +++ b/docker/github/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:11-focal +FROM eclipse-temurin:17-jammy # Git is needed in order to update the dls submodule RUN apt-get update && apt-get install -y wget protobuf-compiler git diff --git a/springboot-basic/build.gradle b/springboot-basic/build.gradle index abb58290..0a76fcef 100644 --- a/springboot-basic/build.gradle +++ b/springboot-basic/build.gradle @@ -9,11 +9,7 @@ dependencies { runtimeOnly "io.micrometer:micrometer-registry-prometheus" dependencies { errorproneJavac('com.google.errorprone:javac:9+181-r4173-1') - if (JavaVersion.current().isJava11Compatible()) { - errorprone('com.google.errorprone:error_prone_core:2.28.0') - } else { - errorprone('com.google.errorprone:error_prone_core:2.28.0') - } + errorprone('com.google.errorprone:error_prone_core:2.28.0') } }