Revert "Merge master into 8.0"

Jenkinsfile

@@ -69,7 +69,7 @@ def generateAntPodTemplate(job) {
               sh """
                 mkdir -p ${WORKSPACE}/appserver/tests
                 tar -xzf ${WORKSPACE}/bundles/appserv_tests.tar.gz -C ${WORKSPACE}/appserver/tests
-                export CLASSPATH=${WORKSPACE}/glassfish8/javadb
+                export CLASSPATH=${WORKSPACE}/glassfish7/javadb
                 ${WORKSPACE}/appserver/tests/gftest.sh run_test ${job}
               """
             }
@@ -94,7 +94,7 @@ kind: Pod
 spec:
   containers:
   - name: maven
-    image: maven:3.9.4-eclipse-temurin-21
+    image: maven:3.9.4-eclipse-temurin-17
     command:
     - cat
     tty: true
@@ -151,7 +151,7 @@ spec:
   }
 
   environment {
-    S1AS_HOME = "${WORKSPACE}/glassfish8/glassfish"
+    S1AS_HOME = "${WORKSPACE}/glassfish7/glassfish"
     APS_HOME = "${WORKSPACE}/appserver/tests/appserv-tests"
     TEST_RUN_LOG = "${WORKSPACE}/tests-run.log"
     GF_INTERNAL_ENV = credentials('gf-internal-env')
@@ -228,7 +228,7 @@ spec:
         }
       }
       tools {
-        jdk 'temurin-jdk21-latest'
+        jdk 'temurin-jdk17-latest'
         maven 'apache-maven-3.9.5'
       }
       steps {

README.md

@@ -59,7 +59,7 @@ They are quite old and have high technical debt, but at this moment they still p
 
 ### QuickLook
 
-`mvn -f appserver/tests/quicklook/pom.xml test -Dglassfish.home=$(pwd)/appserver/distributions/glassfish/target/stage/glassfish8/glassfish`
+`mvn -f appserver/tests/quicklook/pom.xml test -Dglassfish.home=$(pwd)/appserver/distributions/glassfish/target/stage/glassfish7/glassfish`
 
 * Usual time: 3 minutes
 * see [QuickLook_Test_Instructions](https://github.com/eclipse-ee4j/glassfish/blob/master/appserver/tests/quicklook/QuickLook_Test_Instructions.html)
@@ -96,9 +96,9 @@ They are quite old and have high technical debt, but at this moment they still p
 
 ## Basic Usage
 
-* Starting Eclipse GlassFish: `glassfish8/bin/asadmin start-domain`
+* Starting Eclipse GlassFish: `glassfish7/bin/asadmin start-domain`
 * Visit [http://localhost:4848](http://localhost:4848)
-* Stopping Eclipse GlassFish: `glassfish8/bin/asadmin stop-domain`
+* Stopping Eclipse GlassFish: `glassfish7/bin/asadmin stop-domain`
 
 ## Professional Services and Enterprise Support
 

appserver/admin/admin-core/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>admin-core</artifactId>

appserver/admin/backup/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>backup</artifactId>

appserver/admin/cli-optional/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-optional</artifactId>

appserver/admin/cli-optional/src/main/manpages/com/sun/enterprise/admin/cli/optional/list-backups.1

@@ -65,8 +65,8 @@ EXAMPLES
                Domain Name               : domain1
                Backup Type               : full
                Backup Config Name        :
-               Backup Filename (origin)  : /glassfish8/glassfish/domains/domain1/backups/domain1_2022_06_23_v00001.zip
-               Domain Directory          : /glassfish8/glassfish/domains/domain1
+               Backup Filename (origin)  : /glassfish7/glassfish/domains/domain1/backups/domain1_2022_06_23_v00001.zip
+               Domain Directory          : /glassfish7/glassfish/domains/domain1
 
                Description               : domain1 backup created on 2022_06_23 by user admin
                GlassFish Version         : Eclipse GlassFish 7.0.0
@@ -75,8 +75,8 @@ EXAMPLES
                Domain Name               : domain1
                Backup Type               : full
                Backup Config Name        :
-               Backup Filename (origin)  : /glassfish8/glassfish/domains/domain1/backups/domain1_2022_06_23_v00002.zip
-               Domain Directory          : /glassfish8/glassfish/domains/domain1
+               Backup Filename (origin)  : /glassfish7/glassfish/domains/domain1/backups/domain1_2022_06_23_v00002.zip
+               Domain Directory          : /glassfish7/glassfish/domains/domain1
 
                Command list-backups executed successfully.
 

appserver/admin/cli/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>appserver-cli</artifactId>

appserver/admin/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admin/template/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>appserver-domain</artifactId>

appserver/admin/template/src/main/resources/config/domain.xml

@@ -104,10 +104,10 @@
           <property value="fileRealm" name="jaas-context" />
         </auth-realm>
         <auth-realm classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm" name="certificate" />
-        <jacc-provider policy-configuration-factory-provider="org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory" policy-provider="org.glassfish.exousia.modules.def.DefaultPolicy" name="default">
+        <jacc-provider policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="default">
           <property value="${com.sun.aas.instanceRoot}/generated/policy" name="repository" />
         </jacc-provider>
-        <jacc-provider policy-configuration-factory-provider="org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory" policy-provider="org.glassfish.exousia.modules.def.DefaultPolicy" name="simple" />
+        <jacc-provider policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" />
         <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
           <property value="false" name="auditOn" />
         </audit-module>
@@ -311,10 +311,10 @@
                  <property name="jaas-context" value="fileRealm" />
              </auth-realm>
              <auth-realm classname="com.sun.enterprise.security.auth.realm.certificate.CertificateRealm" name="certificate" />
-             <jacc-provider policy-provider="org.glassfish.exousia.modules.def.DefaultPolicy" name="default" policy-configuration-factory-provider="org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory">
+             <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="default" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory">
                  <property name="repository" value="${com.sun.aas.instanceRoot}/generated/policy" />
              </jacc-provider>
-             <jacc-provider policy-provider="org.glassfish.exousia.modules.def.DefaultPolicy" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.def.DefaultPolicyConfigurationFactory" />
+             <jacc-provider policy-provider="org.glassfish.exousia.modules.locked.SimplePolicyProvider" name="simple" policy-configuration-factory-provider="org.glassfish.exousia.modules.locked.SimplePolicyConfigurationFactory" />
              <audit-module classname="com.sun.enterprise.security.ee.Audit" name="default">
                  <property value="false" name="auditOn" />
              </audit-module>

appserver/admingui/cluster/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties

@@ -190,7 +190,7 @@ node.KeyfileHelp=The absolute path to the SSH User's private key file. The defau
 node.EditPageTitle=Edit Node
 node.EditPageTitleHelp=Edit properties for the selected node.
 node.InstallDir=Installation Directory:
-node.InstallDirHelp=The full path to the parent of the base installation directory of the GlassFish Server software on the host, for example, /export/glassfish8.
+node.InstallDirHelp=The full path to the parent of the base installation directory of the GlassFish Server software on the host, for example, /export/glassfish7.
 node.force=Force:
 node.forceHelp=Specifies whether the node is created even if validation of the node's parameters fails.
 node.type=Type:

appserver/admingui/common/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -75,14 +75,6 @@
             <groupId>org.glassfish.expressly</groupId>
             <artifactId>expressly</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.faces</artifactId>

appserver/admingui/community-theme/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/concurrent/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/corba/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/core/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -56,16 +56,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

appserver/admingui/dataprovider/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

appserver/admingui/ejb-lite/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/ejb/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/full/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/gf-admingui-connector/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

appserver/admingui/jca/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/jdbc/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/jms-plugin/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/jts/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/plugin-service/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

appserver/admingui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/admingui/war/pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

appserver/admingui/web/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
     </parent>
 
     <artifactId>console-web-plugin</artifactId>

appserver/ant-tasks/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>8.0.0-SNAPSHOT</version>
+        <version>7.0.13-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

appserver/ant-tasks/src/main/resources/org/apache/tools/ant/sample-build.xml

@@ -22,12 +22,12 @@
 
 
     <target name="regular" description="Non-embedded tasks">
-        <glassfish-stop installdir = "/ws/v3/publish/glassfish8/" domain = "domain1" />
-        <glassfish-start installdir = "/ws/v3/publish/glassfish8/" domain = "domain1" />
-        <glassfish-stop installdir = "/ws/v3/publish/glassfish8/" domain = "domain1" />
-        <glassfish-admin installdir = "/ws/v3/publish/glassfish8/" command = "start-domain domain1" />
-    <glassfish-admin installdir = "/ws/v3/publish/glassfish8/" command = "create-http-listener --defaultvs=server --listenerport=9889 --listeneraddress=127.0.0. --listener_id=reg-listener"/>
-        <glassfish-undeploy installdir = "/ws/v3/publish/glassfish8/" name="test"/>
+        <glassfish-stop installdir = "/ws/v3/publish/glassfish7/" domain = "domain1" />
+        <glassfish-start installdir = "/ws/v3/publish/glassfish7/" domain = "domain1" />
+        <glassfish-stop installdir = "/ws/v3/publish/glassfish7/" domain = "domain1" />
+        <glassfish-admin installdir = "/ws/v3/publish/glassfish7/" command = "start-domain domain1" />
+    <glassfish-admin installdir = "/ws/v3/publish/glassfish7/" command = "create-http-listener --defaultvs=server --listenerport=9889 --listeneraddress=127.0.0. --listener_id=reg-listener"/>
+        <glassfish-undeploy installdir = "/ws/v3/publish/glassfish7/" name="test"/>
    </target>
 
    <target name="embedded" description="embedded tasks">