Merge pull request #4313 from pdudits/payara-4253

PAYARA-4253 PAYARA-4060: Replace remaining JAVA EE api artifacts with Jakarta EE's
payara · Nov 13, 2019 · 3e3763d · 3e3763d
2 parents dfbcaaf + 58a9e8a
commit 3e3763d
Show file tree

Hide file tree

Showing 93 changed files with 433 additions and 393 deletions.
diff --git a/api/payara-api/pom.xml b/api/payara-api/pom.xml
@@ -174,8 +174,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

diff --git a/api/pom.xml b/api/pom.xml
@@ -81,9 +81,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>javax</groupId>
-                <artifactId>javaee-api</artifactId>
-                <version>${javaee.api.version}</version>
+                <groupId>jakarta.platform</groupId>
+                <artifactId>jakarta.jakartaee-api</artifactId>
+                <version>${jakartaee.api.version}</version>
                 <scope>provided</scope>
                 <optional>true</optional>
             </dependency>

diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml
@@ -74,12 +74,12 @@
             <scope>test</scope>
         </dependency>
             <dependency>
-                <groupId>javax.el</groupId>
-                <artifactId>javax.el-api</artifactId>
+                <groupId>jakarta.el</groupId>
+                <artifactId>jakarta.el-api</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.glassfish</groupId>
-                <artifactId>javax.el</artifactId>
+                <artifactId>jakarta.el</artifactId>
             </dependency>
     </dependencies>
 

diff --git a/appserver/admin/gf_template/src/main/resources/config/default-web.xml b/appserver/admin/gf_template/src/main/resources/config/default-web.xml
@@ -317,27 +317,27 @@
       <param-value>
         /lib/
         \lib\
-        javax.el.jar
-        javax.servlet-api.jar
-        javax.servlet.jsp-api.jar
-        javax.servlet.jsp.jstl-api.jar
+        jakarta.el.jar
+        jakarta.servlet-api.jar
+        jakarta.servlet.jsp-api.jar
+        jakarta.servlet.jsp.jstl-api.jar
         javax.servlet.jsp.jstl.jar
         jakarta.jms-api.jar
         jakarta.faces.jar
         javax.servlet.jsp.jar
         jspcaching-connector.jar
         web-glue.jar
         hibernate-validator.jar
-        jakarta.ejb.jar
-        javax.enterprise.deploy-api.jar
+        jakarta.ejb-api.jar
+        jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        javax.management.j2ee-api.jar
+        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
-        javax.resource-api.jar
-        javax.security.auth.message.jar
-        javax.security.jacc.jar
+        jakarta.resource-api.jar
+        jakarta.security.auth.message-api.jar
+        jakarta.security.jacc-api.jar
         jakarta.transaction-api.jar
-        javax.xml.rpc-api.jar
+        jakarta.xml.rpc-api.jar
         webservices-osgi.jar
         weld-osgi-bundle.jar
         jersey-mvc-jsp.jar

diff --git a/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml b/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml
@@ -314,27 +314,27 @@
       <param-value>
         /lib/
         \lib\
-        javax.el.jar
-        javax.servlet-api.jar
-        javax.servlet.jsp-api.jar
-        javax.servlet.jsp.jstl-api.jar
+        jakarta.el.jar
+        jakarta.servlet-api.jar
+        jakarta.servlet.jsp-api.jar
+        jakarta.servlet.jsp.jstl-api.jar
         javax.servlet.jsp.jstl.jar
         jakarta.jms-api.jar
         jakarta.faces.jar
         javax.servlet.jsp.jar
         jspcaching-connector.jar
         web-glue.jar
         bean-validator.jar
-        jakarta.ejb.jar
-        javax.enterprise.deploy-api.jar
+        jakarta.ejb-api.jar
+        jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        javax.management.j2ee-api.jar
+        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
-        javax.resource-api.jar
-        javax.security.auth.message.jar
-        javax.security.jacc.jar
+        jakarta.resource-api.jar
+        jakarta.security.auth.message-api.jar
+        jakarta.security.jacc-api.jar
         jakarta.transaction-api.jar
-        javax.xml.rpc-api.jar
+        jakarta.xml.rpc-api.jar
         webservices-osgi.jar
         weld-osgi-bundle.jar
         jersey-mvc-jsp.jar

diff --git a/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml
@@ -299,27 +299,27 @@
       <param-value>
         /lib/
         \lib\
-        javax.el.jar
-        javax.servlet-api.jar
-        javax.servlet.jsp-api.jar
-        javax.servlet.jsp.jstl-api.jar
+        jakarta.el.jar
+        jakarta.servlet-api.jar
+        jakarta.servlet.jsp-api.jar
+        jakarta.servlet.jsp.jstl-api.jar
         javax.servlet.jsp.jstl.jar
         jakarta.jms-api.jar
         jakarta.faces.jar
         javax.servlet.jsp.jar
         jspcaching-connector.jar
         web-glue.jar
         hibernate-validator.jar
-        jakarta.ejb.jar
-        javax.enterprise.deploy-api.jar
+        jakarta.ejb-api.jar
+        jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        javax.management.j2ee-api.jar
+        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
-        javax.resource-api.jar
-        javax.security.auth.message.jar
-        javax.security.jacc.jar
+        jakarta.resource-api.jar
+        jakarta.security.auth.message-api.jar
+        jakarta.security.jacc-api.jar
         jakarta.transaction-api.jar
-        javax.xml.rpc-api.jar
+        jakarta.xml.rpc-api.jar
         webservices-osgi.jar
         weld-osgi-bundle.jar
         jersey-mvc-jsp.jar

diff --git a/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml
@@ -323,27 +323,27 @@
       <param-value>
         /lib/
         \lib\
-        javax.el.jar
-        javax.servlet-api.jar
-        javax.servlet.jsp-api.jar
-        javax.servlet.jsp.jstl-api.jar
+        jakarta.el.jar
+        jakarta.servlet-api.jar
+        jakarta.servlet.jsp-api.jar
+        jakarta.servlet.jsp.jstl-api.jar
         javax.servlet.jsp.jstl.jar
         jakarta.jms-api.jar
         jakarta.faces.jar
         javax.servlet.jsp.jar
         jspcaching-connector.jar
         web-glue.jar
         bean-validator.jar
-        jakarta.ejb.jar
-        javax.enterprise.deploy-api.jar
+        jakarta.ejb-api.jar
+        jakarta.enterprise.deploy-api.jar
         jakarta.mail.jar
-        javax.management.j2ee-api.jar
+        jakarta.management.j2ee-api.jar
         jakarta.persistence.jar
-        javax.resource-api.jar
-        javax.security.auth.message.jar
-        javax.security.jacc.jar
+        jakarta.resource-api.jar
+        jakarta.security.auth.message-api.jar
+        jakarta.security.jacc-api.jar
         jakarta.transaction-api.jar
-        javax.xml.rpc-api.jar
+        jakarta.xml.rpc-api.jar
         webservices-osgi.jar
         weld-osgi-bundle.jar
         jersey-mvc-jsp.jar

diff --git a/appserver/admin/runtime/jsr77/pom.xml b/appserver/admin/runtime/jsr77/pom.xml
@@ -55,8 +55,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.management.j2ee</groupId>
-            <artifactId>javax.management.j2ee-api</artifactId>
+            <groupId>jakarta.management.j2ee</groupId>
+            <artifactId>jakarta.management.j2ee-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.deployment</groupId>

diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml
@@ -100,8 +100,8 @@
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
+                    <groupId>jakarta.servlet</groupId>
+                    <artifactId>jakarta.servlet-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -115,12 +115,12 @@
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>javax.servlet.jsp-api</artifactId>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
+            <artifactId>jakarta.el</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>

diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml
@@ -390,8 +390,8 @@
      </dependency>
 
      <dependency>
-         <groupId>javax.json.bind</groupId>
-         <artifactId>javax.json.bind-api</artifactId>
+         <groupId>jakarta.json.bind</groupId>
+         <artifactId>jakarta.json.bind-api</artifactId>
      </dependency>
 
      <dependency>
@@ -401,8 +401,8 @@
 
      <!-- JAXR -JSR-93 Support-->
      <dependency>
-         <groupId>javax.xml.registry</groupId>
-         <artifactId>javax.xml.registry-api</artifactId>
+         <groupId>jakarta.xml.registry</groupId>
+         <artifactId>jakarta.xml.registry-api</artifactId>
      </dependency>
 
         <!--
@@ -445,8 +445,8 @@
           <artifactId>weld-se-shaded</artifactId>
       </dependency>
       <dependency>
-          <groupId>javax.enterprise</groupId>
-          <artifactId>cdi-api</artifactId>
+          <groupId>jakarta.enterprise</groupId>
+          <artifactId>jakarta.enterprise.cdi-api</artifactId>
       </dependency>
 
     </dependencies>

diff --git a/appserver/batch/glassfish-batch-commands/pom.xml b/appserver/batch/glassfish-batch-commands/pom.xml
@@ -56,8 +56,8 @@
     <name>Batch Commands for Glassfish</name>
     <dependencies>
         <dependency>
-            <groupId>javax.batch</groupId>
-            <artifactId>javax.batch-api</artifactId>
+            <groupId>jakarta.batch</groupId>
+            <artifactId>jakarta.batch-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.ibm.jbatch</groupId>

diff --git a/appserver/batch/glassfish-batch-connector/pom.xml b/appserver/batch/glassfish-batch-connector/pom.xml
@@ -60,8 +60,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.batch</groupId>
-            <artifactId>javax.batch-api</artifactId>
+            <groupId>jakarta.batch</groupId>
+            <artifactId>jakarta.batch-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.ibm.jbatch</groupId>

diff --git a/appserver/batch/hazelcast-jbatch-store/pom.xml b/appserver/batch/hazelcast-jbatch-store/pom.xml
@@ -80,8 +80,8 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
             <artifactId>hazelcast</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.batch</groupId>
-            <artifactId>javax.batch-api</artifactId>
+            <groupId>jakarta.batch</groupId>
+            <artifactId>jakarta.batch-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/common/amx-javaee/pom.xml b/appserver/common/amx-javaee/pom.xml
@@ -74,8 +74,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.management.j2ee</groupId>
-            <artifactId>javax.management.j2ee-api</artifactId>
+            <groupId>jakarta.management.j2ee</groupId>
+            <artifactId>jakarta.management.j2ee-api</artifactId>
         </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.common</groupId>

diff --git a/appserver/common/container-common/pom.xml b/appserver/common/container-common/pom.xml
@@ -93,8 +93,8 @@
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.common</groupId>

diff --git a/appserver/common/mejb/pom.xml b/appserver/common/mejb/pom.xml
@@ -68,8 +68,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>javax.management.j2ee</groupId>
-            <artifactId>javax.management.j2ee-api</artifactId>
+            <groupId>jakarta.management.j2ee</groupId>
+            <artifactId>jakarta.management.j2ee-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.ejb</groupId>

diff --git a/appserver/common/stats77/pom.xml b/appserver/common/stats77/pom.xml
@@ -74,8 +74,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.management.j2ee</groupId>
-            <artifactId>javax.management.j2ee-api</artifactId>
+            <groupId>jakarta.management.j2ee</groupId>
+            <artifactId>jakarta.management.j2ee-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml
@@ -111,8 +111,8 @@
             <optional>true</optional>
         </dependency>
        <dependency>
-            <groupId>javax.enterprise.concurrent</groupId>
-            <artifactId>javax.enterprise.concurrent-api</artifactId>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
         </dependency>
        <dependency>
             <groupId>org.glassfish</groupId>

diff --git a/appserver/connectors/connectors-runtime/pom.xml b/appserver/connectors/connectors-runtime/pom.xml
@@ -200,8 +200,8 @@
 	    <artifactId>gmbal</artifactId>
         </dependency>
         <dependency>
-	    <groupId>javax.interceptor</groupId>
-	    <artifactId>javax.interceptor-api</artifactId>
+	    <groupId>jakarta.interceptor</groupId>
+	    <artifactId>jakarta.interceptor-api</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/appserver/deployment/client/pom.xml b/appserver/deployment/client/pom.xml
@@ -97,8 +97,8 @@
             <version>${project.version}</version>
         </dependency>   
         <dependency>
-            <groupId>javax.enterprise.deploy</groupId>
-            <artifactId>javax.enterprise.deploy-api</artifactId>
+            <groupId>jakarta.enterprise.deploy</groupId>
+            <artifactId>jakarta.enterprise.deploy-api</artifactId>
         </dependency>
         <dependency>
             <groupId>fish.payara.server.internal.deployment</groupId>

diff --git a/appserver/deployment/dol/pom.xml b/appserver/deployment/dol/pom.xml
@@ -119,16 +119,16 @@
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.enterprise.deploy</groupId>
-            <artifactId>javax.enterprise.deploy-api</artifactId>
+            <groupId>jakarta.enterprise.deploy</groupId>
+            <artifactId>jakarta.enterprise.deploy-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>