From 0e8aafb7bb53d881403c2d5e265669a523ec0f47 Mon Sep 17 00:00:00 2001 From: Simon Laden Date: Mon, 9 Oct 2023 12:11:17 +0100 Subject: [PATCH 1/3] FISH-7552 - add jvm options to run quicklook and samples with jdk17+ Signed-off-by: Simon Laden --- .../rolesallowed-unprotected-methods/pom.xml | 34 ++++++++++++------- appserver/tests/quicklook/build.xml | 19 +++++++++++ .../ejb/mdb/src/test/mdb/MDBTests.java | 2 +- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml b/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml index de769f6afa4..9a7be39addf 100644 --- a/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml +++ b/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml @@ -115,17 +115,25 @@ - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - --add-opens java.base/java.lang=ALL-UNNAMED - - - - - + + + + failsafe-jdk17 + + [17,) + + + + + org.apache.maven.plugins + maven-failsafe-plugin + ${maven.failsafe.plugin.version} + + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED --add-opens=java.management/javax.management=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.base/sun.net.www=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED + + + + + + diff --git a/appserver/tests/quicklook/build.xml b/appserver/tests/quicklook/build.xml index d2b8e3dbb20..00622d11e25 100644 --- a/appserver/tests/quicklook/build.xml +++ b/appserver/tests/quicklook/build.xml @@ -385,6 +385,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/appserver/tests/quicklook/ejb/mdb/src/test/mdb/MDBTests.java b/appserver/tests/quicklook/ejb/mdb/src/test/mdb/MDBTests.java index ae3579f8a00..5b98cdee296 100755 --- a/appserver/tests/quicklook/ejb/mdb/src/test/mdb/MDBTests.java +++ b/appserver/tests/quicklook/ejb/mdb/src/test/mdb/MDBTests.java @@ -87,7 +87,7 @@ public void runJMSAppTest(String mdbAppDir) throws Exception { String clientJar = cwd + File.separator + mdbAppDir + mdbApp + "Client.jar"; String gfClientJar = GLASSFISH_HOME + File.separator + "lib" + File.separator + "gf-client.jar"; cmd = APPCLIENT - + " --add-opens=java.base/java.lang=ALL-UNNAMED " + + " --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED --add-opens=java.management/javax.management=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.base/sun.net.www=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED " + GLASSFISH_APPCLIENT_MAIN_CLASS_NAME + " -client " + clientJar + " -targetserver" + " localhost:3700" From 7cab5978e8e420f342f94f330fe6df27263d92a3 Mon Sep 17 00:00:00 2001 From: Simon Laden Date: Wed, 11 Oct 2023 14:45:56 +0100 Subject: [PATCH 2/3] FISH-7552 - fixes for automated test with P embedded Signed-off-by: Simon Laden --- .../tests/functional/embeddedtest/README.md | 2 +- .../tests/functional/embeddedtest/pom.xml | 33 ++++++++++++++----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/appserver/tests/functional/embeddedtest/README.md b/appserver/tests/functional/embeddedtest/README.md index 3b5f93215ea..dbd022c365b 100644 --- a/appserver/tests/functional/embeddedtest/README.md +++ b/appserver/tests/functional/embeddedtest/README.md @@ -14,7 +14,7 @@ example: payara-embedded-all-6.2023.8.RC1.jar From the location ${PAYARA_HOME}/appserver/tests/functional/embeddedtest, run the command: -> mvn clean compile test -P {FullProfile/WebProfile} -Dpayara.version="6.2023.8.RC1" +> mvn clean -P {FullProfile/WebProfile} -Dpayara.version="6.2023.8.RC1" compile test the test is designed to adapt to jdk 8, 11, or 17. diff --git a/appserver/tests/functional/embeddedtest/pom.xml b/appserver/tests/functional/embeddedtest/pom.xml index a9c9cd73b79..baeb984e38a 100644 --- a/appserver/tests/functional/embeddedtest/pom.xml +++ b/appserver/tests/functional/embeddedtest/pom.xml @@ -42,15 +42,6 @@ maven-embedded-deployment-test - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-exports=java.base/sun.net.www=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED - - - org.apache.maven.plugins maven-install-plugin @@ -106,6 +97,18 @@ 11 11 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-exports=java.base/sun.net.www=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED + + + + Jdk17 @@ -116,6 +119,18 @@ 17 17 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-exports=java.base/sun.net.www=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED + + + + FullProfile From dc082a854fc9f3c3fb4113a3cea61d0c0286e7b9 Mon Sep 17 00:00:00 2001 From: Simon Laden Date: Thu, 12 Oct 2023 12:05:19 +0100 Subject: [PATCH 3/3] FISH-7552- tabs changed to spaces Signed-off-by: Simon Laden --- .../tests/functional/embeddedtest/pom.xml | 34 +++++++++---------- .../rolesallowed-unprotected-methods/pom.xml | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/appserver/tests/functional/embeddedtest/pom.xml b/appserver/tests/functional/embeddedtest/pom.xml index baeb984e38a..f4ebf8be1c7 100644 --- a/appserver/tests/functional/embeddedtest/pom.xml +++ b/appserver/tests/functional/embeddedtest/pom.xml @@ -2,7 +2,7 @@ + http://maven.apache.org/xsd/maven-4.0.0.xsd"> fish.payara.extras 4.0.0 @@ -99,14 +99,14 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-exports=java.base/sun.net.www=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED - - + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-exports=java.base/sun.net.www=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED + + @@ -121,14 +121,14 @@ - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-exports=java.base/sun.net.www=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED - - + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-exports=java.base/sun.net.www=ALL-UNNAMED --add-exports=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED + + diff --git a/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml b/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml index 9a7be39addf..b356ff05545 100644 --- a/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml +++ b/appserver/tests/payara-samples/samples/rolesallowed-unprotected-methods/pom.xml @@ -128,8 +128,8 @@ org.apache.maven.plugins maven-failsafe-plugin ${maven.failsafe.plugin.version} - - --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED --add-opens=java.management/javax.management=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.base/sun.net.www=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED + + --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.management/javax.management.openmbean=ALL-UNNAMED --add-opens=java.management/javax.management=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED --add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED --add-opens=java.naming/javax.naming.spi=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.base/sun.net.www=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.desktop/java.beans=ALL-UNNAMED --add-exports=jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED