Fixes #4140 - Update WaSP to 4.0.0-M2 (#4141)

extension/micro/pom.xml

@@ -92,7 +92,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

extension/pom.xml

@@ -33,7 +33,6 @@
         <module>eclipse-jstl</module>
         <module>eclipse-soteria</module>
         <module>eclipse-tyrus</module>
-        <module>eclipse-wasp</module>
         <module>eclipselink</module>
         <module>hazelcast</module>
         <module>jersey</module>
@@ -63,6 +62,7 @@
         <module>welcomefile</module>
         <module>weld</module>
         <module>yasson</module>
+        <module>wasp</module>
     </modules>
 
     <dependencyManagement>

extension/servlet/pom.xml

@@ -64,7 +64,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

extension/eclipse-wasp/pom.xml → extension/wasp/pom.xml

@@ -7,9 +7,9 @@
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <artifactId>piranha-extension-eclipse-wasp</artifactId>
+    <artifactId>piranha-extension-wasp</artifactId>
     <packaging>jar</packaging>
-    <name>Piranha - Extension - Eclipse WaSP</name>
+    <name>Piranha - Extension - WaSP</name>
     <dependencies>
         <!-- compile -->
         <dependency>

extension/eclipse-wasp/src/main/java/module-info.java → 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.
  *
  * <p>
- *  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.
  * </p>

extension/webprofile/pom.xml

@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>

extension/webxml/pom.xml

@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

pom.xml

@@ -125,7 +125,7 @@
         <transact-cdi-beans.version>1.0.1</transact-cdi-beans.version>
         <tyrus.version>2.2.0</tyrus.version>
         <undertow.version>2.3.17.Final</undertow.version>
-        <wasp.version>4.0.0-M1</wasp.version>
+        <wasp.version>4.0.0-M2</wasp.version>
         <weld.version>6.0.0.Beta4</weld.version>
         <yasson.version>3.0.4</yasson.version>
         <!-- plugins -->

test/debug/pom.xml

@@ -101,7 +101,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
         </dependency>
 

test/embedded/eclipselink/pom.xml

@@ -63,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

test/embedded/hazelcast/pom.xml

@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

test/embedded/weld/pom.xml

@@ -68,7 +68,7 @@
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-eclipse-wasp</artifactId>
+            <artifactId>piranha-extension-wasp</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>

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">
     <modelVersion>4.0.0</modelVersion>
-    <!--
-
-    WARNING - Do not remove the versions in the properties section as this
-    particular project is used as a basis for the guide content at 
-    docs/src/site/markdown/servlet/create_a_jakarta_pages_application.md.
-  
-    When updating the guide do the following:
-
-    1. Drop the parent part below
-    2. Change the name of the project to read 'Create a Jakara Pages application'
-    3. Change the piranha.version to the latest released version of Piranha
-
-    -->
     <parent>
         <groupId>cloud.piranha.test.servlet</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <groupId>cloud.piranha.test.servlet</groupId>
     <artifactId>pages</artifactId>
-    <version>24.11.0-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>Piranha - Test - Servlet - Jakarta Pages application</name>
+    <name>Piranha - Test - Servlet - Pages application</name>
     <properties>
         <!-- dependencies -->
         <junit.version>5.11.2</junit.version>
@@ -37,6 +22,7 @@
         <piranha.distribution>servlet</piranha.distribution>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- plugins -->
+        <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-failsafe-plugin.version>3.5.1</maven-failsafe-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
@@ -86,6 +72,7 @@
                 </executions>
                 <configuration>
                     <distribution>servlet</distribution>
+                    <httpPort>${httpPort}</httpPort>
                 </configuration>
             </plugin>
             <plugin>
@@ -108,6 +95,12 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <forkCount>1</forkCount>
+                    <systemPropertyVariables>
+                        <httpPort>${httpPort}</httpPort>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -117,6 +110,25 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>${build-helper-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>reserve-network-port</id>
+                        <goals>
+                            <goal>reserve-network-port</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <portNames>
+                                <portName>httpPort</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

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<String> response = client.send(request, BodyHandlers.ofString());
         assertTrue(response.body().contains("Hello from Jakarta Pages!"));