Skip to content

[pull] main from zaproxy:main #107

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 4 commits into from
Dec 23, 2025
Merged

[pull] main from zaproxy:main #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d24689a
Update Log4j 2
thc202 Dec 23, 2025
f70c3ec
Merge pull request #9199 from thc202/update-log4j
kingthorin Dec 23, 2025
b97007c
Set the tag when updating the main release
thc202 Dec 23, 2025
ee7b801
Merge pull request #9200 from thc202/tag-release
psiinon Dec 23, 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
8 changes: 4 additions & 4 deletions LEGALNOTICE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ and subject to their respective licenses.
| 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.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 |
| log4j-1.2-api-2.25.3.jar | Apache 2.0 |
| log4j-api-2.25.3.jar | Apache 2.0 |
| log4j-core-2.25.3.jar | Apache 2.0 |
| log4j-jul-2.25.3.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 |
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/org/zaproxy/zap/tasks/UploadAssetsGitHubRelease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public void createRelease() throws IOException {
String releaseBody = release.getBody();
if (addChecksums.get()) {
releaseBody = updateChecksumsTable(releaseBody);
release.update().body(releaseBody).update();
release.update().body(releaseBody).tag(tagName).update();
}

for (Asset asset : assets) {
Expand Down
2 changes: 1 addition & 1 deletion zap/zap.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ dependencies {
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.25.2"
val log4jVersion = "2.25.3"
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")
Expand Down
Loading