Updating to JakartaEE 10 without source transformation

Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>
jboss · Feb 28, 2023 · 8fac411 · 8fac411
1 parent b5066be
commit 8fac411
Show file tree

Hide file tree

Showing 107 changed files with 5,219 additions and 5,538 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>15.5.0-SNAPSHOT</version>
+        <version>16.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-appclient</artifactId>

diff --git a/build-config/pom.xml b/build-config/pom.xml
@@ -29,5 +29,5 @@
     <groupId>org.jboss.metadata</groupId>
     <artifactId>metadata-build-config</artifactId>
     <name>Metadata Build Configuration</name>
-    <version>15.5.0-SNAPSHOT</version>
+    <version>16.0.0-SNAPSHOT</version>
 </project>
diff --git a/common/pom.xml b/common/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>15.5.0-SNAPSHOT</version>
+        <version>16.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>jboss-metadata-common</artifactId>
@@ -88,6 +88,13 @@
             <artifactId>jboss-logging</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.metadata</groupId>
+            <artifactId>jboss-metadata-test</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/common/src/main/java/org/jboss/metadata/javaee/spec/JMSConnectionFactoryMetaData.java b/common/src/main/java/org/jboss/metadata/javaee/spec/JMSConnectionFactoryMetaData.java
@@ -40,9 +40,9 @@ public class JMSConnectionFactoryMetaData extends NamedMetaDataWithDescriptions
     public static final int DEFAULT_MAX_POOL_SIZE = -1;
     public static final int DEFAULT_MIN_POOL_SIZE = -1;
 
-    public static final String CONNECTION_FACTORY_INTERFACE_NAME = "javax.jms.ConnectionFactory";
-    public static final String QUEUE_CONNECTION_FACTORY_INTERFACE_NAME = "javax.jms.QueueConnectionFactory";
-    public static final String TOPIC_CONNECTION_FACTORY_INTERFACE_NAME = "javax.jms.TopicConnectionFactory";
+    public static final String CONNECTION_FACTORY_INTERFACE_NAME = "jakarta.jms.ConnectionFactory";
+    public static final String QUEUE_CONNECTION_FACTORY_INTERFACE_NAME = "jakarta.jms.QueueConnectionFactory";
+    public static final String TOPIC_CONNECTION_FACTORY_INTERFACE_NAME = "jakarta.jms.TopicConnectionFactory";
     public static final String DEFAULT_INTERFACE_NAME = CONNECTION_FACTORY_INTERFACE_NAME;
 
     /**

diff --git a/common/src/main/java/org/jboss/metadata/javaee/spec/JMSDestinationMetaData.java b/common/src/main/java/org/jboss/metadata/javaee/spec/JMSDestinationMetaData.java
@@ -36,8 +36,8 @@ public class JMSDestinationMetaData extends NamedMetaDataWithDescriptions {
      */
     private static final long serialVersionUID = -8828730452352230094L;
 
-    public static final String QUEUE_INTERFACE_NAME = "javax.jms.Queue";
-    public static final String TOPIC_INTERFACE_NAME = "javax.jms.Topic";
+    public static final String QUEUE_INTERFACE_NAME = "jakarta.jms.Queue";
+    public static final String TOPIC_INTERFACE_NAME = "jakarta.jms.Topic";
 
     /**
      *

diff --git a/ear/pom.xml b/ear/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>15.5.0-SNAPSHOT</version>
+        <version>16.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jboss-metadata-ear</artifactId>

diff --git a/ejb/pom.xml b/ejb/pom.xml
@@ -3,9 +3,9 @@
     <parent>
         <groupId>org.jboss.metadata</groupId>
         <artifactId>jboss-as-parent-metadata</artifactId>
-        <version>15.5.0-SNAPSHOT</version>
+        <version>16.0.0-SNAPSHOT</version>
     </parent>
-
+	
     <artifactId>jboss-metadata-ejb</artifactId>
     <packaging>jar</packaging>
 
@@ -17,34 +17,38 @@
     <dependencies>
 
         <dependency>
-            <groupId>${javax.persistence.groupId}</groupId>
-            <artifactId>${javax.persistence.artifactId}</artifactId>
-            <scope>test</scope>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ejb</groupId>
+            <artifactId>jakarta.ejb-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.spec.javax.ejb</groupId>
-            <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.spec.javax.interceptor</groupId>
-            <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.spec.javax.jms</groupId>
-            <artifactId>jboss-jms-api_2.0_spec</artifactId>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.spec.javax.transaction</groupId>
-            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+            <groupId>org.jboss.metadata</groupId>
+            <artifactId>jboss-metadata-common</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.spec.javax.annotation</groupId>
-            <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
@@ -53,13 +57,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.metadata</groupId>
-            <artifactId>jboss-metadata-common</artifactId>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
+            <groupId>org.jboss.metadata</groupId>
+            <artifactId>jboss-metadata-common</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

diff --git a/ejb/src/main/java/org/jboss/metadata/ejb/common/IEnterpriseBeanMetaData.java b/ejb/src/main/java/org/jboss/metadata/ejb/common/IEnterpriseBeanMetaData.java
@@ -23,8 +23,8 @@
 
 import java.lang.reflect.Method;
 
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionManagementType;
 
 import org.jboss.metadata.ejb.spec.ContainerTransactionsMetaData;
 import org.jboss.metadata.ejb.spec.ExcludeListMetaData;

diff --git a/ejb/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java b/ejb/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
@@ -28,8 +28,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionManagementType;
 
 import org.jboss.metadata.ejb.common.IEnterpriseBeanMetaData;
 import org.jboss.metadata.common.ejb.JBossEnvironmentRefsGroupMetaData;