From 6a638b013dc17ab20a260bcfc399872ca2e2324c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 May 2026 07:37:49 +0000 Subject: [PATCH 1/3] Bump the gradle group with 6 updates Bumps the gradle group with 6 updates: | Package | From | To | | --- | --- | --- | | org.apache.logging.log4j:log4j-api | `2.25.4` | `2.26.0` | | org.apache.logging.log4j:log4j-1.2-api | `2.25.4` | `2.26.0` | | org.apache.logging.log4j:log4j-core | `2.25.4` | `2.26.0` | | org.apache.logging.log4j:log4j-jul | `2.25.4` | `2.26.0` | | org.apache.logging.log4j:log4j-slf4j-impl | `2.25.4` | `2.26.0` | | [xom:xom](https://github.com/elharo/xom) | `1.4.1` | `1.4.2` | Updates `org.apache.logging.log4j:log4j-api` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-1.2-api` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-core` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-jul` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-1.2-api` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-core` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-jul` from 2.25.4 to 2.26.0 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.25.4 to 2.26.0 Updates `xom:xom` from 1.4.1 to 1.4.2 - [Release notes](https://github.com/elharo/xom/releases) - [Commits](https://github.com/elharo/xom/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-1.2-api dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-core dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-jul dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-1.2-api dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-core dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-jul dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-version: 2.26.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: gradle - dependency-name: xom:xom dependency-version: 1.4.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: gradle ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3af67e44c35..dfa0110712e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] errorprone = "2.42.0" flatlaf = "3.7.1" -log4j = "2.25.4" +log4j = "2.26.0" [libraries] bndAnnotation = "biz.aQute.bnd:biz.aQute.bnd.annotation:7.2.3" @@ -36,7 +36,7 @@ log4j-jul = { module = "org.apache.logging.log4j:log4j-jul", version.ref = "log4 log4j-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" } rsyntaxtextarea = "com.fifesoft:rsyntaxtextarea:3.6.2" swingx = "org.swinglabs.swingx:swingx-all:1.6.5-1" -xom = "xom:xom:1.4.1" +xom = "xom:xom:1.4.2" assertj-core = "org.assertj:assertj-core:3.27.7" assertj-swing = "org.assertj:assertj-swing:3.17.1" From 81d4e2b5714d87e710cf7f7d8593d3fc33da81b9 Mon Sep 17 00:00:00 2001 From: thc202 Date: Thu, 14 May 2026 09:18:57 +0100 Subject: [PATCH 2/3] Refresh LEGALNOTICE and address deprecation Refresh LEGALNOTICE.md with latest versions. Replace usage of deprecated method. Signed-off-by: thc202 --- LEGALNOTICE.md | 10 +++++----- .../main/java/org/zaproxy/zap/view/SplashScreen.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LEGALNOTICE.md b/LEGALNOTICE.md index 3746badacac..c1c6e142319 100644 --- a/LEGALNOTICE.md +++ b/LEGALNOTICE.md @@ -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.4.jar | Apache 2.0 | -| log4j-api-2.25.4.jar | Apache 2.0 | -| log4j-core-2.25.4.jar | Apache 2.0 | -| log4j-jul-2.25.4.jar | Apache 2.0 | +| log4j-1.2-api-2.26.0.jar | Apache 2.0 | +| log4j-api-2.26.0.jar | Apache 2.0 | +| log4j-core-2.26.0.jar | Apache 2.0 | +| log4j-jul-2.26.0.jar | Apache 2.0 | | rsyntaxtextarea-3.6.2.jar | BSD-3 clause | | swingx-all-1.6.5-1.jar | LGPL 2.1 | -| xom-1.4.1.jar | LGPL | +| xom-1.4.2.jar | LGPL | diff --git a/zap/src/main/java/org/zaproxy/zap/view/SplashScreen.java b/zap/src/main/java/org/zaproxy/zap/view/SplashScreen.java index d8d020fcd34..5c5cc2e8f1d 100644 --- a/zap/src/main/java/org/zaproxy/zap/view/SplashScreen.java +++ b/zap/src/main/java/org/zaproxy/zap/view/SplashScreen.java @@ -346,7 +346,7 @@ static class SplashScreenAppender extends AbstractAppender { super( "ZAP-SplashScreenAppender", new LevelFilter(), - PatternLayout.newBuilder().withPattern("%p: %m%n").build(), + PatternLayout.newBuilder().setPattern("%p: %m%n").build(), true, NO_PROPERTIES); this.logConsumer = logConsumer; From f6abbf1d89ce2d7b2bf389272a61e826629a2310 Mon Sep 17 00:00:00 2001 From: Omar Issam Hasanen Date: Thu, 14 May 2026 11:33:50 +0300 Subject: [PATCH 3/3] Change title capitalization (#9332) Change title capitalization. Simplify excluded parameter dialog titles. Relates to #2000 --- .../org/zaproxy/zap/resources/Messages.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties b/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties index 27e83d872d2..948ffe96301 100644 --- a/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties +++ b/zap/src/main/resources/org/zaproxy/zap/resources/Messages.properties @@ -2727,7 +2727,7 @@ start.gui.cmdline.session.does.not.exist = Session given at command line does no start.gui.cmdline.session.path.invalid = Session path given at command line is invalid:\n{0} start.gui.dialog.fatal.error.init = Failed to start ZAP, mandatory add-on not found.\nRefer to log for more details. start.gui.dialog.fatal.error.message = A fatal error occurred that prevents ZAP from start.\nConsider reporting the error with following details: -start.gui.dialog.fatal.error.title = Failed to start ZAP +start.gui.dialog.fatal.error.title = Failed to Start ZAP start.gui.headless = ZAP GUI is not supported on a headless environment.\nRun ZAP inline or in daemon mode, use {0} command line argument for more details. start.gui.warn.addOnsOrExtensionsNoLongerRunning = The following add-ons, or its extensions, will no longer be run\nuntil its requirements are restored: start.splash.start = Starting ZAP...\n @@ -2806,7 +2806,7 @@ tab.break = Break tab.doubleClick.warning = You have double-clicked on a tab.\nThe tab window will now be maximised -\nyou can return the tab window to its previous\nsize by double clicking on the tab again.\nSelect Cancel to keep the tab window as it is. tab.noVisibleTabs.allDetachedMsg = Close any detached tabs to see them here. tab.noVisibleTabs.detachedOrHiddenMsg = Add tabs using the plus button or close any detached tabs to see them here. -tab.noVisibleTabs.title = No visible tabs +tab.noVisibleTabs.title = No Visible Tabs tab.popup.moveToNewWindow = Move Tab to New Window tab.sites = Sites @@ -2901,14 +2901,14 @@ users.table.header.id = ID users.table.header.name = Name variant.options.excludedparam.dialog.token.add.button.confirm = Add -variant.options.excludedparam.dialog.token.add.title = Add a parameter that needs to be excluded +variant.options.excludedparam.dialog.token.add.title = Add Excluded Parameter variant.options.excludedparam.dialog.token.modify.button.confirm = Modify -variant.options.excludedparam.dialog.token.modify.title = Modify existing Excluded Parameter +variant.options.excludedparam.dialog.token.modify.title = Modify Excluded Parameter variant.options.excludedparam.dialog.token.remove.button.cancel = Cancel variant.options.excludedparam.dialog.token.remove.button.confirm = Remove variant.options.excludedparam.dialog.token.remove.checkbox.label = Do not show this message again. variant.options.excludedparam.dialog.token.remove.text = Are you sure you want to remove the selected Parameter? -variant.options.excludedparam.dialog.token.remove.title = Remove Parameter that need to be Excluded +variant.options.excludedparam.dialog.token.remove.title = Remove Excluded Parameter variant.options.excludedparam.dialog.token.warning.invalid.regex.field.name = The provided regular expression for name is invalid. variant.options.excludedparam.dialog.token.warning.invalid.regex.title = Invalid Regular Expression variant.options.excludedparam.dialog.token.warning.name.repeated.text = An Excluded Parameter with the same name already exists.