Bump QPID JMS Samples to Jakarta 3

ibmmqmet · Oct 24, 2024 · 3545072 · 3545072
1 parent a3b47bb
commit 3545072
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 39 deletions.
diff --git a/amqp-qpid/qpid-standard/README.md b/amqp-qpid/qpid-standard/README.md
@@ -2,6 +2,8 @@
 The main class for this sample is `JMS20Tester` which parses the arguments
 and determines the mode and options for the run.
 
+Tested with openjdk version 17.0.9 and 17.0.12 
+
 ## MQ Connection properties
 The properties that the samples need to connect to MQ are in the
 `resources/jndi.properties` file.

diff --git a/amqp-qpid/qpid-standard/pom.xml b/amqp-qpid/qpid-standard/pom.xml
@@ -32,15 +32,15 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>qpid-jms-client</artifactId>
-      <version>0.54.0</version>
+      <version>2.6.1</version>
     </dependency>
   </dependencies>
 
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.4</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>

diff --git a/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/BaseJMS20.java b/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/BaseJMS20.java
@@ -21,10 +21,10 @@
 import javax.naming.NamingException;
 import javax.naming.InitialContext;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.Queue;
-import javax.jms.Topic;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSContext;
+import jakarta.jms.Queue;
+import jakarta.jms.Topic;
 
 
 public class BaseJMS20 {

diff --git a/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/BrowseJMS20.java b/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/BrowseJMS20.java
@@ -20,10 +20,10 @@
 
 import java.util.Enumeration;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.QueueBrowser;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.QueueBrowser;
 
 public class BrowseJMS20 extends BaseJMS20 {
 

diff --git a/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/GetJMS20.java b/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/GetJMS20.java
@@ -18,12 +18,12 @@
 
 import java.util.logging.*;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSConsumer;
-import javax.jms.JMSException;
-import javax.jms.Message;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
 
 public class GetJMS20 extends BaseJMS20 {
 

diff --git a/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/Inspector.java b/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/Inspector.java
@@ -25,14 +25,14 @@
 
 import java.io.Serializable;
 
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MapMessage;
+import jakarta.jms.Message;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.StreamMessage;
+import jakarta.jms.TextMessage;
 
 public class Inspector {
   private static final Level LOGLEVEL = Level.ALL;

diff --git a/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/PutJMS20.java b/amqp-qpid/qpid-standard/src/main/java/com/ibm/mq/samples/jms/qpid/PutJMS20.java
@@ -18,19 +18,18 @@
 
 import java.util.logging.*;
 
-import javax.jms.BytesMessage;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.JMSConsumer;
-import javax.jms.JMSException;
-import javax.jms.JMSProducer;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.StreamMessage;
-import javax.jms.TemporaryQueue;
-import javax.jms.TextMessage;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.JMSConsumer;
+import jakarta.jms.JMSException;
+import jakarta.jms.JMSProducer;
+import jakarta.jms.MapMessage;
+import jakarta.jms.Message;
+import jakarta.jms.ObjectMessage;
+import jakarta.jms.Queue;
+import jakarta.jms.StreamMessage;
+import jakarta.jms.TemporaryQueue;
 
 public class PutJMS20 extends BaseJMS20 {
   private JMSProducer destination = null;