datastax · heesung-sohn · Feb 3, 2026 · Feb 3, 2026 · Feb 3, 2026 · Feb 3, 2026
diff --git a/activemq-filters/pom.xml b/activemq-filters/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>pulsar-jms-parent</artifactId>
     <groupId>com.datastax.oss</groupId>
-    <version>9.0.0-SNAPSHOT</version>
+    <version>8.0.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pulsar-jms-activemq-filters</artifactId>
@@ -69,7 +69,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <configuration>
-          <filters/>
+          <filters />
         </configuration>
         <executions>
           <execution>

diff --git a/activemq-filters/src/main/java/org/apache/activemq/Message.java b/activemq-filters/src/main/java/org/apache/activemq/Message.java
@@ -16,7 +16,7 @@
 package org.apache.activemq;
 
 /** Represents the JMS extension methods in Apache ActiveMQ */
-public interface Message extends jakarta.jms.Message {
+public interface Message extends javax.jms.Message {
 
   /**
    * Returns the MIME type of this mesage. This can be used in selectors to filter on the MIME types

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQDestination.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQDestination.java
@@ -15,12 +15,6 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.Destination;
-import jakarta.jms.JMSException;
-import jakarta.jms.Queue;
-import jakarta.jms.TemporaryQueue;
-import jakarta.jms.TemporaryTopic;
-import jakarta.jms.Topic;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
@@ -34,6 +28,12 @@
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.TemporaryQueue;
+import javax.jms.TemporaryTopic;
+import javax.jms.Topic;
 import org.apache.activemq.filter.AnyDestination;
 import org.apache.activemq.filter.DestinationFilter;
 import org.apache.activemq.jndi.JNDIBaseStorable;

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQMessage.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
@@ -15,17 +15,17 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.DeliveryMode;
-import jakarta.jms.Destination;
-import jakarta.jms.JMSException;
-import jakarta.jms.MessageFormatException;
-import jakarta.jms.MessageNotWriteableException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Vector;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.MessageFormatException;
+import javax.jms.MessageNotWriteableException;
 import org.apache.activemq.ScheduledMessage;
 import org.apache.activemq.filter.PropertyExpression;
 import org.apache.activemq.util.Callback;

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQQueue.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQQueue.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.JMSException;
-import jakarta.jms.Queue;
+import javax.jms.JMSException;
+import javax.jms.Queue;
 
 /** element="queue" description="An ActiveMQ Queue Destination" */
 public class ActiveMQQueue extends ActiveMQDestination implements Queue {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java
@@ -15,7 +15,7 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.JMSException;
+import javax.jms.JMSException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.JMSException;
-import jakarta.jms.TemporaryQueue;
+import javax.jms.JMSException;
+import javax.jms.TemporaryQueue;
 
 /** element="tempQueue" description="An ActiveMQ Temporary Queue Destination" */
 public class ActiveMQTempQueue extends ActiveMQTempDestination implements TemporaryQueue {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.JMSException;
-import jakarta.jms.TemporaryTopic;
+import javax.jms.JMSException;
+import javax.jms.TemporaryTopic;
 
 /** element="tempTopic" description="An ActiveMQ Temporary Topic Destination" */
 public class ActiveMQTempTopic extends ActiveMQTempDestination implements TemporaryTopic {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTopic.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTopic.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.JMSException;
-import jakarta.jms.Topic;
+import javax.jms.JMSException;
+import javax.jms.Topic;
 
 /** element="topic" description="An ActiveMQ Topic Destination" code="101" */
 public class ActiveMQTopic extends ActiveMQDestination implements Topic {

diff --git a/...rs/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java b/...rs/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java
@@ -15,11 +15,11 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.Destination;
-import jakarta.jms.JMSException;
-import jakarta.jms.Queue;
-import jakarta.jms.Topic;
 import java.lang.reflect.Method;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.Topic;
 
 public class DefaultUnresolvedDestinationTransformer implements UnresolvedDestinationTransformer {
 

diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/Message.java b/activemq-filters/src/main/java/org/apache/activemq/command/Message.java
@@ -15,7 +15,6 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.JMSException;
 import java.beans.Transient;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -27,6 +26,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.DeflaterOutputStream;
+import javax.jms.JMSException;
 import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.util.ByteArrayInputStream;

diff --git a/...q-filters/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java b/...q-filters/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.command;
 
-import jakarta.jms.Destination;
-import jakarta.jms.JMSException;
+import javax.jms.Destination;
+import javax.jms.JMSException;
 
 public interface UnresolvedDestinationTransformer {
 

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java
@@ -15,7 +15,7 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
+import javax.jms.JMSException;
 
 /** An expression which performs an operation on two expression values */
 public abstract class ArithmeticExpression extends BinaryExpression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanExpression.java
@@ -15,7 +15,7 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
+import javax.jms.JMSException;
 
 /** A BooleanExpression is an expression that always produces a Boolean result. */
 public interface BooleanExpression extends Expression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java b/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java
@@ -48,7 +48,7 @@ public BooleanFunctionCallExpr(String func_name, List<Expression> args)
    * @param message_ctx - message context against which the expression will be evaluated.
    * @return the boolean evaluation of the function call expression.
    */
-  public boolean matches(MessageEvaluationContext message_ctx) throws jakarta.jms.JMSException {
+  public boolean matches(MessageEvaluationContext message_ctx) throws javax.jms.JMSException {
     Boolean result;
 
     result = (Boolean) evaluate(message_ctx);

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/ComparisonExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/ComparisonExpression.java
@@ -15,11 +15,11 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
+import javax.jms.JMSException;
 
 /** A filter performing a comparison of two objects */
 public abstract class ComparisonExpression extends BinaryExpression implements BooleanExpression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/ConstantExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/ConstantExpression.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.math.BigDecimal;
+import javax.jms.JMSException;
 
 /** Represents a constant expression */
 public class ConstantExpression implements Expression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationFilter.java b/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationFilter.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.io.IOException;
+import javax.jms.JMSException;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.util.JMSExceptionSupport;
 

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationPath.java b/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationPath.java
@@ -15,9 +15,9 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.util.ArrayList;
 import java.util.List;
+import javax.jms.JMSException;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
 

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/Expression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/Expression.java
@@ -15,7 +15,7 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
+import javax.jms.JMSException;
 
 /** Represents an expression */
 public interface Expression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java
@@ -169,7 +169,7 @@ public Expression getArgument(int which) {
    *
    * @see Expression#evaluate
    */
-  public Object evaluate(MessageEvaluationContext message_ctx) throws jakarta.jms.JMSException {
+  public Object evaluate(MessageEvaluationContext message_ctx) throws javax.jms.JMSException {
     return this.filterFunc.evaluate(this, message_ctx);
   }
 

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/LogicExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/LogicExpression.java
@@ -15,9 +15,9 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.util.ArrayList;
 import java.util.List;
+import javax.jms.JMSException;
 
 /** A sequence of expressions, to be combined with OR or AND conjunctions. */
 public abstract class LogicExpression implements BooleanExpression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java b/activemq-filters/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java
@@ -15,13 +15,13 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import javax.jms.JMSException;
 
 /**
  * A MultiExpressionEvaluator is used to evaluate multiple expressions in single method call.

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/NoLocalExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/NoLocalExpression.java
@@ -15,8 +15,8 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.io.IOException;
+import javax.jms.JMSException;
 import org.apache.activemq.util.JMSExceptionSupport;
 
 public class NoLocalExpression implements BooleanExpression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/PropertyExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/PropertyExpression.java
@@ -15,11 +15,11 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import javax.jms.JMSException;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.TransactionId;

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/UnaryExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/UnaryExpression.java
@@ -15,12 +15,12 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import javax.jms.JMSException;
 
 /** An expression which performs an operation on two expression values */
 public abstract class UnaryExpression implements Expression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/XPathExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/XPathExpression.java
@@ -15,14 +15,14 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import javax.jms.JMSException;
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/XQueryExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/XQueryExpression.java
@@ -15,7 +15,7 @@
  */
 package org.apache.activemq.filter;
 
-import jakarta.jms.JMSException;
+import javax.jms.JMSException;
 
 /** Used to evaluate an XQuery Expression in a JMS selector. */
 public final class XQueryExpression implements BooleanExpression {

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/FilterFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/FilterFunction.java
@@ -53,5 +53,5 @@ public interface FilterFunction {
    * @param message - the context within which to evaluate the call.
    */
   public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message)
-      throws jakarta.jms.JMSException;
+      throws javax.jms.JMSException;
 }
diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/inListFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/inListFunction.java
@@ -63,7 +63,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) {
    * @return Boolean - the result of the evaluation.
    */
   public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx)
-      throws jakarta.jms.JMSException {
+      throws javax.jms.JMSException {
     java.util.List arr;
     int cur;
     Object cand;

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/makeListFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/makeListFunction.java
@@ -55,7 +55,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) {
    * @return java.util.List - the result of the evaluation.
    */
   public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message)
-      throws jakarta.jms.JMSException {
+      throws javax.jms.JMSException {
     java.util.ArrayList ele_arr;
     int num_arg;
     int cur;

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java
@@ -67,7 +67,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) {
    * @return true - if the value matches the regular expression; false - otherwise.
    */
   public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message)
-      throws jakarta.jms.JMSException {
+      throws javax.jms.JMSException {
     Object reg;
     Object cand;
     String reg_str;

diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/replaceFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/replaceFunction.java
@@ -58,7 +58,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) {
    * @return String - the result of the replacement.
    */
   public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx)
-      throws jakarta.jms.JMSException {
+      throws javax.jms.JMSException {
     String src;
     String match_regex;
     String repl_lit;