Skip to content

[pull] main from zaproxy:main #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Nov 11, 2025
Merged

[pull] main from zaproxy:main #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b8a6f8
Update dependencies
psiinon Nov 10, 2025
146fdc2
Merge pull request #9128 from psiinon/2.17/deps
thc202 Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions LEGALNOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ and subject to their respective licenses.
| Library | License |
|-------------------------------------|---------------------------|
| commons-beanutils-1.11.0.jar | Apache 2.0 |
| commons-codec-1.18.0.jar | Apache 2.0 |
| commons-codec-1.20.0.jar | Apache 2.0 |
| commons-collections-3.2.2.jar | Apache 2.0 |
| commons-configuration-1.10.jar | Apache 2.0 |
| commons-csv-1.12.0.jar | Apache 2.0 |
| commons-csv-1.14.1.jar | Apache 2.0 |
| commons-httpclient-3.1.jar | Apache 2.0 |
| commons-io-2.18.0.jar | Apache 2.0 |
| commons-io-2.21.0.jar | Apache 2.0 |
| commons-lang-2.6.jar | Apache 2.0 |
| commons-lang3-3.18.0.jar | Apache 2.0 |
| commons-lang3-3.19.0.jar | Apache 2.0 |
| commons-logging-1.3.5.jar | Apache 2.0 |
| commons-text-1.13.0.jar | Apache 2.0 |
| commons-text-1.14.0.jar | Apache 2.0 |
| ezmorph-1.0.6.jar | Apache 2.0 |
| flatlaf-3.6.2.jar | Apache 2.0 |
| flatlaf-swingx-3.6.2.jar | Apache 2.0 |
Expand All @@ -51,13 +51,13 @@ and subject to their respective licenses.
| javahelp-2.0.05.jar | GPL + classpath exception |
| java-semver-0.10.2.jar | MIT |
| jericho-html-3.4.jar | EPL / LGPL dual license |
| jfreechart-1.5.5.jar | LGPL |
| jgrapht-core-0.9.0.jar | LGPL 2.1 |
| jfreechart-1.5.6.jar | LGPL |
| jgrapht-core-0.9.2.jar | LGPL 2.1 |
| json-lib-2.4-jdk15.jar | MIT + "Good, Not Evil" |
| log4j-1.2-api-2.24.3.jar | Apache 2.0 |
| log4j-api-2.24.3".jar | Apache 2.0 |
| log4j-core-2.24.3.jar | Apache 2.0 |
| log4j-jul-2.24.3.jar | Apache 2.0 |
| log4j-1.2-api-2.25.2.jar | Apache 2.0 |
| log4j-api-2.25.2".jar | Apache 2.0 |
| log4j-core-2.25.2.jar | Apache 2.0 |
| log4j-jul-2.25.2.jar | Apache 2.0 |
| rsyntaxtextarea-3.6.0.jar | BSD-3 clause |
| swingx-all-1.6.5-1.jar | LGPL 2.1 |
| xom-1.3.9.jar | LGPL |
26 changes: 13 additions & 13 deletions zap/zap.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,27 @@ dependencies {
api("com.fifesoft:rsyntaxtextarea:3.6.0")
api("com.github.zafarkhaja:java-semver:0.10.2")
implementation("commons-beanutils:commons-beanutils:1.11.0")
api("commons-codec:commons-codec:1.18.0")
api("commons-codec:commons-codec:1.20.0")
api("commons-collections:commons-collections:3.2.2")
api("commons-configuration:commons-configuration:1.10")
api("commons-httpclient:commons-httpclient:3.1")
api("commons-io:commons-io:2.18.0")
api("commons-io:commons-io:2.21.0")
api("commons-lang:commons-lang:2.6")
api("org.apache.commons:commons-lang3:3.18.0")
api("org.apache.commons:commons-text:1.13.0")
api("org.apache.commons:commons-lang3:3.19.0")
api("org.apache.commons:commons-text:1.14.0")
implementation("edu.umass.cs.benchlab:harlib:1.1.3")
api("javax.help:javahelp:2.0.05")
val log4jVersion = "2.24.3"
val log4jVersion = "2.25.2"
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
api("org.apache.logging.log4j:log4j-1.2-api:$log4jVersion")
implementation("org.apache.logging.log4j:log4j-core:$log4jVersion")
implementation("org.apache.logging.log4j:log4j-jul:$log4jVersion")
api("net.htmlparser.jericho:jericho-html:3.4")
api("net.sf.json-lib:json-lib:2.4:jdk15")
api("org.apache.commons:commons-csv:1.14.0")
api("org.apache.commons:commons-csv:1.14.1")
api("org.hsqldb:hsqldb:2.7.4")
api("org.jfree:jfreechart:1.5.5")
api("org.jgrapht:jgrapht-core:0.9.0")
api("org.jfree:jfreechart:1.5.6")
api("org.jgrapht:jgrapht-core:0.9.2")
api("org.swinglabs.swingx:swingx-all:1.6.5-1")

implementation("com.formdev:flatlaf:3.6.2")
Expand All @@ -122,17 +122,17 @@ dependencies {
}

// Include annotations used by Log4j2 Core library to avoid compiler warnings.
compileOnly("biz.aQute.bnd:biz.aQute.bnd.annotation:7.0.0")
compileOnly("biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0")
compileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1")
testCompileOnly("biz.aQute.bnd:biz.aQute.bnd.annotation:6.4.1")
testCompileOnly("biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0")
testCompileOnly("com.google.code.findbugs:findbugs-annotations:3.0.1")

testImplementation("net.bytebuddy:byte-buddy:1.17.4")
testImplementation("net.bytebuddy:byte-buddy:1.18.0")
testImplementation("org.assertj:assertj-core:3.27.6")
testImplementation("org.hamcrest:hamcrest-core:3.0")
testImplementation("org.junit.jupiter:junit-jupiter:5.12.1")
testImplementation("org.junit.jupiter:junit-jupiter:6.0.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testImplementation("org.mockito:mockito-junit-jupiter:5.16.1")
testImplementation("org.mockito:mockito-junit-jupiter:5.20.0")
testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion")

testRuntimeOnly(files(distDir))
Expand Down
Loading