Merge pull request #5971 from psiinon/build/not-11

No longer support Java 11
zaproxy · Dec 2, 2024 · a74a763 · a74a763
2 parents 0d48a78 + 310521e
commit a74a763
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11, 17, 19]
+        java: [17, 19]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -24,6 +24,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
       - uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}

diff --git a/.github/workflows/crowdin-upload-files.yml b/.github/workflows/crowdin-upload-files.yml
@@ -17,7 +17,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
     - name: Upload Files
       env:
         CROWDIN_AUTH_TOKEN: ${{ secrets.ZAPBOT_CROWDIN_TOKEN }}

diff --git a/.github/workflows/prepare-release-add-on.yml b/.github/workflows/prepare-release-add-on.yml
@@ -20,7 +20,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
     - name: Prepare Release and Create Pull Request
       env:
         ZAPBOT_TOKEN: ${{ secrets.ZAPBOT_TOKEN }}

diff --git a/.github/workflows/release-add-on.yml b/.github/workflows/release-add-on.yml
@@ -20,7 +20,7 @@ jobs:
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 17
     - name: Generate Release State
       run: ./gradlew :addOns:generateReleaseStateLastCommit
     - name: Build and Release Add-On

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -49,7 +49,7 @@ allprojects {
         }
 
         java {
-            val javaVersion = JavaVersion.VERSION_11
+            val javaVersion = JavaVersion.VERSION_17
             sourceCompatibility = javaVersion
             targetCompatibility = javaVersion
         }