Skip to content

Commit f609de9

Browse files
committed
Update Gradle, ZAP, and Java
Update Gradle Wrapper to 8.13 and plugins. Update ZAP to 2.16. Use Java 17 which is the one that ZAP is targeting. Signed-off-by: thc202 <thc202@gmail.com>
1 parent 5fa0420 commit f609de9

File tree

10 files changed

+17
-13
lines changed

10 files changed

+17
-13
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
java: [11]
14+
java: [17]
1515

1616
steps:
1717
- uses: actions/checkout@v4

.github/workflows/crowdin-upload-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/setup-java@v4
1414
with:
1515
distribution: 'temurin'
16-
java-version: 11
16+
java-version: 17
1717
- name: Upload Files
1818
env:
1919
CROWDIN_AUTH_TOKEN: ${{ secrets.ZAPBOT_CROWDIN_TOKEN }}

.github/workflows/prepare-release-add-on.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'temurin'
23-
java-version: 11
23+
java-version: 17
2424
- name: Prepare Release and Create Pull Request
2525
env:
2626
ZAPBOT_TOKEN: ${{ secrets.ZAPBOT_TOKEN }}

.github/workflows/release-add-on.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'temurin'
23-
java-version: 11
23+
java-version: 17
2424
- name: Generate Release State
2525
run: ./gradlew :addOns:generateReleaseStateLastCommit
2626
- name: Build and Release Add-On

addOns/addOns.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ plugins {
1515
eclipse
1616
id("com.diffplug.spotless")
1717
id("org.zaproxy.common")
18-
id("org.zaproxy.add-on") version "0.11.0" apply false
19-
id("org.zaproxy.crowdin") version "0.4.0"
18+
id("org.zaproxy.add-on") version "0.13.1" apply false
19+
id("org.zaproxy.crowdin") version "0.6.0"
2020
}
2121

2222
eclipse {
@@ -81,13 +81,13 @@ subprojects {
8181
apply(plugin = "org.zaproxy.add-on")
8282

8383
java {
84-
val javaVersion = JavaVersion.VERSION_11
84+
val javaVersion = JavaVersion.VERSION_17
8585
sourceCompatibility = javaVersion
8686
targetCompatibility = javaVersion
8787
}
8888

8989
zapAddOn {
90-
zapVersion.set("2.15.0")
90+
zapVersion.set("2.16.0")
9191

9292
releaseLink.set(
9393
project.provider { "https://github.com/zaproxy/zap-core-help/releases/${zapAddOn.addOnId.get()}-v@CURRENT_VERSION@" },

gradle/wrapper/gradle-wrapper.jar

252 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f8b4f4772d302c8ff580bc40d0f56e715de69b163546944f787c87abf209c961
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
3+
distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -203,7 +205,7 @@ fi
203205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204206

205207
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207209
# and any embedded shellness will be escaped.
208210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209211
# treated as '${Hostname}' itself on the command line.

gradlew.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("org.zaproxy.common.settings") version "0.3.0"
2+
id("org.zaproxy.common.settings") version "0.5.0"
33

44
id("com.diffplug.spotless") version "6.25.0" apply false
55
}

0 commit comments

Comments
 (0)