diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af5dd721..7e32d2d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [11, 21, 22] + java: [17, 21, 22] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/crowdin-build-translations.yml b/.github/workflows/crowdin-build-translations.yml index 822b6c67..918dc0cc 100644 --- a/.github/workflows/crowdin-build-translations.yml +++ b/.github/workflows/crowdin-build-translations.yml @@ -15,7 +15,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Build Translations env: CROWDIN_AUTH_TOKEN: ${{ secrets.ZAPBOT_CROWDIN_TOKEN }} diff --git a/.github/workflows/crowdin-download-translations.yml b/.github/workflows/crowdin-download-translations.yml index a00bca7b..cc1f167d 100644 --- a/.github/workflows/crowdin-download-translations.yml +++ b/.github/workflows/crowdin-download-translations.yml @@ -15,7 +15,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Download Translations env: CROWDIN_AUTH_TOKEN: ${{ secrets.ZAPBOT_CROWDIN_TOKEN }} diff --git a/.github/workflows/handle-release.yml b/.github/workflows/handle-release.yml index 1a4f5676..1a34a874 100644 --- a/.github/workflows/handle-release.yml +++ b/.github/workflows/handle-release.yml @@ -28,7 +28,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Handle Release run: cd zap-admin && ./gradlew handleRelease env: diff --git a/.github/workflows/update-add-on-release.yml b/.github/workflows/update-add-on-release.yml index 3dbe483a..b1ce1c7c 100644 --- a/.github/workflows/update-add-on-release.yml +++ b/.github/workflows/update-add-on-release.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Process Client Payload run: | echo "ADD_ON_DATA<<'EOF'" >> $GITHUB_ENV diff --git a/.github/workflows/update-daily-release.yml b/.github/workflows/update-daily-release.yml index 2a384248..12fd0b58 100644 --- a/.github/workflows/update-daily-release.yml +++ b/.github/workflows/update-daily-release.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Update Daily Release run: ./gradlew updateDailyRelease --url="${{ github.event.client_payload.url }}" --checksum="${{ github.event.client_payload.checksum }}" - name: Create Pull Request diff --git a/.github/workflows/update-main-release.yml b/.github/workflows/update-main-release.yml index eb9829db..ca5683c5 100644 --- a/.github/workflows/update-main-release.yml +++ b/.github/workflows/update-main-release.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: 11 + java-version: 17 - name: Create News Main Release run: ./gradlew createNewsMainRelease --release="${{ github.event.client_payload.version }}" - name: Update Main Release diff --git a/build.gradle.kts b/build.gradle.kts index 555b6bd7..f8abcc22 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,13 +46,13 @@ dependencies { "errorprone"("com.google.errorprone:error_prone_core:2.20.0") implementation("org.apache.commons:commons-text:1.10.0") - implementation("org.kohsuke:github-api:1.101") + implementation("org.kohsuke:github-api:1.326") compileOnly("com.infradna.tool:bridge-method-annotation:1.18") { exclude(group = "org.jenkins-ci") } compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.12") implementation("net.sf.json-lib:json-lib:2.4:jdk15") - implementation("org.zaproxy:zap:2.12.0") + implementation("org.zaproxy:zap:2.15.0") testImplementation("org.junit.jupiter:junit-jupiter:5.9.3") testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index dc073029..eb5f422f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,9 +16,9 @@ tasks.withType().configureEach { dependencies { implementation("commons-configuration:commons-configuration:1.10") - implementation("commons-codec:commons-codec:1.11") + implementation("commons-codec:commons-codec:1.17.1") - val flexmarkVersion = "0.50.48" + val flexmarkVersion = "0.64.8" implementation("com.vladsch.flexmark:flexmark-java:$flexmarkVersion") implementation("com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:$flexmarkVersion") implementation("com.vladsch.flexmark:flexmark-ext-gfm-tasklist:$flexmarkVersion") @@ -30,16 +30,16 @@ dependencies { implementation("com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion") implementation("org.apache.commons:commons-lang3:3.12.0") - val jgitVersion = "5.12.0.202106070339-r" + val jgitVersion = "7.1.0.202411261347-r" implementation("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion") implementation("org.eclipse.jgit:org.eclipse.jgit.archive:$jgitVersion") - implementation("org.kohsuke:github-api:1.106") + implementation("org.kohsuke:github-api:1.326") // Include annotations used by the above library to avoid compiler warnings. compileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1") compileOnly("com.infradna.tool:bridge-method-annotation:1.18") { exclude(group = "org.jenkins-ci") } - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2") implementation("org.snakeyaml:snakeyaml-engine:2.6") implementation("org.zaproxy:zap:2.15.0") }