(jspwiki) 02/02: 2.12.3-git-10: further fixes to ensure that Log4J2 only processes properties related to it

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit c19aa0b790388f141a75a1d9be48eb971ed8be63
Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com>
AuthorDate: Fri Jul 25 14:07:59 2025 +0200

    2.12.3-git-10: further fixes to ensure that Log4J2 only processes 
properties related to it
---
 ChangeLog.md                                                       | 7 +++++++
 jspwiki-api/src/main/java/org/apache/wiki/api/Release.java         | 4 ++--
 .../apache/wiki/bootstrap/WikiBootstrapServletContextListener.java | 7 +++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index e5c2bb6d3..3aa3b77b4 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,13 @@ specific language governing permissions and limitations
 under the License.
 -->
 
+**2025-07-25  Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.3-git-10_
+
+* Further fixes on 2.12.3-git-10, to ensure that Log4J2 configuration from 
`jspwiki[-custom].properties` only loads Log4J2 related properties, that is, 
properties starting with one of: `appender`, `logger`, `rootLogger`, `filter`, 
`status`, `dest`, `name`, `properties`, `property` or `log4j2`
+    * An external Log4J2 config file can be used if additional properties are 
needed to be passed to Log4J2
+
 **2025-07-20  Juan Pablo Santos (juanpablo AT apache DOT org)**
 
 * _2.12.3-git-09_
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java 
b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index 5316db63a..d08478544 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -50,7 +50,7 @@ public final class Release {
      *  <p>
      *  If the POSTFIX is empty, it is not added to the version string.
      */
-    private static final String    POSTFIX       = "";
+    private static final String    POSTFIX       = "-git-";
 
     /** The JSPWiki major version. */
     public static final int        VERSION       = 2;
@@ -69,7 +69,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "";
+    public static final String     BUILD         = "10";
 
     /**
      *  This is the generic version string you should use when printing out 
the version.  It is of
diff --git 
a/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java
 
b/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java
index 1e13f3e87..db05a2a54 100644
--- 
a/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java
+++ 
b/jspwiki-bootstrap/src/main/java/org/apache/wiki/bootstrap/WikiBootstrapServletContextListener.java
@@ -39,6 +39,7 @@ import java.util.Properties;
 public class WikiBootstrapServletContextListener implements 
ServletContextListener {
 
     private static final Logger LOG = LogManager.getLogger( 
WikiBootstrapServletContextListener.class );
+    private static final String[] LOG4J_CONF = new String[] { "appender", 
"logger", "rootLogger", "filter", "status", "dest", "name", "properties", 
"property", "log4j2" };
 
     /** {@inheritDoc} */
     @Override
@@ -86,8 +87,10 @@ public class WikiBootstrapServletContextListener implements 
ServletContextListen
         try {
             final Properties log4JProperties = new Properties();
             properties.forEach( ( k, v ) -> {
-                if( !k.toString().startsWith( "jspwiki" ) ) {
-                    log4JProperties.put( k, v );
+                for( final String log4JNsProp : LOG4J_CONF ) {
+                    if( k.toString().startsWith( log4JNsProp ) ) {
+                        log4JProperties.put( k, v );
+                    }
                 }
             } );
             log4JProperties.store( out, null );