[pull] main from zaproxy:main

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                      |

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"

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;

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.