tomitribe · jgallimore · Jul 23, 2025 · Aug 21, 2025 · Aug 25, 2025 · Sep 3, 2025
diff --git a/LICENSE b/LICENSE
diff --git a/NOTICE b/NOTICE
@@ -1,35 +1,5 @@
-Apache ActiveMQ Copyright 2005-2024 Apache Software Foundation
+Apache ActiveMQ Copyright 2005-2025 Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-==============================================================
- Jetty Web Container
- Copyright 1995-2006 Mort Bay Consulting Pty Ltd
-==============================================================
-
-This product includes some software developed at The Apache Software
-Foundation (http://www.apache.org/).
-
-The javax.servlet package used by Jetty is copyright
-Sun Microsystems, Inc and Apache Software Foundation. It is
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
-modified April 2001  by Iris Van den Broeke, Daniel Deville.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum
-  1999 Jason Gilbert.
-
-This product includes software developed by
-   Yahoo! Inc. (www.yahoo.com)
-   Copyright (c) 2010 Yahoo! Inc.  All rights reserved.
-
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-all</artifactId>

diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-amqp</artifactId>

diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-blueprint</artifactId>

diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-broker</artifactId>

diff --git a/activemq-broker/src/main/java/org/apache/activemq/util/XmlFactories.java b/activemq-broker/src/main/java/org/apache/activemq/util/XmlFactories.java
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
+
+/**
+ * Utility class to obtain XML-processing related factories with pre-configured safe parameters. Prefer to centralize
+ * these parameters here instead of doing ad-hoc on several places.
+ */
+public final class XmlFactories {
+    private static final Logger LOG = LoggerFactory.getLogger(XmlFactories.class);
+
+    private XmlFactories() { /* Do not instantiate */ }
+
+    public static DocumentBuilderFactory getSafeDocumentBuilderFactory() {
+        DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
+
+        // See https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.md#java
+        trySetFeature(builderFactory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
+        trySetFeature(builderFactory,"http://apache.org/xml/features/disallow-doctype-decl", true);
+        trySetFeature(builderFactory,"http://xml.org/sax/features/external-general-entities", false);
+        trySetFeature(builderFactory,"http://xml.org/sax/features/external-parameter-entities", false);
+        trySetFeature(builderFactory,"http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+
+        return builderFactory;
+    }
+
+    public static TransformerFactory getSafeTransformFactory() {
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        trySetFeature(transformerFactory, XMLConstants.FEATURE_SECURE_PROCESSING, true);
+
+        // See https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.md#transformerfactory
+        transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+        transformerFactory.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+
+        return transformerFactory;
+    }
+
+    private static void trySetFeature(final DocumentBuilderFactory factory, final String name, final boolean value) {
+        try {
+            factory.setFeature(name, value);
+        } catch (final ParserConfigurationException e) {
+            LOG.warn("Error setting document builder factory feature", e);
+        }
+    }
+
+    private static void trySetFeature(final TransformerFactory factory, final String name, final boolean value) {
+        try {
+            factory.setFeature(name, value);
+        } catch (final TransformerConfigurationException e) {
+            LOG.warn("Error setting transformer factory feature", e);
+        }
+    }
+}
diff --git a/activemq-cf/pom.xml b/activemq-cf/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-cf</artifactId>

diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-client</artifactId>

diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-console</artifactId>

diff --git a/activemq-console/src/main/java/org/apache/activemq/console/command/CreateCommand.java b/activemq-console/src/main/java/org/apache/activemq/console/command/CreateCommand.java
@@ -16,13 +16,12 @@
  */
 package org.apache.activemq.console.command;
 
+import org.apache.activemq.util.XmlFactories;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.*;
 import javax.xml.transform.dom.DOMSource;
@@ -159,10 +158,7 @@ protected void copyActivemqConf(File srcBase, File targetBase, String activemqCo
         File dest = new File(targetBase, DEFAULT_TARGET_ACTIVEMQ_CONF);
         context.print("Copying from: " + src.getCanonicalPath() + "\n          to: " + dest.getCanonicalPath());
 
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
-        dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-        DocumentBuilder builder = dbf.newDocumentBuilder();
+        DocumentBuilder builder = XmlFactories.getSafeDocumentBuilderFactory().newDocumentBuilder();
         Element docElem = builder.parse(src).getDocumentElement();
 
         XPath xpath = XPathFactory.newInstance().newXPath();
@@ -208,13 +204,10 @@ private void writeFile(String typeName, File dest) throws IOException {
 
     // utlity method to write an xml source to file
     private void writeToFile(Source src, File file) throws TransformerException {
-        TransformerFactory tFactory = TransformerFactory.newInstance();
-        tFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
-
-        Transformer fileTransformer = tFactory.newTransformer();
-
-        Result res = new StreamResult(file);
-        fileTransformer.transform(src, res);
+        final Result res = new StreamResult(file);
+        XmlFactories.getSafeTransformFactory()
+                .newTransformer()
+                .transform(src, res);
     }
 
     // utility method to copy one file to another

diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-http</artifactId>

diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jaas</artifactId>

diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jdbc-store</artifactId>

diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-jms-pool</artifactId>

diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-kahadb-store</artifactId>

diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -448,10 +448,10 @@ public void run() {
                 }
             } catch (IOException ioe) {
                 LOG.error("Checkpoint failed", ioe);
-                brokerService.handleIOException(ioe);
+                handleIOException("CheckpointRunner", ioe);
             } catch (Throwable e) {
                 LOG.error("Checkpoint failed", e);
-                brokerService.handleIOException(IOExceptionSupport.create(e));
+                handleIOException("CheckpointRunner", IOExceptionSupport.create(e));
             }
         }
     }
@@ -1967,7 +1967,7 @@ public void visit(List<Location> keys, List<Long> values) {
                             final StoredDestination destination = entry.getValue();
                             final String subscriptionKey = subscription.getKey();
                             final SequenceSet pendingAcks = destination.ackPositions.get(tx, subscriptionKey);
-                            LOG.trace("sub {} on {} in dataFile {} has pendingCount {}", subscriptionKey, entry.getKey(), dataFileId, pendingAcks.rangeSize()-1);
+                            LOG.trace("sub {} on {} in dataFile {} has pendingCount {}", subscriptionKey, entry.getKey(), dataFileId, (pendingAcks != null ? pendingAcks.rangeSize()-1 : 0));
                         }
                         gcCandidateSet.remove(dataFileId);
                     }
@@ -2120,10 +2120,10 @@ public void run() {
                     forwarded = true;
                 } catch (IOException ioe) {
                     LOG.error("Forwarding of acks failed", ioe);
-                    brokerService.handleIOException(ioe);
+                    handleIOException("AckCompactionRunner", ioe);
                 } catch (Throwable e) {
                     LOG.error("Forwarding of acks failed", e);
-                    brokerService.handleIOException(IOExceptionSupport.create(e));
+                    handleIOException("AckCompactionRunner", IOExceptionSupport.create(e));
                 }
             } finally {
                 checkpointLock.readLock().unlock();
@@ -2136,10 +2136,10 @@ public void run() {
                 }
             } catch (IOException ioe) {
                 LOG.error("Checkpoint failed", ioe);
-                brokerService.handleIOException(ioe);
+                handleIOException("AckCompactionRunner", ioe);
             } catch (Throwable e) {
                 LOG.error("Checkpoint failed", e);
-                brokerService.handleIOException(IOExceptionSupport.create(e));
+                handleIOException("AckCompactionRunner", IOExceptionSupport.create(e));
             }
         }
     }
@@ -4274,4 +4274,27 @@ protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, Clas
         }
 
     }
+
+    /*
+     * Execute the configured IOExceptionHandler when an IOException is thrown during
+     * task execution and handle any runtime exceptions that the handler itself might throw.
+     *
+     * By default, the DefaultIOExceptionHandler will stop the broker when handling an IOException,
+     * however, if DefaultIOExceptionHandler is configured with startStopConnectors to be true
+     * it will throw a SuppressReplyException and not stop the broker. It's also possible another
+     * custom implementation of IOExceptionHandler could throw a runtime exception.
+     *
+     * This method will now handle and log those runtime exceptions so that the task will not
+     * die and will continue to execute future iterations if the broker is not shut down.
+     */
+    private void handleIOException(String taskName, IOException ioe) {
+        try {
+            brokerService.handleIOException(ioe);
+        } catch (RuntimeException e) {
+            LOG.warn("IOException handler threw exception in task {} with "
+                    + "error: {}, continuing.", taskName,
+                e.getMessage());
+            LOG.debug(e.getMessage(), e);
+        }
+    }
 }
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-karaf-itest</artifactId>

diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-karaf</artifactId>

diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
@@ -67,7 +67,7 @@
       <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson-version}</bundle>
       <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-version}</bundle>
-      <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
+      <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-annotations-version}</bundle>
     </feature>
 
     <!-- JMS1.1 and JMS2.0 support via the same Geronimo JMS 2 bundle  -->

diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-log4j-appender</artifactId>

diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-mqtt</artifactId>

diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.activemq</groupId>
     <artifactId>activemq-parent</artifactId>
-    <version>6.1.8-TT.4-SNAPSHOT</version>
+    <version>6.1.9-TT.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>activemq-openwire-generator</artifactId>