changes to support Jakartaee10 jars and Glassfish 7 (#11)

* changes to support latest glassfish 6.X * make folders generic without glassfish version. Signed-off-by: gurunandan.rao@oracle.com <gurunandan.rao@oracle.com>
arquillian · Apr 20, 2022 · 9e2f3de · 9e2f3de
1 parent 6cfec45
commit 9e2f3de
Show file tree

Hide file tree

Showing 35 changed files with 63 additions and 55 deletions.
diff --git a/glassfish-common/pom.xml b/glassfish-common/pom.xml
@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arquillian-parent-glassfish6</artifactId>
+    <artifactId>arquillian-container-glassfish-jakarta</artifactId>
     <groupId>org.jboss.arquillian.container</groupId>
     <version>1.0.0.Final-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
-  <artifactId>arquillian-glassfish6-common</artifactId>
-  <name>Arquillian Container GlassFish 6+ Common Services</name>
+  <artifactId>arquillian-glassfish-common</artifactId>
+  <name>Arquillian Container GlassFish 7+ Common Services</name>
 
   <dependencies>
 
@@ -34,7 +34,5 @@
       <groupId>org.glassfish.jersey.media</groupId>
       <artifactId>jersey-media-multipart</artifactId>
     </dependency>
-
-
   </dependencies>
 </project>
diff --git a/...ed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/...ed-6/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/glassfish-managed-6/pom.xml → glassfish-managed/pom.xml b/glassfish-managed-6/pom.xml → glassfish-managed/pom.xml
@@ -4,14 +4,19 @@
 
   <parent>
     <groupId>org.jboss.arquillian.container</groupId>
-    <artifactId>arquillian-parent-glassfish6</artifactId>
+    <artifactId>arquillian-container-glassfish-jakarta</artifactId>
     <version>1.0.0.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>arquillian-glassfish-managed-6</artifactId>
-  <name>Arquillian Container GlassFish Managed 6</name>
-  <description>GlassFish 6 Managed Container integration for the Arquillian Project</description>
+  <artifactId>arquillian-glassfish-managed</artifactId>
+  <name>Arquillian Container GlassFish Managed 7</name>
+  <description>GlassFish 7 Managed Container integration for the Arquillian Project</description>
+
+  <!-- Properties -->
+  <properties>
+    <version.arquillian_core>1.7.0.Alpha10</version.arquillian_core>
+  </properties>
 
   <dependencies>
 
@@ -26,42 +31,49 @@
 
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-glassfish6-common</artifactId>
+      <artifactId>arquillian-glassfish-common</artifactId>
       <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>arquillian-container-spi</artifactId>
+      <version>${version.arquillian_core}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>arquillian-container-test-spi</artifactId>
+      <version>${version.arquillian_core}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.protocol</groupId>
       <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+      <version>${version.arquillian_core}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.testenricher</groupId>
       <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
+      <version>${version.arquillian_core}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.testenricher</groupId>
       <artifactId>arquillian-testenricher-ejb-jakarta</artifactId>
+      <version>${version.arquillian_core}</version>    
     </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.testenricher</groupId>
       <artifactId>arquillian-testenricher-resource-jakarta</artifactId>
+      <version>${version.arquillian_core}</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.testenricher</groupId>
       <artifactId>arquillian-testenricher-initialcontext</artifactId>
+      <version>${version.arquillian_core}</version>
     </dependency>
 
     <dependency>
@@ -136,7 +148,7 @@
                 <configuration>
                   <rules>
                     <requireJavaVersion>
-                      <version>[1.8,9)</version>
+                      <version>[11,)</version>
                     </requireJavaVersion>
                   </rules>
                 </configuration>
@@ -148,8 +160,7 @@
       <properties>
         <groupId>org.glassfish.main.distributions</groupId>
         <artifactId>glassfish</artifactId>
-        <version.glassfish>${version.glassfish6}</version.glassfish>
-        <glassfish.home>glassfish6</glassfish.home>
+        <glassfish.home>glassfish7</glassfish.home>
         <enableDerby>false</enableDerby>
       </properties>
     </profile>

diff --git a/...assFishManagedContainerConfiguration.java → ...assFishManagedContainerConfiguration.java b/...assFishManagedContainerConfiguration.java → ...assFishManagedContainerConfiguration.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.glassfish.CommonGlassFishConfiguration;
 import org.jboss.arquillian.container.glassfish.clientutils.GlassFishClient;

diff --git a/...6/GlassFishManagedContainerExtension.java → ...d/GlassFishManagedContainerExtension.java b/...6/GlassFishManagedContainerExtension.java → ...d/GlassFishManagedContainerExtension.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import org.jboss.arquillian.core.spi.LoadableExtension;

diff --git a/.../GlassFishManagedDeployableContainer.java → .../GlassFishManagedDeployableContainer.java b/.../GlassFishManagedDeployableContainer.java → .../GlassFishManagedDeployableContainer.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.glassfish.CommonGlassFishManager;
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;

diff --git a/...ish/managed_6/GlassFishServerControl.java → ...sfish/managed/GlassFishServerControl.java b/...ish/managed_6/GlassFishServerControl.java → ...sfish/managed/GlassFishServerControl.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.spi.client.container.LifecycleException;
 

diff --git a/...aged/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/...aged/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.jboss.arquillian.container.glassfish.managed.GlassFishManagedContainerExtension
diff --git a/...r/glassfish/managed_6/CDIJarTestCase.java → ...ner/glassfish/managed/CDIJarTestCase.java b/...r/glassfish/managed_6/CDIJarTestCase.java → ...ner/glassfish/managed/CDIJarTestCase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

diff --git a/...d_6/GlassFishDeployWithoutAppXmlTest.java → ...ged/GlassFishDeployWithoutAppXmlTest.java b/...d_6/GlassFishDeployWithoutAppXmlTest.java → ...ged/GlassFishDeployWithoutAppXmlTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

diff --git a/...aged_6/GlassFishManagedDeployEarTest.java → ...anaged/GlassFishManagedDeployEarTest.java b/...aged_6/GlassFishManagedDeployEarTest.java → ...anaged/GlassFishManagedDeployEarTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

diff --git a/...aged_6/GlassFishManagedDeployWarTest.java → ...anaged/GlassFishManagedDeployWarTest.java b/...aged_6/GlassFishManagedDeployWarTest.java → ...anaged/GlassFishManagedDeployWarTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;

diff --git a/...assFishManagedDeploymentTestTemplate.java → ...assFishManagedDeploymentTestTemplate.java b/...assFishManagedDeploymentTestTemplate.java → ...assFishManagedDeploymentTestTemplate.java
@@ -1,4 +1,4 @@
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.junit.Test;

diff --git a/...ontainer/glassfish/managed_6/Greeter.java → .../container/glassfish/managed/Greeter.java b/...ontainer/glassfish/managed_6/Greeter.java → .../container/glassfish/managed/Greeter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import jakarta.ejb.Stateless;
 import java.io.Serializable;

diff --git a/...r/glassfish/managed_6/GreeterServlet.java → ...ner/glassfish/managed/GreeterServlet.java b/...r/glassfish/managed_6/GreeterServlet.java → ...ner/glassfish/managed/GreeterServlet.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import jakarta.ejb.EJB;
 import jakarta.servlet.ServletException;

diff --git a/...sh/managed_6/GreeterServletWithDerby.java → ...fish/managed/GreeterServletWithDerby.java b/...sh/managed_6/GreeterServletWithDerby.java → ...fish/managed/GreeterServletWithDerby.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import jakarta.annotation.Resource;
 import jakarta.ejb.EJB;

diff --git a/...ainer/glassfish/managed_6/SimpleBean.java → ...ntainer/glassfish/managed/SimpleBean.java b/...ainer/glassfish/managed_6/SimpleBean.java → ...ntainer/glassfish/managed/SimpleBean.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 public class SimpleBean {
 }
diff --git a/...iner/glassfish/managed_6/StartGFTest.java → ...tainer/glassfish/managed/StartGFTest.java b/...iner/glassfish/managed_6/StartGFTest.java → ...tainer/glassfish/managed/StartGFTest.java
@@ -1,4 +1,4 @@
-package org.jboss.arquillian.container.glassfish.managed_6;
+package org.jboss.arquillian.container.glassfish.managed;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;

diff --git a/...aged-6/src/test/resources/application.xml → ...anaged/src/test/resources/application.xml b/...aged-6/src/test/resources/application.xml → ...anaged/src/test/resources/application.xml
diff --git a/...naged-6/src/test/resources/arquillian.xml → ...managed/src/test/resources/arquillian.xml b/...naged-6/src/test/resources/arquillian.xml → ...managed/src/test/resources/arquillian.xml
diff --git a/glassfish-remote-6/README.txt → glassfish-remote/README.txt b/glassfish-remote-6/README.txt → glassfish-remote/README.txt
diff --git a/glassfish-remote-6/pom.xml → glassfish-remote/pom.xml b/glassfish-remote-6/pom.xml → glassfish-remote/pom.xml
@@ -3,16 +3,16 @@
 
   <parent>
     <groupId>org.jboss.arquillian.container</groupId>
-    <artifactId>arquillian-parent-glassfish6</artifactId>
+    <artifactId>arquillian-container-glassfish-jakarta</artifactId>
     <version>1.0.0.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>arquillian-glassfish-remote-6</artifactId>
-  <name>Arquillian Container GlassFish Remote 6.x</name>
-  <description>GlassFish 6.x Remote Container integration for the Arquillian Project</description>
+  <artifactId>arquillian-glassfish-remote</artifactId>
+  <name>Arquillian Container GlassFish Remote 7.x</name>
+  <description>GlassFish 7.x Remote Container integration for the Arquillian Project</description>
 
   <dependencies>
     <dependency>
@@ -26,7 +26,7 @@
 
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-glassfish6-common</artifactId>
+      <artifactId>arquillian-glassfish-common</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...lassfish/remote_6/GlassFishExtension.java → .../glassfish/remote/GlassFishExtension.java b/...lassfish/remote_6/GlassFishExtension.java → .../glassfish/remote/GlassFishExtension.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.container.glassfish.remote_6;
+package org.jboss.arquillian.container.glassfish.remote;
 
 import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
 import org.jboss.arquillian.core.spi.LoadableExtension;

diff --git a/...e_6/GlassFishRestDeployableContainer.java → ...ote/GlassFishRestDeployableContainer.java b/...e_6/GlassFishRestDeployableContainer.java → ...ote/GlassFishRestDeployableContainer.java
@@ -17,7 +17,7 @@
 /**
  * @author <a href="http://community.jboss.org/people/LightGuard">Jason Porter</a>
  */
-package org.jboss.arquillian.container.glassfish.remote_6;
+package org.jboss.arquillian.container.glassfish.remote;
 
 import org.jboss.arquillian.container.glassfish.CommonGlassFishConfiguration;
 import org.jboss.arquillian.container.glassfish.CommonGlassFishManager;

diff --git a/...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension b/...oss.arquillian.core.spi.LoadableExtension → ...oss.arquillian.core.spi.LoadableExtension
diff --git a/...er/glassfish/remote_6/CDIJarTestCase.java → ...iner/glassfish/remote/CDIJarTestCase.java b/...er/glassfish/remote_6/CDIJarTestCase.java → ...iner/glassfish/remote/CDIJarTestCase.java
diff --git a/...e_6/GlassFishDeployWithoutAppXmlTest.java → ...ote/GlassFishDeployWithoutAppXmlTest.java b/...e_6/GlassFishDeployWithoutAppXmlTest.java → ...ote/GlassFishDeployWithoutAppXmlTest.java
diff --git a/.../remote_6/GlassFishRestDeployEarTest.java → ...sh/remote/GlassFishRestDeployEarTest.java b/.../remote_6/GlassFishRestDeployEarTest.java → ...sh/remote/GlassFishRestDeployEarTest.java
diff --git a/.../remote_6/GlassFishRestDeployWarTest.java → ...sh/remote/GlassFishRestDeployWarTest.java b/.../remote_6/GlassFishRestDeployWarTest.java → ...sh/remote/GlassFishRestDeployWarTest.java
diff --git a/...container/glassfish/remote_6/Greeter.java → ...n/container/glassfish/remote/Greeter.java b/...container/glassfish/remote_6/Greeter.java → ...n/container/glassfish/remote/Greeter.java
diff --git a/...er/glassfish/remote_6/GreeterServlet.java → ...iner/glassfish/remote/GreeterServlet.java b/...er/glassfish/remote_6/GreeterServlet.java → ...iner/glassfish/remote/GreeterServlet.java
diff --git a/...tainer/glassfish/remote_6/SimpleBean.java → ...ontainer/glassfish/remote/SimpleBean.java b/...tainer/glassfish/remote_6/SimpleBean.java → ...ontainer/glassfish/remote/SimpleBean.java
diff --git a/...mote-6/src/test/resources/application.xml → ...remote/src/test/resources/application.xml b/...mote-6/src/test/resources/application.xml → ...remote/src/test/resources/application.xml
diff --git a/...emote-6/src/test/resources/arquillian.xml → ...-remote/src/test/resources/arquillian.xml b/...emote-6/src/test/resources/arquillian.xml → ...-remote/src/test/resources/arquillian.xml
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jboss</groupId>
     <artifactId>jboss-parent</artifactId>
-    <version>36</version>
+    <version>39</version>
     <relativePath />
   </parent>
 
@@ -14,11 +14,11 @@
 
   <!-- Artifact Configuration -->
   <groupId>org.jboss.arquillian.container</groupId>
-  <artifactId>arquillian-parent-glassfish6</artifactId>
+  <artifactId>arquillian-container-glassfish-jakarta</artifactId>
   <version>1.0.0.Final-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>Arquillian Container Parent GlassFish 6+</name>
-  <description>GlassFish 6.x and Later Container integrations for the Arquillian Project</description>
+  <name>Arquillian Container Parent GlassFish 7+</name>
+  <description>GlassFish 7.x and Later Container integrations for the Arquillian Project</description>
 
   <scm>
     <connection>scm:git:git://git@github.com:arquillian/arquillian-container-glassfish6.git</connection>
@@ -29,17 +29,17 @@
 
   <!-- Properties -->
   <properties>
-    <version.arquillian_core>1.7.0.Alpha2</version.arquillian_core>
-    <version.glassfish6>6.0.0-M1</version.glassfish6>
-    <!-- The Jakarta EE 9 based release version -->
-    <version.jersey>3.0.0-M4</version.jersey>
-    <jakarta.cdi.version>3.0.0-M3</jakarta.cdi.version>
-    <jakarta.el.version>4.0.0.M1</jakarta.el.version>
-    <jakarta.interceptor.version>2.0.0-RC2</jakarta.interceptor.version>
-    <jakarta.ejb.version>4.0.0-RC1</jakarta.ejb.version>
-    <jakarta.annotation.version>2.0.0-RC1</jakarta.annotation.version>
-    <jakarta.servlet.version>5.0.0-M1</jakarta.servlet.version>
-    <jakarta.jaxb.version>3.0.0-RC3</jakarta.jaxb.version>
+    <version.arquillian_core>1.7.0.Alpha10</version.arquillian_core>
+    <version.glassfish>7.0.0-M4</version.glassfish>
+    <!-- The Jakarta EE 10 based release version -->
+    <version.jersey>3.1.0-M5</version.jersey>
+    <jakarta.cdi.version>4.0.0</jakarta.cdi.version>
+    <jakarta.el.version>5.0.0</jakarta.el.version>
+    <jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
+    <jakarta.ejb.version>4.0.0</jakarta.ejb.version>
+    <jakarta.annotation.version>2.1.0</jakarta.annotation.version>
+    <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
+    <jakarta.jaxb.version>4.0.0</jakarta.jaxb.version>
   </properties>
 
   <dependencyManagement>
@@ -48,12 +48,12 @@
       <dependency>
         <groupId>jakarta.annotation</groupId>
         <artifactId>jakarta.annotation-api</artifactId>
-        <version>2.0.0-RC1</version>
+        <version>2.1.0</version>
       </dependency>
       <dependency>
         <groupId>jakarta.inject</groupId>
         <artifactId>jakarta.inject-api</artifactId>
-        <version>2.0.0-RC4</version>
+        <version>2.0.1</version>
       </dependency>
       <dependency>
         <groupId>jakarta.enterprise</groupId>
@@ -71,7 +71,6 @@
         <version>${jakarta.ejb.version}</version>
         <scope>test</scope>
       </dependency>
-
       <!-- JAX-RS implementation -->
       <dependency>
         <groupId>org.glassfish.jersey</groupId>
@@ -129,8 +128,8 @@
 
   <modules>
     <module>glassfish-common</module>
-    <module>glassfish-managed-6</module>
-    <module>glassfish-remote-6</module>
+    <module>glassfish-managed</module>
+    <module>glassfish-remote</module>
     <!--
     TODO:
     <module>glassfish-embedded-6</module>