From dea6e4bc6467321025ead79485e7be1343013a33 Mon Sep 17 00:00:00 2001 From: Savio Ferreira Date: Tue, 26 May 2026 19:47:20 -0300 Subject: [PATCH 1/3] Update all embedded maven-plugin test applications with GlassFish configuration changes --- .../maven-plugin/applicationDispatcher/pom.xml | 2 +- .../embedded/maven-plugin/dirListing/pom.xml | 2 +- .../maven-plugin/filterURIMapping/pom.xml | 2 +- .../embedded/maven-plugin/getRequestURI/pom.xml | 2 +- .../tests/embedded/maven-plugin/index/pom.xml | 2 +- .../tests/embedded/maven-plugin/init/pom.xml | 2 +- .../maven-plugin/jmxUndeployEvent/pom.xml | 2 +- .../tests/embedded/maven-plugin/jsftest/pom.xml | 2 +- .../tests/embedded/maven-plugin/jsptest/pom.xml | 2 +- .../embedded/maven-plugin/localejbs/pom.xml | 2 +- .../tests/embedded/maven-plugin/mdb/pom.xml | 2 +- .../embedded/maven-plugin/multipleApps/pom.xml | 2 +- appserver/tests/embedded/maven-plugin/pom.xml | 17 +++-------------- .../embedded/maven-plugin/queryString/pom.xml | 2 +- .../embedded/maven-plugin/remoteejbs/pom.xml | 2 +- .../embedded/maven-plugin/secureWebApp/pom.xml | 2 +- .../maven-plugin/sessionDestroyed/pom.xml | 2 +- .../tests/embedded/maven-plugin/simple/pom.xml | 3 ++- .../embedded/maven-plugin/standalonewar/pom.xml | 2 +- .../maven-plugin/static-shell-init/pom.xml | 2 +- .../embedded/maven-plugin/webservice/pom.xml | 2 +- .../embedded/maven-plugin/websockets/pom.xml | 2 +- 22 files changed, 25 insertions(+), 35 deletions(-) diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml index 67fc96d5369..c31d95c1443 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml index 89a021d0857..5bdedfd117e 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/pom.xml +++ b/appserver/tests/embedded/maven-plugin/dirListing/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin target/dirListing.war 8080 diff --git a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml index aa07d0b5526..f2e977179a0 100644 --- a/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml +++ b/appserver/tests/embedded/maven-plugin/filterURIMapping/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml index 30c104a4a2c..d49a3e60171 100644 --- a/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml +++ b/appserver/tests/embedded/maven-plugin/getRequestURI/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/index/pom.xml b/appserver/tests/embedded/maven-plugin/index/pom.xml index dfdfd43d0c4..840f2ec7805 100644 --- a/appserver/tests/embedded/maven-plugin/index/pom.xml +++ b/appserver/tests/embedded/maven-plugin/index/pom.xml @@ -42,7 +42,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/init/pom.xml b/appserver/tests/embedded/maven-plugin/init/pom.xml index 4cce74157ea..a726155e69a 100644 --- a/appserver/tests/embedded/maven-plugin/init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/init/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin diff --git a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml index 8c6c259e7c7..7f3c4429bf6 100644 --- a/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jmxUndeployEvent/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml index 4813572b75d..f118cef0da6 100644 --- a/appserver/tests/embedded/maven-plugin/jsftest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsftest/pom.xml @@ -44,7 +44,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin 8181 diff --git a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml index 49b5220d0da..5784243e4a7 100644 --- a/appserver/tests/embedded/maven-plugin/jsptest/pom.xml +++ b/appserver/tests/embedded/maven-plugin/jsptest/pom.xml @@ -53,7 +53,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin ${project.build.testOutputDirectory}/system.properties diff --git a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml index f7edde05c11..d365f211991 100644 --- a/appserver/tests/embedded/maven-plugin/localejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/localejbs/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/mdb/pom.xml b/appserver/tests/embedded/maven-plugin/mdb/pom.xml index fb4af5fcd3c..ce4189c5e05 100644 --- a/appserver/tests/embedded/maven-plugin/mdb/pom.xml +++ b/appserver/tests/embedded/maven-plugin/mdb/pom.xml @@ -42,7 +42,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml index d6dda701ac0..db1f99ec1bc 100644 --- a/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml +++ b/appserver/tests/embedded/maven-plugin/multipleApps/pom.xml @@ -53,7 +53,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin ${project.build.testOutputDirectory}/system.properties diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml index d647eb179a0..320bd89264f 100644 --- a/appserver/tests/embedded/maven-plugin/pom.xml +++ b/appserver/tests/embedded/maven-plugin/pom.xml @@ -153,9 +153,10 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin - 5.1 + embedded-glassfish-maven-plugin + 8.0 + 8.0.1 target/${project.artifactId}.war 8080 ${project.artifactId} @@ -168,18 +169,6 @@ com.sun.enterprise.naming.allowJndiLookupFromOSGi=false - - - org.glassfish.main.common - simple-glassfish-api - ${project.version} - - - org.glassfish.main.extras - glassfish-embedded-all - ${project.version} - - diff --git a/appserver/tests/embedded/maven-plugin/queryString/pom.xml b/appserver/tests/embedded/maven-plugin/queryString/pom.xml index 2546f20c7d6..31f158d0f98 100644 --- a/appserver/tests/embedded/maven-plugin/queryString/pom.xml +++ b/appserver/tests/embedded/maven-plugin/queryString/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml index b871daee256..170023370db 100644 --- a/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml +++ b/appserver/tests/embedded/maven-plugin/remoteejbs/pom.xml @@ -42,7 +42,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml index 8c9aded6707..f7ee9377441 100644 --- a/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml +++ b/appserver/tests/embedded/maven-plugin/secureWebApp/pom.xml @@ -53,7 +53,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin test_key=test_value diff --git a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml index f163c83d903..ddda24b6bf5 100644 --- a/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml +++ b/appserver/tests/embedded/maven-plugin/sessionDestroyed/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/simple/pom.xml b/appserver/tests/embedded/maven-plugin/simple/pom.xml index 3f01e8324d1..658e8dab9eb 100644 --- a/appserver/tests/embedded/maven-plugin/simple/pom.xml +++ b/appserver/tests/embedded/maven-plugin/simple/pom.xml @@ -42,8 +42,9 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin + false hello.war 8080 diff --git a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml index 2deabfa2d66..e3490e85800 100644 --- a/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml +++ b/appserver/tests/embedded/maven-plugin/standalonewar/pom.xml @@ -43,7 +43,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml index 20f6b5dbd57..12ae10b6268 100644 --- a/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml +++ b/appserver/tests/embedded/maven-plugin/static-shell-init/pom.xml @@ -45,7 +45,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin org.glassfish.main.extras diff --git a/appserver/tests/embedded/maven-plugin/webservice/pom.xml b/appserver/tests/embedded/maven-plugin/webservice/pom.xml index 063c2ba952f..1b0807ea32b 100644 --- a/appserver/tests/embedded/maven-plugin/webservice/pom.xml +++ b/appserver/tests/embedded/maven-plugin/webservice/pom.xml @@ -44,7 +44,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start diff --git a/appserver/tests/embedded/maven-plugin/websockets/pom.xml b/appserver/tests/embedded/maven-plugin/websockets/pom.xml index 2ad206d136e..22956d61ed2 100644 --- a/appserver/tests/embedded/maven-plugin/websockets/pom.xml +++ b/appserver/tests/embedded/maven-plugin/websockets/pom.xml @@ -48,7 +48,7 @@ org.glassfish.embedded - maven-embedded-glassfish-plugin + embedded-glassfish-maven-plugin start From a271c9f51e28311af8869a59831d6c2148bfb6c6 Mon Sep 17 00:00:00 2001 From: Savio Ferreira Date: Thu, 4 Jun 2026 17:38:48 -0300 Subject: [PATCH 2/3] Use current project version for GlassFish Maven plugin tests --- appserver/tests/embedded/maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml index 320bd89264f..78be5e917cf 100644 --- a/appserver/tests/embedded/maven-plugin/pom.xml +++ b/appserver/tests/embedded/maven-plugin/pom.xml @@ -156,7 +156,7 @@ embedded-glassfish-maven-plugin 8.0 - 8.0.1 + ${project.version} target/${project.artifactId}.war 8080 ${project.artifactId} From 341040c2e74a2c51f688831144998c76f336c9c2 Mon Sep 17 00:00:00 2001 From: Savio Ferreira Date: Thu, 4 Jun 2026 17:57:27 -0300 Subject: [PATCH 3/3] Restore explicit glassfish-embedded-all dependency for build ordering --- appserver/tests/embedded/maven-plugin/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/appserver/tests/embedded/maven-plugin/pom.xml b/appserver/tests/embedded/maven-plugin/pom.xml index 78be5e917cf..fdb3f09e1e2 100644 --- a/appserver/tests/embedded/maven-plugin/pom.xml +++ b/appserver/tests/embedded/maven-plugin/pom.xml @@ -169,6 +169,13 @@ com.sun.enterprise.naming.allowJndiLookupFromOSGi=false + + + org.glassfish.main.extras + glassfish-embedded-all + ${project.version} + +