Fixes #22895 Incorporate Jakarta Messaging 3.0.0-RC1

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java
index a6a09a6..8a23176 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -59,9 +59,9 @@
             asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE1_NAME);
             asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE2_NAME);
             System.out.println("Creating JMS resources");
-            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.QueueConnectionFactory", "jms/ejb_mdb_QCF");
+            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "jakarta.jms.QueueConnectionFactory", "jms/ejb_mdb_QCF");
             asadmin("create-jmsdest", "--target", CLUSTER_NAME, "--desttype", "ejb_mdb_Queue");
-            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.Queue", "--property", "imqDestinationName=ejb_mdb_Queue", "jms/ejb_mdb_Queue");
+            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "jakarta.jms.Queue", "--property", "imqDestinationName=ejb_mdb_Queue", "jms/ejb_mdb_Queue");
             System.out.println("Finished creating JMS resources");
 
             if (Boolean.getBoolean("enableShoalLogger")) {

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
index 87421d7..22d28b7 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
 package com.acme;
 
 import javax.ejb.*;
-import javax.jms.*;
+import jakarta.jms.*;
 
 /**
  *

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
index 5524f6d..2f9c8ec 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,10 +22,8 @@
 package com.acme;
 
 import java.sql.*;
-import java.util.Set;
-import java.util.HashSet;
 import javax.ejb.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 import javax.annotation.Resource;

appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java
index a5e478d..4bf4f0e 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/client/Client.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -53,9 +53,9 @@
             asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE1_NAME);
             asadmin("create-local-instance", "--cluster", CLUSTER_NAME, INSTANCE2_NAME);
             System.out.println("Creating JMS resources");
-            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.QueueConnectionFactory", "jms/ejb_mdb_QCF");
+            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "jakarta.jms.QueueConnectionFactory", "jms/ejb_mdb_QCF");
             asadmin("create-jmsdest", "--target", CLUSTER_NAME, "--desttype", "ejb_mdb_Queue");
-            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "javax.jms.Queue", "--property", "imqDestinationName=ejb_mdb_Queue", "jms/ejb_mdb_Queue");
+            asadmin("create-jms-resource", "--target", CLUSTER_NAME, "--restype", "jakarta.jms.Queue", "--property", "imqDestinationName=ejb_mdb_Queue", "jms/ejb_mdb_Queue");
             System.out.println("Finished creating JMS resources");
 
             if (Boolean.getBoolean("enableShoalLogger")) {

appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
index 87421d7..22d28b7 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,7 +22,7 @@
 package com.acme;
 
 import javax.ejb.*;
-import javax.jms.*;
+import jakarta.jms.*;
 
 /**
  *

appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
index f7d90fd..dd93613 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,10 +22,8 @@
 package com.acme;
 
 import java.sql.*;
-import java.util.Set;
-import java.util.HashSet;
 import javax.ejb.*;
-import javax.jms.*;
+import jakarta.jms.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 import javax.annotation.Resource;

appserver/tests/appserv-tests/devtests/transaction/txlao/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/transaction/txlao/descriptor/ejb-jar.xml
index a8e80b8..0d31a86 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/descriptor/ejb-jar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -86,13 +86,13 @@
       </resource-ref>
       <resource-ref>
         <res-ref-name>jms/QCFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
 

appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
index b10f0f6..8c00ea2 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -25,19 +25,18 @@
 import javax.sql.DataSource;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import java.util.Enumeration;
 import java.rmi.RemoteException;
 import java.util.*;
 
-import javax.jms.Queue;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.JMSException;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
+import jakarta.jms.Queue;
+import jakarta.jms.Message;
+import jakarta.jms.TextMessage;
+import jakarta.jms.QueueSender;
+import jakarta.jms.QueueSession;
+import jakarta.jms.JMSException;
+import jakarta.jms.QueueReceiver;
+import jakarta.jms.QueueConnection;
+import jakarta.jms.QueueConnectionFactory;
 
 
 public class TxBeanB implements SessionBean {

appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml
index 22119c9..cafb3c1 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -74,13 +74,13 @@
       </resource-ref>
       <resource-ref>
         <res-ref-name>jms/QCFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
 

appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.back

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.back b/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.back
index 22119c9..d6d80a9 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.back
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.back
@@ -74,13 +74,13 @@
       </resource-ref>
       <resource-ref>
         <res-ref-name>jms/QCFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
 

appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.template

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.template b/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.template
index 9f26a3f..fadf853 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.template
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/descriptor/ejb-jar.xml.template
@@ -74,13 +74,13 @@
       </resource-ref>
       <resource-ref>
         <res-ref-name>jms/QCFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
 

appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
index 429b81f..dbdbfba 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -20,24 +20,15 @@
 import javax.ejb.SessionContext;
 
 import java.sql.Statement;
-import java.sql.ResultSet;
 import javax.transaction.UserTransaction;
 import java.sql.Connection;
 import javax.sql.DataSource;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import java.util.Enumeration;
 import java.rmi.RemoteException;
 
-import javax.jms.Queue;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.JMSException;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnectionFactory;
 
 
 public class TxBeanB implements SessionBean {

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml
index 71b7857..66652e1 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
 <!--
 
-    Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -74,13 +74,13 @@
       </resource-ref>
       <resource-ref>
         <res-ref-name>jms/QCFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
 

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.back

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.back b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.back
index 22119c9..d6d80a9 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.back
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.back
@@ -74,13 +74,13 @@
       </resource-ref>
       <resource-ref>
         <res-ref-name>jms/QCFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
 

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.template

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.template b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.template
index 9f26a3f..fadf853 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.template
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/descriptor/ejb-jar.xml.template
@@ -74,13 +74,13 @@
       </resource-ref>
       <resource-ref>
         <res-ref-name>jms/QCFactory</res-ref-name>
-        <res-type>javax.jms.QueueConnectionFactory</res-type>
+        <res-type>jakarta.jms.QueueConnectionFactory</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>jms/SampleQueue</resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.jms.Queue</resource-env-ref-type>
       </resource-env-ref>
     </session>
 

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
index 278a5a9..a43e678 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -26,18 +26,9 @@
 import javax.sql.DataSource;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import java.util.Enumeration;
 import java.rmi.RemoteException;
-
-import javax.jms.Queue;
-import javax.jms.Message;
-import javax.jms.TextMessage;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.JMSException;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
+import jakarta.jms.Queue;
+import jakarta.jms.QueueConnectionFactory;
 
 
 public class TxBeanB implements SessionBean {