From 3927e36adb7a53408dd75d468f00caa847d0030f Mon Sep 17 00:00:00 2001
From: gurunrao <gurunandan.rao@oracle.com>
Date: Tue, 24 May 2022 20:00:41 +0530
Subject: [PATCH] support jakarta EE full/web profile and GF M5

Signed-off-by: gurunrao <gurunandan.rao@oracle.com>
---
 glassfish-runner/batch-tck/pom.xml            |  2 +-
 glassfish-runner/batch-tck/sigtests/pom.xml   |  5 +-
 glassfish-runner/concurrency-tck/pom.xml      | 24 +++++-
 glassfish-runner/jaxrs-tck/pom.xml            | 57 +++++++++------
 glassfish-runner/jsonb-tck/pom.xml            | 33 +++------
 .../json-tck-tests-pluggability/pom.xml       | 73 ++++++++++---------
 .../jsonp-tck/json-tck-tests/pom.xml          | 52 +++++++------
 glassfish-runner/jsonp-tck/pom.xml            |  8 ++
 glassfish-runner/pom.xml                      | 50 +++++++++++++
 9 files changed, 191 insertions(+), 113 deletions(-)

diff --git a/glassfish-runner/batch-tck/pom.xml b/glassfish-runner/batch-tck/pom.xml
index f0f9da3e0b..7c3dd88a61 100644
--- a/glassfish-runner/batch-tck/pom.xml
+++ b/glassfish-runner/batch-tck/pom.xml
@@ -34,7 +34,7 @@ Copyright (c) 2022 Contributors to the Eclipse Foundation
     <name>Jakarta Batch TCK Runner for Glassfish</name>
     
     <properties>
-        <glassfish.container.version>7.0.0-M4</glassfish.container.version>
+        <glassfish.container.version>7.0.0-M5</glassfish.container.version>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
         <jakarta.batch.version>2.1.0</jakarta.batch.version>
     </properties>
diff --git a/glassfish-runner/batch-tck/sigtests/pom.xml b/glassfish-runner/batch-tck/sigtests/pom.xml
index c987784e28..e47f1e4dba 100644
--- a/glassfish-runner/batch-tck/sigtests/pom.xml
+++ b/glassfish-runner/batch-tck/sigtests/pom.xml
@@ -9,7 +9,7 @@
     <version>2.1.0</version>
 
     <properties>
-        <glassfish.container.version>7.0.0-M4</glassfish.container.version>
+        <glassfish.container.version>7.0.0-M5</glassfish.container.version>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
         <jakarta.batch.version>2.1.0</jakarta.batch.version>
     </properties>
@@ -33,7 +33,7 @@
         <profile>
             <id>jdk11</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <activeByDefault>true</activeByDefault>
                 <jdk>11</jdk>
             </activation>
             <build>
@@ -41,7 +41,6 @@
                     <plugin>
                         <groupId>org.netbeans.tools</groupId>
                         <artifactId>sigtest-maven-plugin</artifactId>
-
                         <configuration>
                             <sigfile>${project.build.directory}/sigtest-copy/sigtest/sigtest-1.6-batch.standalone.tck.sig-2.1-se11-OpenJDK-J9</sigfile>
                         </configuration>
diff --git a/glassfish-runner/concurrency-tck/pom.xml b/glassfish-runner/concurrency-tck/pom.xml
index 6973395888..3650f0fe35 100644
--- a/glassfish-runner/concurrency-tck/pom.xml
+++ b/glassfish-runner/concurrency-tck/pom.xml
@@ -21,7 +21,6 @@
         <arquillian.version>1.7.0.Alpha10</arquillian.version>
         <testng.version>6.14.3</testng.version>
         <sigtest.version>1.6</sigtest.version>
-        <derby.version>10.15.2.0</derby.version>
         <maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
         <maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>
         <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
@@ -32,7 +31,7 @@
         <!--  Output directory  -->
         <targetDirectory>${project.basedir}/target</targetDirectory>
         <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
-        <glassfish.container.version>7.0.0-M4</glassfish.container.version>
+        <glassfish.container.version>7.0.0-M5</glassfish.container.version>
     </properties>
 
     <!-- TODO: Temporarily enable snapshot repository -->
@@ -157,6 +156,25 @@
         
     </dependencies>
     <!--  end::testClientDep[]  -->
+
+    <profiles>
+        <profile>
+            <id>full</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <glassfish-artifact-id>glassfish</glassfish-artifact-id>
+            </properties>
+        </profile>
+        <profile>
+            <id>web</id>
+            <properties>
+                <glassfish-artifact-id>web</glassfish-artifact-id>
+            </properties>
+        </profile>
+    </profiles>
+    
     <build>
         <directory>${targetDirectory}</directory>
         <defaultGoal>clean test</defaultGoal>
@@ -176,7 +194,7 @@
                                 <artifactItems>
                                     <artifactItem>
                                         <groupId>org.glassfish.main.distributions</groupId>
-                                        <artifactId>glassfish</artifactId>
+                                        <artifactId>${glassfish-artifact-id}</artifactId>
                                         <version>${glassfish.container.version}</version>
                                         <type>zip</type>
                                         <overWrite>false</overWrite>
diff --git a/glassfish-runner/jaxrs-tck/pom.xml b/glassfish-runner/jaxrs-tck/pom.xml
index cf6ed398e9..95a14b910d 100644
--- a/glassfish-runner/jaxrs-tck/pom.xml
+++ b/glassfish-runner/jaxrs-tck/pom.xml
@@ -24,16 +24,20 @@
     <modelVersion>4.0.0</modelVersion>
     <name>Jakarta REST TCK run on glassfish</name>
     <description>This verifies the compliance of Eclipse Glassfish using Jakarta REST standalone TCK</description>
+    
+    <parent>
+        <groupId>org.glassfish</groupId>
+        <artifactId>standalone-tck</artifactId>
+        <version>10.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <jersey.version>3.1.0-M2</jersey.version>
-        <glassfish.container.version>7.0.0-M4</glassfish.container.version>
-        <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
-        <junit.jupiter.version>5.7.2</junit.jupiter.version>
-        <jakarta.rest.version>3.1.0</jakarta.rest.version>
-        <tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
+        <tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>    
     </properties>
+
+
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -46,21 +50,7 @@
         </dependencies>
     </dependencyManagement>
 
-    <repositories>
-        <repository>
-            <id>jakarta-snapshots</id>
-            <url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
-        </repository>
-        <repository>
-            <id>central</id>
-            <url>https://repo1.maven.org/maven2</url>
-        </repository>
-        <repository>
-            <id>jboss</id>
-            <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
-        </repository>
-    </repositories>
-
+    
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -128,6 +118,25 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>full</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <glassfish-artifact-id>glassfish</glassfish-artifact-id>
+            </properties>
+        </profile>
+        <profile>
+            <id>web</id>
+            <properties>
+                <glassfish-artifact-id>web</glassfish-artifact-id>
+            </properties>
+        </profile>
+    </profiles>
+    
     <build>
         <plugins>
             <plugin>
@@ -145,7 +154,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>org.glassfish.main.distributions</groupId>
-                                    <artifactId>glassfish</artifactId>
+                                    <artifactId>${glassfish-artifact-id}</artifactId>
                                     <version>${glassfish.container.version}</version>
                                     <type>zip</type>
                                     <overWrite>false</overWrite>
diff --git a/glassfish-runner/jsonb-tck/pom.xml b/glassfish-runner/jsonb-tck/pom.xml
index d558649ed0..56a9f844e4 100644
--- a/glassfish-runner/jsonb-tck/pom.xml
+++ b/glassfish-runner/jsonb-tck/pom.xml
@@ -9,28 +9,12 @@
   <artifactId>glassfish.jsonb-tck</artifactId>
   <version>3.0.0</version>
 
-  <properties>
-    <jsonb.tck.version>3.0.0</jsonb.tck.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <glassfish.container.version>7.0.0-M4</glassfish.container.version>
-    <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
-  </properties>
-
-  <repositories>
-      <repository>
-          <id>jakarta-snapshots</id>
-          <url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
-      </repository>
-      <repository>
-          <id>central</id>
-          <url>https://repo1.maven.org/maven2</url>
-      </repository>
-      <repository>
-          <id>jboss</id>
-          <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
-      </repository>
-  </repositories>
+  <parent>
+    <groupId>org.glassfish</groupId>
+    <artifactId>standalone-tck</artifactId>
+    <version>10.0.0</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
 
   <dependencies>
       <dependency>
@@ -55,7 +39,7 @@
         <version>1.6</version>
       </dependency>
   </dependencies>
-
+  
   <build>
     <plugins>
       <plugin>
@@ -73,7 +57,7 @@
                     <artifactItems>
                         <artifactItem>
                             <groupId>org.glassfish.main.distributions</groupId>
-                            <artifactId>glassfish</artifactId>
+                            <artifactId>${glassfish-artifact-id}</artifactId>
                             <version>${glassfish.container.version}</version>
                             <type>zip</type>
                             <overWrite>false</overWrite>
@@ -88,6 +72,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.0.0-M5</version>
         <configuration>
+          <argLine>-Djava.locale.providers=COMPAT</argLine>
           <trimStackTrace>false</trimStackTrace>
           <failIfNoTests>true</failIfNoTests>
             <dependenciesToScan>jakarta.json.bind:jakarta.json.bind-tck</dependenciesToScan>
diff --git a/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml b/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml
index d44697f15b..c2b1ccf475 100644
--- a/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml
+++ b/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml
@@ -9,29 +9,14 @@
   <artifactId>json-tck-tests-pluggablity</artifactId>
   <version>2.1.0</version>
 
-  <properties>
-    <json.tck.version>2.1.0</json.tck.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <glassfish.container.version>7.0.0-M4</glassfish.container.version>
-    <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
-  </properties>
-
-  <repositories>
-      <repository>
-          <id>jakarta-snapshots</id>
-          <url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
-      </repository>
-      <repository>
-          <id>central</id>
-          <url>https://repo1.maven.org/maven2</url>
-      </repository>
-      <repository>
-          <id>jboss</id>
-          <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
-      </repository>
-  </repositories>
+  <parent>
+        <groupId>org.glassfish</groupId>
+        <artifactId>json-tck</artifactId>
+        <version>2.1.0</version>
+        <relativePath>../pom.xml</relativePath>
+  </parent>
 
+  
   <dependencies>
       <dependency>
         <groupId>jakarta.json</groupId>
@@ -58,6 +43,25 @@
       </dependency> 
   </dependencies>
 
+  <profiles>
+    <profile>
+        <id>full</id>
+        <activation>
+            <activeByDefault>true</activeByDefault>
+        </activation>
+        <properties>
+            <glassfish-artifact-id>glassfish</glassfish-artifact-id>
+        </properties>
+    </profile>
+    <profile>
+        <id>web</id>
+        <properties>
+            <glassfish-artifact-id>web</glassfish-artifact-id>
+        </properties>
+    </profile>
+  </profiles>
+    
+
   <build>
     <plugins>
       <plugin>
@@ -75,7 +79,7 @@
                     <artifactItems>
                         <artifactItem>
                             <groupId>org.glassfish.main.distributions</groupId>
-                            <artifactId>glassfish</artifactId>
+                            <artifactId>${glassfish-artifact-id}</artifactId>
                             <version>${glassfish.container.version}</version>
                             <type>zip</type>
                             <overWrite>false</overWrite>
@@ -88,7 +92,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.0.0-M4</version>
         <executions>
           <execution>
             <id>tests-pluggability</id>
@@ -96,21 +100,22 @@
              <goal>test</goal>
             </goals>
             <configuration>
-            <trimStackTrace>false</trimStackTrace>
-            <failIfNoTests>true</failIfNoTests>
-            <testFailureIgnore>true</testFailureIgnore> 
-              <dependenciesToScan>jakarta.json:jakarta.json-tck-tests-pluggability</dependenciesToScan>
-              <additionalClasspathElements>
-                <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json-api.jar</additionalClasspathElement>
-                <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/parsson.jar</additionalClasspathElement>
-              </additionalClasspathElements>
-            </configuration>
+              <reuseForks>false</reuseForks>
+              <trimStackTrace>false</trimStackTrace>
+              <failIfNoTests>true</failIfNoTests>
+              <testFailureIgnore>true</testFailureIgnore> 
+                <dependenciesToScan>jakarta.json:jakarta.json-tck-tests-pluggability</dependenciesToScan>
+                <additionalClasspathElements>
+                  <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/jakarta.json-api.jar</additionalClasspathElement>
+                  <additionalClasspathElement>${project.build.directory}/${glassfish.toplevel.dir}/glassfish/modules/parsson.jar</additionalClasspathElement>
+                </additionalClasspathElements>
+              </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.0.0-M4</version>
         <executions>
               <execution>
                 <id>post-unit-test</id>
diff --git a/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml b/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml
index 895803faa9..fbe4b9f804 100644
--- a/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml
+++ b/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml
@@ -9,28 +9,13 @@
   <artifactId>json-tck-tests</artifactId>
   <version>2.1.0</version>
 
-  <properties>
-    <json.tck.version>2.1.0</json.tck.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <glassfish.container.version>7.0.0-M4</glassfish.container.version>
-    <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
-  </properties>
+  <parent>
+        <groupId>org.glassfish</groupId>
+        <artifactId>json-tck</artifactId>
+        <version>2.1.0</version>
+        <relativePath>../pom.xml</relativePath>
+  </parent>
 
-  <repositories>
-      <repository>
-          <id>jakarta-snapshots</id>
-          <url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
-      </repository>
-      <repository>
-          <id>central</id>
-          <url>https://repo1.maven.org/maven2</url>
-      </repository>
-      <repository>
-          <id>jboss</id>
-          <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
-      </repository>
-  </repositories>
 
   <dependencies>
       <dependency>
@@ -58,6 +43,24 @@
       </dependency> 
   </dependencies>
 
+  <profiles>
+    <profile>
+        <id>full</id>
+        <activation>
+            <activeByDefault>true</activeByDefault>
+        </activation>
+        <properties>
+            <glassfish-artifact-id>glassfish</glassfish-artifact-id>
+        </properties>
+    </profile>
+    <profile>
+        <id>web</id>
+        <properties>
+            <glassfish-artifact-id>web</glassfish-artifact-id>
+        </properties>
+    </profile>
+  </profiles>
+    
   <build>
     <plugins>
       <plugin>
@@ -75,7 +78,7 @@
                     <artifactItems>
                         <artifactItem>
                             <groupId>org.glassfish.main.distributions</groupId>
-                            <artifactId>glassfish</artifactId>
+                            <artifactId>${glassfish-artifact-id}</artifactId>
                             <version>${glassfish.container.version}</version>
                             <type>zip</type>
                             <overWrite>false</overWrite>
@@ -88,7 +91,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.0.0-M4</version>
         <executions>
           <execution>
             <id>tests</id>
@@ -96,6 +99,7 @@
              <goal>test</goal>
             </goals>
             <configuration>
+            <reuseForks>false</reuseForks>
             <trimStackTrace>false</trimStackTrace>
             <failIfNoTests>true</failIfNoTests>
             <testFailureIgnore>true</testFailureIgnore> 
@@ -114,7 +118,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.0.0-M4</version>
         <executions>
               <execution>
                 <id>post-unit-test</id>
diff --git a/glassfish-runner/jsonp-tck/pom.xml b/glassfish-runner/jsonp-tck/pom.xml
index f55b292767..cc37464b53 100644
--- a/glassfish-runner/jsonp-tck/pom.xml
+++ b/glassfish-runner/jsonp-tck/pom.xml
@@ -23,6 +23,14 @@
     <version>2.1.0</version>
     <packaging>pom</packaging>
 
+    <parent>
+        <groupId>org.glassfish</groupId>
+        <artifactId>standalone-tck</artifactId>
+        <version>10.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+
     <modules>
         <module>json-tck-tests</module>
         <module>json-tck-tests-pluggability</module>
diff --git a/glassfish-runner/pom.xml b/glassfish-runner/pom.xml
index e4f8827968..b5d1e939fb 100644
--- a/glassfish-runner/pom.xml
+++ b/glassfish-runner/pom.xml
@@ -22,6 +22,56 @@
     <version>10.0.0</version>
     <packaging>pom</packaging>
 
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        
+        <jsonb.tck.version>3.0.0</jsonb.tck.version>
+        <json.tck.version>2.1.0</json.tck.version>
+        <jakarta.rest.version>3.1.0</jakarta.rest.version>
+        <tck.artifactId>jakarta-restful-ws-tck</tck.artifactId>
+        
+        <glassfish.container.version>7.0.0-M5</glassfish.container.version>
+        <glassfish.toplevel.dir>glassfish7</glassfish.toplevel.dir>
+        
+        <junit.jupiter.version>5.7.2</junit.jupiter.version>
+        
+    </properties>
+
+    <profiles>
+      <profile>
+          <id>full</id>
+          <activation>
+              <activeByDefault>true</activeByDefault>
+          </activation>
+          <properties>
+              <glassfish-artifact-id>glassfish</glassfish-artifact-id>
+          </properties>
+      </profile>
+      <profile>
+          <id>web</id>
+          <properties>
+              <glassfish-artifact-id>web</glassfish-artifact-id>
+          </properties>
+      </profile>
+    </profiles>
+  
+    <repositories>
+        <repository>
+            <id>jakarta-snapshots</id>
+            <url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
+        </repository>
+        <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2</url>
+        </repository>
+        <repository>
+            <id>jboss</id>
+            <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
+        </repository>
+    </repositories>
+
+
     <modules>
         <module>batch-tck</module>
         <module>concurrency-tck</module>