diff --git a/pom.xml b/pom.xml
index 53b5d6a358..7bca64c424 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,7 +363,6 @@
 
                 <module>muleesb</module>
 
-                <module>web-modules</module>
                 <module>persistence-modules/deltaspike</module> <!-- delta spike it doesn't yet the jakarta API-->
             </modules>
 
@@ -550,7 +549,6 @@
                 <module>lombok-modules/lombok-custom</module>
                 <module>muleesb</module>
 
-                <module>web-modules</module>
                 <module>persistence-modules/deltaspike</module> <!-- delta spike it doesn't yet the jakarta API-->
             </modules>
 
@@ -936,6 +934,7 @@
                 <module>persistence-modules/questdb</module>
                 <module>vaadin</module>
                 <module>libraries-3</module>
+                <module>web-modules/apache-tapestry</module>
             </modules>
 
             <properties>
@@ -1187,6 +1186,7 @@
                 <module>persistence-modules/questdb</module>
                 <module>vaadin</module>
                 <module>libraries-3</module>
+                <module>web-modules/apache-tapestry</module>
             </modules>
 
             <properties>
diff --git a/web-modules/apache-tapestry/pom.xml b/web-modules/apache-tapestry/pom.xml
index 7746520a56..9632dd70dc 100644
--- a/web-modules/apache-tapestry/pom.xml
+++ b/web-modules/apache-tapestry/pom.xml
@@ -115,6 +115,18 @@
                     </systemProperties>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -133,11 +145,11 @@
 
     <properties>
         <compiler.jetty.version>6.1.16</compiler.jetty.version>
-        <compiler.surefire.version>2.7.2</compiler.surefire.version>
-        <compiler.plugin.version>2.3.2</compiler.plugin.version>
-        <source.version>1.8</source.version>
-        <target.version>1.8</target.version>
-        <tapestry-release-version>5.4.5</tapestry-release-version>
+        <compiler.surefire.version>3.0.0-M5</compiler.surefire.version>
+        <compiler.plugin.version>3.8.1</compiler.plugin.version>
+        <source.version>11</source.version>
+        <target.version>11</target.version>
+        <tapestry-release-version>5.8.2</tapestry-release-version>
         <servlet-api-release-version>2.5</servlet-api-release-version>
         <testng-release-version>6.8.21</testng-release-version>
         <slf4j-release-version>1.7.19</slf4j-release-version>
diff --git a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java
index c4d57d5b86..2798e4a75b 100644
--- a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java
+++ b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/AppModule.java
@@ -3,17 +3,17 @@ package com.baeldung.tapestry.services;
 import java.io.IOException;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
-import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.commons.MappedConfiguration;
+import org.apache.tapestry5.commons.OrderedConfiguration;
+import org.apache.tapestry5.http.services.Request;
+import org.apache.tapestry5.http.services.RequestFilter;
+import org.apache.tapestry5.http.services.RequestHandler;
+import org.apache.tapestry5.http.services.Response;
 import org.apache.tapestry5.ioc.ServiceBinder;
 import org.apache.tapestry5.ioc.annotations.Contribute;
 import org.apache.tapestry5.ioc.annotations.Local;
 import org.apache.tapestry5.ioc.services.ApplicationDefaults;
 import org.apache.tapestry5.ioc.services.SymbolProvider;
-import org.apache.tapestry5.services.Request;
-import org.apache.tapestry5.services.RequestFilter;
-import org.apache.tapestry5.services.RequestHandler;
-import org.apache.tapestry5.services.Response;
 import org.slf4j.Logger;
 
 /**
diff --git a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java
index d9c8493e39..1c89587c53 100644
--- a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java
+++ b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/DevelopmentModule.java
@@ -1,7 +1,7 @@
 package com.baeldung.tapestry.services;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.commons.MappedConfiguration;
 
 /**
  * This module is automatically included as part of the Tapestry IoC Registry if <em>tapestry.execution-mode</em>
diff --git a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java
index fc6fb595e9..d16e498a4b 100644
--- a/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java
+++ b/web-modules/apache-tapestry/src/main/java/com/baeldung/tapestry/services/QaModule.java
@@ -1,7 +1,7 @@
 package com.baeldung.tapestry.services;
 
 import org.apache.tapestry5.SymbolConstants;
-import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.commons.MappedConfiguration;
 import org.apache.tapestry5.ioc.ServiceBinder;
 
 /**