From b20935a43288e186c8b3be8c940445fa8b3043b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 6 Mar 2025 17:52:32 +0100 Subject: [PATCH] Restore JMS to use ActiveMQ This commit moves back the JMS-related integration tests to ActiveMQ. They were previously migrated to Artemis, as ActiveMQ did not have support for Jakarta. This is also due to Artemis not working on Java 23, see https://issues.apache.org/jira/browse/ARTEMIS-4975 fore more details. Closes gh-1482 --- spring-ws-platform/build.gradle | 2 +- spring-ws-support/build.gradle | 2 +- .../ws/transport/jms/JmsIntegrationTest.java | 23 ------------------ .../jms/JmsMessageSenderIntegrationTest.java | 19 --------------- ...ServiceMessageListenerIntegrationTest.java | 24 ------------------- .../transport/jms/jms-applicationContext.xml | 2 +- .../jms/jms-receiver-applicationContext.xml | 14 +++++------ .../jms/jms-sender-applicationContext.xml | 10 ++++---- 8 files changed, 15 insertions(+), 81 deletions(-) diff --git a/spring-ws-platform/build.gradle b/spring-ws-platform/build.gradle index d52e2b2a..d853817d 100644 --- a/spring-ws-platform/build.gradle +++ b/spring-ws-platform/build.gradle @@ -8,6 +8,7 @@ javaPlatform { dependencies { api(platform("org.apache.logging.log4j:log4j-bom:2.19.0")) + api(platform("org.apache.activemq:activemq-bom:6.1.5")) api(platform("org.eclipse.jetty:jetty-bom:12.0.16")) api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.16")) api(platform("org.junit:junit-bom:5.11.0")) @@ -32,7 +33,6 @@ dependencies { api("jaxen:jaxen:1.1.6") api("net.minidev:json-smart:2.5.2") api("net.sf.ehcache:ehcache:2.10.9.2") - api("org.apache.activemq:artemis-jakarta-server:2.33.0") api("org.apache.commons:commons-collections4:4.4") api("org.apache.httpcomponents.client5:httpclient5:5.2.3") api("org.apache.httpcomponents:httpclient:4.5.14") diff --git a/spring-ws-support/build.gradle b/spring-ws-support/build.gradle index bb5ff617..0bb5327d 100644 --- a/spring-ws-support/build.gradle +++ b/spring-ws-support/build.gradle @@ -30,7 +30,7 @@ dependencies { exclude(group: "commons-logging", module: "commons-logging") } testImplementation("jakarta.annotation:jakarta.annotation-api") - testImplementation("org.apache.activemq:artemis-jakarta-server") { + testImplementation("org.apache.activemq:activemq-broker") { exclude(group: "commons-logging", module: "commons-logging") } testImplementation("org.apache.logging.log4j:log4j-core") diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java index d456bf4e..387a6217 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsIntegrationTest.java @@ -15,11 +15,6 @@ */ package org.springframework.ws.transport.jms; -import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; -import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -39,24 +34,6 @@ public class JmsIntegrationTest { @Autowired private WebServiceTemplate webServiceTemplate; - private static EmbeddedActiveMQ server; - - @BeforeAll - static void setUp() throws Exception { - Configuration config = new ConfigurationImpl(); - config.addAcceptorConfiguration("vm", "vm://0"); - config.addAcceptorConfiguration("tcp", "tcp://127.0.0.1:61616"); - config.setSecurityEnabled(false); - server = new EmbeddedActiveMQ(); - server.setConfiguration(config); - server.start(); - } - - @AfterAll - static void tearDown() throws Exception { - server.stop(); - } - @Test public void testTemporaryQueue() { String content = ""; diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java index 2ff12233..96bcf074 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/JmsMessageSenderIntegrationTest.java @@ -24,10 +24,6 @@ import jakarta.jms.BytesMessage; import jakarta.jms.TextMessage; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPConstants; -import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; -import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -59,24 +55,9 @@ public class JmsMessageSenderIntegrationTest { private static final String SOAP_ACTION = "\"http://springframework.org/DoIt\""; - private EmbeddedActiveMQ server; - @BeforeEach public void createMessageFactory() throws Exception { messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); - - Configuration config = new ConfigurationImpl(); - config.addAcceptorConfiguration("vm", "vm://0"); - config.addAcceptorConfiguration("tcp", "tcp://127.0.0.1:61616"); - config.setSecurityEnabled(false); - server = new EmbeddedActiveMQ(); - server.setConfiguration(config); - server.start(); - } - - @AfterEach - void tearDown() throws Exception { - server.stop(); } @Test diff --git a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java index cc71d448..e1cde9b4 100644 --- a/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java +++ b/spring-ws-support/src/test/java/org/springframework/ws/transport/jms/WebServiceMessageListenerIntegrationTest.java @@ -23,11 +23,6 @@ import jakarta.jms.BytesMessage; import jakarta.jms.Queue; import jakarta.jms.TextMessage; import jakarta.jms.Topic; -import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; -import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -62,25 +57,6 @@ public class WebServiceMessageListenerIntegrationTest { @Autowired private Topic requestTopic; - private EmbeddedActiveMQ server; - - @BeforeEach - void setUp() throws Exception { - - Configuration config = new ConfigurationImpl(); - config.addAcceptorConfiguration("vm", "vm://0"); - config.addAcceptorConfiguration("tcp", "tcp://127.0.0.1:61616"); - config.setSecurityEnabled(false); - server = new EmbeddedActiveMQ(); - server.setConfiguration(config); - server.start(); - } - - @AfterEach - void tearDown() throws Exception { - server.stop(); - } - @Test public void testReceiveQueueBytesMessage() { diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml index d171d43b..5ab7c258 100644 --- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml +++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-applicationContext.xml @@ -2,7 +2,7 @@ - + diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml index 4fe712be..97743ce6 100644 --- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml +++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-receiver-applicationContext.xml @@ -2,20 +2,20 @@ - + - - + + - - + + - - + + diff --git a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml index 6329fc4a..db844692 100644 --- a/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml +++ b/spring-ws-support/src/test/resources/org/springframework/ws/transport/jms/jms-sender-applicationContext.xml @@ -2,16 +2,16 @@ - + - - + + - - + +