From b07ebd65481e793716cf6582e7b4205813f85b53 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Mon, 28 Nov 2022 13:18:35 -0600
Subject: [PATCH] Add client-side JMS support.

---
 airline/client/jms/pom.xml                    | 21 +++++++------------
 .../samples/airline/client/jms/JmsClient.java |  2 --
 .../airline/client/jms/JmsConfiguration.java  |  4 ++--
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/airline/client/jms/pom.xml b/airline/client/jms/pom.xml
index 114bc30..80388cb 100644
--- a/airline/client/jms/pom.xml
+++ b/airline/client/jms/pom.xml
@@ -18,8 +18,8 @@
 
 	<properties>
 		<activemq.version>4.1.2</activemq.version>
-		<java.version>1.8</java.version>
-		<jms.version>1.1</jms.version>
+		<java.version>17</java.version>
+        <jakarta-jms.version>3.1.0</jakarta-jms.version>
 		<log4j2.version>2.15.0</log4j2.version>
 		<sourcesDir>${project.basedir}/target/generated-sources/jaxws</sourcesDir>
 		<classesDir>${project.basedir}/target/classes</classesDir>
@@ -38,18 +38,11 @@
 			<artifactId>spring-ws-support</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jms_1.1_spec</artifactId>
-			<version>${jms.version}</version>
-		</dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>artemis-jakarta-client</artifactId>
+        </dependency>
 
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-			<version>${activemq.version}</version>
-		</dependency>
-
-	</dependencies>
+    </dependencies>
 
 </project>
diff --git a/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsClient.java b/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsClient.java
index 9a3570e..edcd06a 100644
--- a/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsClient.java
+++ b/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsClient.java
@@ -18,8 +18,6 @@ package org.springframework.ws.samples.airline.client.jms;
 
 import javax.xml.transform.stream.StreamResult;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.ws.client.core.support.WebServiceGatewaySupport;
 import org.springframework.xml.transform.StringSource;
 
diff --git a/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsConfiguration.java b/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsConfiguration.java
index 7ef3376..4016e70 100644
--- a/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsConfiguration.java
+++ b/airline/client/jms/src/main/java/org/springframework/ws/samples/airline/client/jms/JmsConfiguration.java
@@ -16,9 +16,9 @@
 
 package org.springframework.ws.samples.airline.client.jms;
 
-import javax.jms.ConnectionFactory;
+import jakarta.jms.ConnectionFactory;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.ws.transport.jms.JmsMessageSender;