diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index ee5a47234..76afc3912 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -37,7 +37,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: liberica - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 @@ -64,7 +64,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: liberica - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 @@ -90,7 +90,7 @@ jobs: - name: "☕️ Setup JDK" uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: liberica - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml index fed8dcbbc..a7f0bda64 100644 --- a/.github/workflows/rat.yml +++ b/.github/workflows/rat.yml @@ -36,7 +36,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: liberica - java-version: 17 + java-version: 21 - name: "🐘 Setup Gradle" uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5551cd6c7..83196c174 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GRAILS_PUBLISH_RELEASE: true JAVA_DISTRIBUTION: liberica - JAVA_VERSION: 17.0.17 # this must be a specific version for reproducible builds, keep it synced with .sdkmanrc + JAVA_VERSION: 21.0.10 # this must be a specific version for reproducible builds, keep it synced with .sdkmanrc PROJECT_DESC: > Apache Grails Spring Security adds production-ready authentication and authorization to Apache Grails applications. diff --git a/.sdkmanrc b/.sdkmanrc index 84839beb1..f84f394c1 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,4 +1,4 @@ -java=17.0.17-librca +java=21.0.10-librca gradle=8.14.4 # This is here to support the test app generation in the *rest projects grails=7.0.7 \ No newline at end of file diff --git a/etc/bin/Dockerfile b/etc/bin/Dockerfile index 35d1855ff..b66d74f46 100644 --- a/etc/bin/Dockerfile +++ b/etc/bin/Dockerfile @@ -16,7 +16,7 @@ # for testing in a container that is similar to the github action linux build environment # run this from the root of the project # `docker build -t grails:testing -f etc/bin/Dockerfile . && docker run -it --rm -v $(pwd):/home/groovy/project grails:testing bash` -FROM bellsoft/liberica-openjdk-debian:17.0.17 +FROM bellsoft/liberica-openjdk-debian:21.0.10 USER root RUN apt-get update && apt-get install -y curl unzip coreutils libdigest-sha-perl gpg vim sudo psmisc locales groovy rsync diff --git a/gradle.properties b/gradle.properties index 31ec4f4e4..c0607a7f3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ # projectVersion=8.0.0-SNAPSHOT grailsVersion=8.0.0-SNAPSHOT -javaVersion=17 +javaVersion=21 unboundidLdapSdkVersion=7.0.3 apacheDsVersion=1.5.4