Move Glassfish6 container to a glassfish6 branch

.circleci/config.yml

@@ -12,7 +12,15 @@ jobs:
       - restore_cache:
           key: circleci-arquillian-container-glassfish-6-{{ checksum "pom.xml" }}
       - run: ./mvnw verify -q -U -DskipTests # pre-fetch dependencies (dependency:resolve fails)
-      - run: ./mvnw verify
+      - run: ./mvnw -X verify
+      - run:
+          name: Target glassfish-managed-6/target
+          command: tar -czvf glassfish-managed-6.tar.gz glassfish-managed-6/target
+          when: always
+      - store_artifacts:
+          path: glassfish-managed-6.tar.gz
+      - store_artifacts:
+          path: glassfish-managed-6/target/glassfish6/glassfish/domains/domain1/logs/server.log
       - store_test_results:
           path: target/surefire-reports
       - save_cache:
@@ -27,4 +35,4 @@ workflows:
       - build:
           matrix:
             parameters:
-              jdk-version: ["8", "9"]
+              jdk-version: ["8"]

glassfish-common/pom.xml

@@ -3,10 +3,10 @@
   <parent>
     <artifactId>arquillian-parent-glassfish6</artifactId>
     <groupId>org.jboss.arquillian.container</groupId>
-    <version>1.0.0.Final-SNAPSHOT</version>
-    <relativePath>..</relativePath>
+    <version>6.0.0.Final-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
-  <artifactId>arquillian-glassfish6-common</artifactId>
+  <artifactId>arquillian-glassfish-common-jakarta</artifactId>
   <name>Arquillian Container GlassFish 6+ Common Services</name>
 
   <dependencies>

glassfish-managed-6/pom.xml → glassfish-managed/pom.xml

@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.jboss.arquillian.container</groupId>
     <artifactId>arquillian-parent-glassfish6</artifactId>
-    <version>1.0.0.Final-SNAPSHOT</version>
+    <version>6.0.0.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>arquillian-glassfish-managed-6</artifactId>
+  <artifactId>arquillian-glassfish-manged-jakarta</artifactId>
   <name>Arquillian Container GlassFish Managed 6</name>
   <description>GlassFish 6 Managed Container integration for the Arquillian Project</description>
 
@@ -26,7 +26,7 @@
 
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-glassfish6-common</artifactId>
+      <artifactId>arquillian-glassfish-common-jakarta</artifactId>
       <version>${project.version}</version>
     </dependency>
 

glassfish-managed-6/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java → glassfish-managed/src/main/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishServerControl.java

@@ -173,6 +173,9 @@ private void executeAdminCommand(String description, String command, List<String
         if (result != 0) {
             throw new LifecycleException("Unable to execute " + cmd.toString());
         }
+        if (config.isOutputToConsole()) {
+            System.out.println(description + " process started");
+        }
     }
 
     private List<String> buildCommand(String command, List<String> args) {

glassfish-managed-6/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java → glassfish-managed/src/test/java/org/jboss/arquillian/container/glassfish/managed_6/GlassFishManagedDeployWarTest.java

@@ -36,7 +36,8 @@ public class GlassFishManagedDeployWarTest extends GlassFishManagedDeploymentTes
     @Deployment(testable = false)
     public static WebArchive getTestArchive() {
         return ShrinkWrap.create(WebArchive.class, "test.war")
-            .addClasses(GreeterServlet.class, Greeter.class)
+            .addClass(greeterImplementationBasedOnDerbyEnabled())
+            .addClass(Greeter.class)
             .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
     }
 }

glassfish-managed-6/src/test/resources/arquillian.xml → glassfish-managed/src/test/resources/arquillian.xml

@@ -18,7 +18,7 @@
       <property name="allowConnectingToRunningServer">false</property>
       <property name="outputToConsole">true</property>
       <!-- true enables verbose logging of the jaxrs requests -->
-      <property name="debugRequests">true</property>
+      <property name="debugRequests">false</property>
     </configuration>
   </container>
 

glassfish-remote-6/pom.xml → glassfish-remote/pom.xml

@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.jboss.arquillian.container</groupId>
     <artifactId>arquillian-parent-glassfish6</artifactId>
-    <version>1.0.0.Final-SNAPSHOT</version>
+    <version>6.0.0.Final-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>arquillian-glassfish-remote-6</artifactId>
+  <artifactId>arquillian-glassfish-remote-jakarta</artifactId>
   <name>Arquillian Container GlassFish Remote 6.x</name>
   <description>GlassFish 6.x Remote Container integration for the Arquillian Project</description>
 
@@ -26,7 +26,7 @@
 
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-glassfish6-common</artifactId>
+      <artifactId>arquillian-glassfish-common-jakarta</artifactId>
       <version>${project.version}</version>
     </dependency>
 

pom.xml

@@ -15,7 +15,7 @@
   <!-- Artifact Configuration -->
   <groupId>org.jboss.arquillian.container</groupId>
   <artifactId>arquillian-parent-glassfish6</artifactId>
-  <version>1.0.0.Final-SNAPSHOT</version>
+  <version>6.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>
@@ -29,17 +29,18 @@
 
   <!-- Properties -->
   <properties>
-    <version.arquillian_core>1.7.0.Alpha2</version.arquillian_core>
-    <version.glassfish6>6.0.0-M1</version.glassfish6>
+    <version.arquillian_core>1.7.0.Alpha10</version.arquillian_core>
+    <version.glassfish6>6.0.0</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.jersey>3.0.1</version.jersey>
+    <jakarta.cdi.version>3.0.0</jakarta.cdi.version>
+    <jakarta.el.version>4.0.0</jakarta.el.version>
+    <jakarta.interceptor.version>2.0.0</jakarta.interceptor.version>
+    <jakarta.ejb.version>4.0.0</jakarta.ejb.version>
+    <jakarta.annotation.version>2.0.0</jakarta.annotation.version>
+    <jakarta.servlet.version>5.0.0</jakarta.servlet.version>
+    <jakarta.jaxb.version>3.0.0</jakarta.jaxb.version>
+    <jakarta.inject.version>2.0.0</jakarta.inject.version>
   </properties>
 
   <dependencyManagement>
@@ -48,12 +49,12 @@
       <dependency>
         <groupId>jakarta.annotation</groupId>
         <artifactId>jakarta.annotation-api</artifactId>
-        <version>2.0.0-RC1</version>
+        <version>${jakarta.annotation.version}</version>
       </dependency>
       <dependency>
         <groupId>jakarta.inject</groupId>
         <artifactId>jakarta.inject-api</artifactId>
-        <version>2.0.0-RC4</version>
+        <version>${jakarta.inject.version}</version>
       </dependency>
       <dependency>
         <groupId>jakarta.enterprise</groupId>
@@ -129,8 +130,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>