From c921713f535759d6052485e78c8f4c1cbd421d51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Thu, 19 Mar 2026 00:04:38 +0100
Subject: [PATCH] Backport: fix the imports and dependencies (#1793)

---
 activemq-stomp/pom.xml                               |  5 +++++
 .../transport/stomp/ProtocolConverterTest.java       |  2 --
 .../apache/activemq/transport/stomp/StompTest.java   |  2 +-
 .../apache/activemq/web/QueueBrowseServletTest.java  | 12 ++++++------
 pom.xml                                              |  5 +++++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index af2f824441e..4c36e7efb96 100644
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -53,6 +53,11 @@
       <artifactId>jettison</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <!-- =============================== -->
     <!-- Testing Dependencies            -->
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ProtocolConverterTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ProtocolConverterTest.java
index 17d293e3d89..7351189cfd9 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ProtocolConverterTest.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ProtocolConverterTest.java
@@ -27,9 +27,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 
-@Category(ParallelTest.class)
 public class ProtocolConverterTest {
 
     private final StompTransport transport = mock(StompTransport.class);
diff --git a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
index 113e750c964..4f25649ec87 100644
--- a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
+++ b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
@@ -23,7 +23,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import jakarta.jms.Destination;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.SocketTimeoutException;
@@ -39,6 +38,7 @@
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
+import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
 import javax.jms.Message;
diff --git a/activemq-web/src/test/java/org/apache/activemq/web/QueueBrowseServletTest.java b/activemq-web/src/test/java/org/apache/activemq/web/QueueBrowseServletTest.java
index 8abea6d40ae..3e4b8bf2783 100644
--- a/activemq-web/src/test/java/org/apache/activemq/web/QueueBrowseServletTest.java
+++ b/activemq-web/src/test/java/org/apache/activemq/web/QueueBrowseServletTest.java
@@ -22,12 +22,12 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import jakarta.jms.JMSException;
-import jakarta.jms.Message;
-import jakarta.jms.QueueBrowser;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.QueueBrowser;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 import org.apache.activemq.util.FactoryFinder;
diff --git a/pom.xml b/pom.xml
index 2dd77721967..bf610c583cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,6 +726,11 @@
         <artifactId>jackson-databind</artifactId>
         <version>${jackson-version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-xml</artifactId>
+        <version>${jackson-version}</version>
+      </dependency>
 
       <!-- Used to configure the activemq logs -->
       <dependency>