Merge pull request #23727 from dmatej/version-7.0.0

Changed version number to 7.0.0-SNAPSHOT
eclipse-ee4j · Dec 1, 2021 · 2e3d8d5 · 2e3d8d5
2 parents 5998185 + a8cfbe9
commit 2e3d8d5
Show file tree

Hide file tree

Showing 604 changed files with 1,696 additions and 932 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -73,7 +73,7 @@ def generateStage(job) {
                           retry(3) {
                               timeout(time: 2, unit: 'HOURS') {
                                 sh """
-                                  export CLASSPATH=$WORKSPACE/glassfish6/javadb
+                                  export CLASSPATH=$WORKSPACE/glassfish7/javadb
                                   ./appserver/tests/gftest.sh run_test ${job}
                                 """
                               }
@@ -189,7 +189,7 @@ spec:
   }
 
   environment {
-    S1AS_HOME = "${WORKSPACE}/glassfish6/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')

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ sponsored by the Eclipse Foundation.
 
 ### Compatibility
 
+* Eclipse GlassFish 7.0.0 is Jakarta EE 10 compatible, requires Java 11, supports Java 18
 * Eclipse GlassFish 6.2.0 is Jakarta EE 9.1 compatible, requires Java 11, supports Java 17
 * Eclipse GlassFish 6.1.0 is Jakarta EE 9.1 compatible, requires Java 11
 * Eclipse GlassFish 6.0.0 is Jakarta EE 9 compatible, requires Java 8
@@ -53,42 +54,42 @@ 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/glassfish6/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)
 
 ### Old Additional Tests
 
-* `./runTests.sh 6.2.3 cdi_all` - Usual time: 6 minutes
-* `./runTests.sh 6.2.3 ejb_group_1` - Usual time: 8 minutes
-* `./runTests.sh 6.2.3 web_jsp` - Usual time: 6 minutes
+* `./runTests.sh 7.0.0 cdi_all` - Usual time: 6 minutes
+* `./runTests.sh 7.0.0 ejb_group_1` - Usual time: 8 minutes
+* `./runTests.sh 7.0.0 web_jsp` - Usual time: 6 minutes
 * `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_web_profile_all` - Usual time: 2 minutes
 * `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_full_profile_all` - Usual time: 4 minutes
 
 ### Half-Dead Additional Tests Waiting for a Rescue
 
 First warning: if the script fails, it doesn't stop the domain and you have to do that manually.
-* `./runTests.sh 6.2.3 batch_all` - Crashes, Derby uses different port than expected
-* `./runTests.sh 6.2.3 connector_group_1` - Crashes, ports
-* `./runTests.sh 6.2.3 connector_group_2` - Crashes, ports
-* `./runTests.sh 6.2.3 connector_group_3` - Crashes, ports
-* `./runTests.sh 6.2.3 connector_group_4` - Crashes, ports
-* `./runTests.sh 6.2.3 deployment_all` - Usual time: 1 minute, failure: still uses javax packages.
-* `./runTests.sh 6.2.3 ejb_group_2` - Usual time: 2 minutes, failure: incompatible API at TimerSessionEJB.
-* `./runTests.sh 6.2.3 ejb_group_3` - Usual time: 4 minutes, failure: still uses javax packages
-* `./runTests.sh 6.2.3 jdbc_all` - Crashes, Derby uses different port than expected
-* `./runTests.sh 6.2.3 persistence_all` - Crashes, Derby uses different port than expected
+* `./runTests.sh 7.0.0 batch_all` - Crashes, Derby uses different port than expected
+* `./runTests.sh 7.0.0 connector_group_1` - Crashes, ports
+* `./runTests.sh 7.0.0 connector_group_2` - Crashes, ports
+* `./runTests.sh 7.0.0 connector_group_3` - Crashes, ports
+* `./runTests.sh 7.0.0 connector_group_4` - Crashes, ports
+* `./runTests.sh 7.0.0 deployment_all` - Usual time: 1 minute, failure: still uses javax packages.
+* `./runTests.sh 7.0.0 ejb_group_2` - Usual time: 2 minutes, failure: incompatible API at TimerSessionEJB.
+* `./runTests.sh 7.0.0 ejb_group_3` - Usual time: 4 minutes, failure: still uses javax packages
+* `./runTests.sh 7.0.0 jdbc_all` - Crashes, Derby uses different port than expected
+* `./runTests.sh 7.0.0 persistence_all` - Crashes, Derby uses different port than expected
 * `./gfbuild.sh archive_bundles && ./gftest.sh ejb_web_all` - Usual time: 4 minutes, failure: could not create the derby database
 * `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_nucleus_all` - Crashes
 * `./gfbuild.sh archive_bundles && ./gftest.sh nucleus_admin_all` - Crashes, missing TestNG dependency
 * many tests under appserver/tests subdirectories; they are still waiting for someone's attention.
 
 ## Basic Usage
 
-* Starting Eclipse GlassFish: `glassfish6/bin/asadmin start-domain`
+* Starting Eclipse GlassFish: `glassfish7/bin/asadmin start-domain`
 * Visit [http://localhost:4848](http://localhost:4848)
-* Stopping Eclipse GlassFish: `glassfish6/bin/asadmin stop-domain`
+* Stopping Eclipse GlassFish: `glassfish7/bin/asadmin stop-domain`
 
 ## Professional Services and Enterprise Support
 

diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>admin-core</artifactId>

diff --git a/appserver/admin/backup/pom.xml b/appserver/admin/backup/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>backup</artifactId>

diff --git a/appserver/admin/cli-optional/pom.xml b/appserver/admin/cli-optional/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>cli-optional</artifactId>

diff --git a/appserver/admin/cli/pom.xml b/appserver/admin/cli/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>appserver-cli</artifactId>

diff --git a/appserver/admin/pom.xml b/appserver/admin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admin/template/pom.xml b/appserver/admin/template/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admin</groupId>
         <artifactId>admin</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>appserver-domain</artifactId>

diff --git a/appserver/admingui/cluster/pom.xml b/appserver/admingui/cluster/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...ver/admingui/cluster/src/main/resources/org/glassfish/cluster/admingui/Strings.properties b/...ver/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/glassfish6.
+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:

diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/common/src/main/help/en/help/docinfo.html b/appserver/admingui/common/src/main/help/en/help/docinfo.html
@@ -16,7 +16,7 @@
 
 -->
 
-<h4>GlassFish Server Open Source Edition 5.1</h4>
+<h4>GlassFish Server Open Source Edition 7</h4>
 <p><a name="BEGIN" id="BEGIN"></a></p>
 <p>Common Online Help</p>
 <p></p>
@@ -25,7 +25,7 @@ <h4>GlassFish Server Open Source Edition 5.1</h4>
 <p>This document provides the reference and task online help topics for the common module of the GlassFish Server Administration Console.</p>
 <p><a id="sthref1" name="sthref1"></a></p>
 <hr />
-<p>GlassFish Server Open Source Edition 5.1 Common Online Help</p>
+<p>GlassFish Server Open Source Edition 7 Common Online Help</p>
 
 <p>Copyright &copy; 2010, 2019 Oracle and/or its affiliates. All rights reserved.</p>
 

diff --git a/appserver/admingui/community-theme/pom.xml b/appserver/admingui/community-theme/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/concurrent/pom.xml b/appserver/admingui/concurrent/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/concurrent/src/main/help/en/help/docinfo.html b/appserver/admingui/concurrent/src/main/help/en/help/docinfo.html
@@ -16,7 +16,7 @@
 
 -->
 
-<h4>GlassFish Server Open Source Edition 5.1</h4>
+<h4>GlassFish Server Open Source Edition 7</h4>
 <p><a name="BEGIN" id="BEGIN"></a></p>
 <p>Concurrent Online Help</p>
 <p></p>
@@ -25,7 +25,7 @@ <h4>GlassFish Server Open Source Edition 5.1</h4>
 <p>This document provides the reference and task online help topics for the concurrent module of the GlassFish Server Administration Console.</p>
 <p><a id="sthref1" name="sthref1"></a></p>
 <hr />
-<p>GlassFish Server Open Source Edition 5.1 Concurrent Online Help</p>
+<p>GlassFish Server Open Source Edition 7 Concurrent Online Help</p>
 
 <p>Copyright &copy; 2010, 2019 Oracle and/or its affiliates. All rights reserved.</p>
 

diff --git a/appserver/admingui/corba/pom.xml b/appserver/admingui/corba/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/corba/src/main/help/en/help/docinfo.html b/appserver/admingui/corba/src/main/help/en/help/docinfo.html
@@ -16,7 +16,7 @@
 
 -->
 
-<h4>GlassFish Server Open Source Edition 5.1</h4>
+<h4>GlassFish Server Open Source Edition 7</h4>
 <p><a name="BEGIN" id="BEGIN"></a></p>
 <p>CORBA Online Help</p>
 <p></p>
@@ -25,7 +25,7 @@ <h4>GlassFish Server Open Source Edition 5.1</h4>
 <p>This document provides the reference and task online help topics for the corba module of the GlassFish Server Administration Console.</p>
 <p><a id="sthref1" name="sthref1"></a></p>
 <hr />
-<p>GlassFish Server Open Source Edition 5.1 CORBA Online Help</p>
+<p>GlassFish Server Open Source Edition 7 CORBA Online Help</p>
 
 <p>Copyright &copy; 2010, 2019 Oracle and/or its affiliates. All rights reserved.</p>
 

diff --git a/appserver/admingui/core/pom.xml b/appserver/admingui/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/dataprovider/pom.xml b/appserver/admingui/dataprovider/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/devtests/hudson.xml b/appserver/admingui/devtests/hudson.xml
@@ -28,7 +28,7 @@
     <property environment="env"/>
 
     <property name="install.dir" value="binaries/${TSTAMP}"/>
-    <property name="server.dir" value="${install.dir}/glassfish6"/>
+    <property name="server.dir" value="${install.dir}/glassfish7"/>
     <property name="maven.dir" value="${install.dir}/${maven.version}"/>
     <property name="glassfish.download.dir" value="."/>
     <property name="glassfish.download" value="${glassfish.download.dir}/glassfish.zip"/>

diff --git a/appserver/admingui/devtests/pom.xml b/appserver/admingui/devtests/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -134,6 +134,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/appserver/admingui/devtests/run_test.sh b/appserver/admingui/devtests/run_test.sh
@@ -64,7 +64,7 @@ run_test_id(){
 
 post_test_run(){
   cp $TEST_RUN_LOG ${WORKSPACE}/results/ || true
-  cp ${WORKSPACE}/glassfish6/glassfish/domains/domain1/logs/server.log* ${WORKSPACE}/results/ || true
+  cp ${WORKSPACE}/glassfish7/glassfish/domains/domain1/logs/server.log* ${WORKSPACE}/results/ || true
   cp ${WORKSPACE}/appserver/admingui/devtests/target/surefire-reports/*.png ${WORKSPACE}/results/ || true
 }
 

diff --git a/appserver/admingui/dist-fragment/pom.xml b/appserver/admingui/dist-fragment/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>dist-fragment</artifactId>

diff --git a/appserver/admingui/ejb-lite/pom.xml b/appserver/admingui/ejb-lite/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/ejb-lite/src/main/help/en/help/docinfo.html b/appserver/admingui/ejb-lite/src/main/help/en/help/docinfo.html
@@ -16,7 +16,7 @@
 
 -->
 
-<h4>GlassFish Server Open Source Edition 5.1</h4>
+<h4>GlassFish Server Open Source Edition 7</h4>
 <p><a name="BEGIN" id="BEGIN"></a></p>
 <p>EJB Lite Online Help</p>
 <p></p>
@@ -25,7 +25,7 @@ <h4>GlassFish Server Open Source Edition 5.1</h4>
 <p>This document provides the reference and task online help topics for the ejb-lite module of the GlassFish Server Administration Console.</p>
 <p><a id="sthref1" name="sthref1"></a></p>
 <hr />
-<p>GlassFish Server Open Source Edition 5.1 EJB Lite Online Help</p>
+<p>GlassFish Server Open Source Edition 7 EJB Lite Online Help</p>
 
 <p>Copyright &copy; 2010, 2019 Oracle and/or its affiliates. All rights reserved.</p>
 

diff --git a/appserver/admingui/ejb/pom.xml b/appserver/admingui/ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/ejb/src/main/help/en/help/docinfo.html b/appserver/admingui/ejb/src/main/help/en/help/docinfo.html
@@ -16,7 +16,7 @@
 
 -->
 
-<h4>GlassFish Server Open Source Edition 5.1</h4>
+<h4>GlassFish Server Open Source Edition 7</h4>
 <p><a name="BEGIN" id="BEGIN"></a></p>
 <p>EJB Online Help</p>
 <p></p>
@@ -25,7 +25,7 @@ <h4>GlassFish Server Open Source Edition 5.1</h4>
 <p>This document provides the reference and task online help topics for the ejb module of the GlassFish Server Administration Console.</p>
 <p><a id="sthref1" name="sthref1"></a></p>
 <hr />
-<p>GlassFish Server Open Source Edition 5.1 EJB Online Help</p>
+<p>GlassFish Server Open Source Edition 7 EJB Online Help</p>
 
 <p>Copyright &copy; 2010, 2019 Oracle and/or its affiliates. All rights reserved.</p>
 

diff --git a/appserver/admingui/full/pom.xml b/appserver/admingui/full/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main.admingui</groupId>
         <artifactId>admingui</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/appserver/admingui/full/src/main/help/en/help/docinfo.html b/appserver/admingui/full/src/main/help/en/help/docinfo.html
@@ -16,7 +16,7 @@
 
 -->
 
-<h4>GlassFish Server Open Source Edition 5.1</h4>
+<h4>GlassFish Server Open Source Edition 7</h4>
 <p><a name="BEGIN" id="BEGIN"></a></p>
 <p>JavaMail Online Help</p>
 <p></p>
@@ -25,7 +25,7 @@ <h4>GlassFish Server Open Source Edition 5.1</h4>
 <p>This document provides the reference and task online help topics for the full module of the GlassFish Server Administration Console.</p>
 <p><a id="sthref1" name="sthref1"></a></p>
 <hr />
-<p>GlassFish Server Open Source Edition 5.1 JavaMail Online Help</p>
+<p>GlassFish Server Open Source Edition 7 JavaMail Online Help</p>
 
 <p>Copyright &copy; 2010, 2019 Oracle and/or its affiliates. All rights reserved.</p>
 

diff --git a/appserver/admingui/gf-admingui-connector/pom.xml b/appserver/admingui/gf-admingui-connector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.glassfish.main</groupId>
         <artifactId>glassfish-parent</artifactId>
-        <version>6.2.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>