From 91d88f693bb1f710ed90c6107a156d13931f484a Mon Sep 17 00:00:00 2001 From: Manfred Riem Date: Sun, 27 Oct 2024 08:16:48 -0500 Subject: [PATCH] Fixes #4140 - Update WaSP to 4.0.0-M2 (#4141) --- extension/micro/pom.xml | 2 +- extension/pom.xml | 2 +- extension/servlet/pom.xml | 2 +- extension/{eclipse-wasp => wasp}/pom.xml | 4 +- .../piranha/extension/wasp/WaspExtension.java | 0 .../extension/wasp/WaspInitializer.java | 0 .../extension/wasp/WaspJspManager.java | 0 .../wasp/WaspJspManagerExtension.java | 0 .../wasp/WaspJspManagerInitializer.java | 0 .../piranha/extension/wasp/WaspServlet.java | 0 .../src/main/java/module-info.java | 4 +- .../extension/wasp/JspDescriptorTest.java | 0 .../piranha/extension/wasp/JspWriterTest.java | 0 .../extension/wasp/WaspInitializerTest.java | 0 .../src/test/webapp/jspwriter/clearBuffer.jsp | 0 .../src/test/webapp/jspwriter/close.jsp | 0 .../src/test/webapp/jspwriter/close2.jsp | 0 .../src/test/webapp/jspwriter/close3.jsp | 0 .../src/test/webapp/jspwriter/close4.jsp | 0 .../waspinitializer/WEB-INF/classes/KEEPME | 0 .../webapp/waspinitializer/WEB-INF/lib/KEEPME | 0 extension/webprofile/pom.xml | 2 +- extension/webxml/pom.xml | 2 +- pom.xml | 2 +- test/debug/pom.xml | 2 +- test/embedded/eclipselink/pom.xml | 2 +- test/embedded/hazelcast/pom.xml | 2 +- test/embedded/weld/pom.xml | 2 +- test/servlet/pages/pom.xml | 44 ++++++++++++------- .../main/webapp/{hellopages.jsp => hello.jsp} | 0 .../pages/src/test/java/hello/HelloIT.java | 6 ++- 31 files changed, 46 insertions(+), 32 deletions(-) rename extension/{eclipse-wasp => wasp}/pom.xml (95%) rename extension/{eclipse-wasp => wasp}/src/main/java/cloud/piranha/extension/wasp/WaspExtension.java (100%) rename extension/{eclipse-wasp => wasp}/src/main/java/cloud/piranha/extension/wasp/WaspInitializer.java (100%) rename extension/{eclipse-wasp => wasp}/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java (100%) rename extension/{eclipse-wasp => wasp}/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerExtension.java (100%) rename extension/{eclipse-wasp => wasp}/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerInitializer.java (100%) rename extension/{eclipse-wasp => wasp}/src/main/java/cloud/piranha/extension/wasp/WaspServlet.java (100%) rename extension/{eclipse-wasp => wasp}/src/main/java/module-info.java (94%) rename extension/{eclipse-wasp => wasp}/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java (100%) rename extension/{eclipse-wasp => wasp}/src/test/java/cloud/piranha/extension/wasp/JspWriterTest.java (100%) rename extension/{eclipse-wasp => wasp}/src/test/java/cloud/piranha/extension/wasp/WaspInitializerTest.java (100%) rename extension/{eclipse-wasp => wasp}/src/test/webapp/jspwriter/clearBuffer.jsp (100%) rename extension/{eclipse-wasp => wasp}/src/test/webapp/jspwriter/close.jsp (100%) rename extension/{eclipse-wasp => wasp}/src/test/webapp/jspwriter/close2.jsp (100%) rename extension/{eclipse-wasp => wasp}/src/test/webapp/jspwriter/close3.jsp (100%) rename extension/{eclipse-wasp => wasp}/src/test/webapp/jspwriter/close4.jsp (100%) rename extension/{eclipse-wasp => wasp}/src/test/webapp/waspinitializer/WEB-INF/classes/KEEPME (100%) rename extension/{eclipse-wasp => wasp}/src/test/webapp/waspinitializer/WEB-INF/lib/KEEPME (100%) rename test/servlet/pages/src/main/webapp/{hellopages.jsp => hello.jsp} (100%) diff --git a/extension/micro/pom.xml b/extension/micro/pom.xml index 51062d53f1..e43b380e13 100644 --- a/extension/micro/pom.xml +++ b/extension/micro/pom.xml @@ -92,7 +92,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} compile diff --git a/extension/pom.xml b/extension/pom.xml index 3d1e41b943..a4e098d23a 100644 --- a/extension/pom.xml +++ b/extension/pom.xml @@ -33,7 +33,6 @@ eclipse-jstl eclipse-soteria eclipse-tyrus - eclipse-wasp eclipselink hazelcast jersey @@ -63,6 +62,7 @@ welcomefile weld yasson + wasp diff --git a/extension/servlet/pom.xml b/extension/servlet/pom.xml index 6917f736ab..2f63c19edf 100644 --- a/extension/servlet/pom.xml +++ b/extension/servlet/pom.xml @@ -64,7 +64,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} compile diff --git a/extension/eclipse-wasp/pom.xml b/extension/wasp/pom.xml similarity index 95% rename from extension/eclipse-wasp/pom.xml rename to extension/wasp/pom.xml index 8a7b417d03..2f749cc109 100644 --- a/extension/eclipse-wasp/pom.xml +++ b/extension/wasp/pom.xml @@ -7,9 +7,9 @@ project 24.11.0-SNAPSHOT - piranha-extension-eclipse-wasp + piranha-extension-wasp jar - Piranha - Extension - Eclipse WaSP + Piranha - Extension - WaSP diff --git a/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspExtension.java b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspExtension.java similarity index 100% rename from extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspExtension.java rename to extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspExtension.java diff --git a/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspInitializer.java b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspInitializer.java similarity index 100% rename from extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspInitializer.java rename to extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspInitializer.java diff --git a/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java similarity index 100% rename from extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java rename to extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManager.java diff --git a/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerExtension.java b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerExtension.java similarity index 100% rename from extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerExtension.java rename to extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerExtension.java diff --git a/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerInitializer.java b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerInitializer.java similarity index 100% rename from extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerInitializer.java rename to extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspJspManagerInitializer.java diff --git a/extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspServlet.java b/extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspServlet.java similarity index 100% rename from extension/eclipse-wasp/src/main/java/cloud/piranha/extension/wasp/WaspServlet.java rename to extension/wasp/src/main/java/cloud/piranha/extension/wasp/WaspServlet.java diff --git a/extension/eclipse-wasp/src/main/java/module-info.java b/extension/wasp/src/main/java/module-info.java similarity index 94% rename from extension/eclipse-wasp/src/main/java/module-info.java rename to extension/wasp/src/main/java/module-info.java index 6a37394bde..67cfd32586 100644 --- a/extension/eclipse-wasp/src/main/java/module-info.java +++ b/extension/wasp/src/main/java/module-info.java @@ -27,10 +27,10 @@ */ /** - * This module delivers the Eclipse WaSP integration extension. + * This module delivers the WaSP integration extension. * *

- * This extension integrates Eclipse WaSP into Piranha. See + * This extension integrates WaSP into Piranha. See * https://github.com/eclipse-ee4j/wasp for more information about its * project. *

diff --git a/extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java b/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java similarity index 100% rename from extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java rename to extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspDescriptorTest.java diff --git a/extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/JspWriterTest.java b/extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspWriterTest.java similarity index 100% rename from extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/JspWriterTest.java rename to extension/wasp/src/test/java/cloud/piranha/extension/wasp/JspWriterTest.java diff --git a/extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/WaspInitializerTest.java b/extension/wasp/src/test/java/cloud/piranha/extension/wasp/WaspInitializerTest.java similarity index 100% rename from extension/eclipse-wasp/src/test/java/cloud/piranha/extension/wasp/WaspInitializerTest.java rename to extension/wasp/src/test/java/cloud/piranha/extension/wasp/WaspInitializerTest.java diff --git a/extension/eclipse-wasp/src/test/webapp/jspwriter/clearBuffer.jsp b/extension/wasp/src/test/webapp/jspwriter/clearBuffer.jsp similarity index 100% rename from extension/eclipse-wasp/src/test/webapp/jspwriter/clearBuffer.jsp rename to extension/wasp/src/test/webapp/jspwriter/clearBuffer.jsp diff --git a/extension/eclipse-wasp/src/test/webapp/jspwriter/close.jsp b/extension/wasp/src/test/webapp/jspwriter/close.jsp similarity index 100% rename from extension/eclipse-wasp/src/test/webapp/jspwriter/close.jsp rename to extension/wasp/src/test/webapp/jspwriter/close.jsp diff --git a/extension/eclipse-wasp/src/test/webapp/jspwriter/close2.jsp b/extension/wasp/src/test/webapp/jspwriter/close2.jsp similarity index 100% rename from extension/eclipse-wasp/src/test/webapp/jspwriter/close2.jsp rename to extension/wasp/src/test/webapp/jspwriter/close2.jsp diff --git a/extension/eclipse-wasp/src/test/webapp/jspwriter/close3.jsp b/extension/wasp/src/test/webapp/jspwriter/close3.jsp similarity index 100% rename from extension/eclipse-wasp/src/test/webapp/jspwriter/close3.jsp rename to extension/wasp/src/test/webapp/jspwriter/close3.jsp diff --git a/extension/eclipse-wasp/src/test/webapp/jspwriter/close4.jsp b/extension/wasp/src/test/webapp/jspwriter/close4.jsp similarity index 100% rename from extension/eclipse-wasp/src/test/webapp/jspwriter/close4.jsp rename to extension/wasp/src/test/webapp/jspwriter/close4.jsp diff --git a/extension/eclipse-wasp/src/test/webapp/waspinitializer/WEB-INF/classes/KEEPME b/extension/wasp/src/test/webapp/waspinitializer/WEB-INF/classes/KEEPME similarity index 100% rename from extension/eclipse-wasp/src/test/webapp/waspinitializer/WEB-INF/classes/KEEPME rename to extension/wasp/src/test/webapp/waspinitializer/WEB-INF/classes/KEEPME diff --git a/extension/eclipse-wasp/src/test/webapp/waspinitializer/WEB-INF/lib/KEEPME b/extension/wasp/src/test/webapp/waspinitializer/WEB-INF/lib/KEEPME similarity index 100% rename from extension/eclipse-wasp/src/test/webapp/waspinitializer/WEB-INF/lib/KEEPME rename to extension/wasp/src/test/webapp/waspinitializer/WEB-INF/lib/KEEPME diff --git a/extension/webprofile/pom.xml b/extension/webprofile/pom.xml index dd83930001..8220a6ffba 100644 --- a/extension/webprofile/pom.xml +++ b/extension/webprofile/pom.xml @@ -88,7 +88,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} compile diff --git a/extension/webxml/pom.xml b/extension/webxml/pom.xml index db52ad8ddc..1a9bbcdeda 100644 --- a/extension/webxml/pom.xml +++ b/extension/webxml/pom.xml @@ -59,7 +59,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} test diff --git a/pom.xml b/pom.xml index 9832d8af20..c6dce907d3 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ 1.0.1 2.2.0 2.3.17.Final - 4.0.0-M1 + 4.0.0-M2 6.0.0.Beta4 3.0.4 diff --git a/test/debug/pom.xml b/test/debug/pom.xml index e870da13e6..8ba4f81192 100644 --- a/test/debug/pom.xml +++ b/test/debug/pom.xml @@ -101,7 +101,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} diff --git a/test/embedded/eclipselink/pom.xml b/test/embedded/eclipselink/pom.xml index c93c2485b4..c8ec3ac637 100644 --- a/test/embedded/eclipselink/pom.xml +++ b/test/embedded/eclipselink/pom.xml @@ -63,7 +63,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} test diff --git a/test/embedded/hazelcast/pom.xml b/test/embedded/hazelcast/pom.xml index 93c85e2bb6..27ac6d1e46 100644 --- a/test/embedded/hazelcast/pom.xml +++ b/test/embedded/hazelcast/pom.xml @@ -51,7 +51,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} test diff --git a/test/embedded/weld/pom.xml b/test/embedded/weld/pom.xml index 3a1a5149a7..867043f534 100644 --- a/test/embedded/weld/pom.xml +++ b/test/embedded/weld/pom.xml @@ -68,7 +68,7 @@ cloud.piranha.extension - piranha-extension-eclipse-wasp + piranha-extension-wasp ${project.version} test diff --git a/test/servlet/pages/pom.xml b/test/servlet/pages/pom.xml index aceb99d524..f1b8490b18 100644 --- a/test/servlet/pages/pom.xml +++ b/test/servlet/pages/pom.xml @@ -5,29 +5,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - cloud.piranha.test.servlet project 24.11.0-SNAPSHOT - cloud.piranha.test.servlet pages - 24.11.0-SNAPSHOT war - Piranha - Test - Servlet - Jakarta Pages application + Piranha - Test - Servlet - Pages application 5.11.2 @@ -37,6 +22,7 @@ servlet UTF-8 + 3.6.0 3.13.0 3.5.1 3.4.0 @@ -86,6 +72,7 @@ servlet + ${httpPort} @@ -108,6 +95,12 @@ + + 1 + + ${httpPort} + + org.apache.maven.plugins @@ -117,6 +110,25 @@ false + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + reserve-network-port + + reserve-network-port + + package + + + httpPort + + + + + diff --git a/test/servlet/pages/src/main/webapp/hellopages.jsp b/test/servlet/pages/src/main/webapp/hello.jsp similarity index 100% rename from test/servlet/pages/src/main/webapp/hellopages.jsp rename to test/servlet/pages/src/main/webapp/hello.jsp diff --git a/test/servlet/pages/src/test/java/hello/HelloIT.java b/test/servlet/pages/src/test/java/hello/HelloIT.java index 2eb0005930..bc35060a11 100644 --- a/test/servlet/pages/src/test/java/hello/HelloIT.java +++ b/test/servlet/pages/src/test/java/hello/HelloIT.java @@ -12,15 +12,17 @@ public class HelloIT { + private final String portNumber = System.getProperty("httpPort"); + @Test - public void testHelloPagesJsp() throws Exception { + public void testPagesHelloJsp() throws Exception { HttpClient client = HttpClient .newBuilder() .connectTimeout(Duration.ofSeconds(60)) .followRedirects(ALWAYS) .build(); HttpRequest request = HttpRequest - .newBuilder(new URI("http://localhost:8080/pages/hellopages.jsp")) + .newBuilder(new URI("http://localhost:" + portNumber + "/pages/hello.jsp")) .build(); HttpResponse response = client.send(request, BodyHandlers.ofString()); assertTrue(response.body().contains("Hello from Jakarta Pages!"));