diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml
index 57255f01..4bce3d7d 100644
--- a/applications/proberapp/pom.xml
+++ b/applications/proberapp/pom.xml
@@ -243,7 +243,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>appengine-maven-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.4.4</version>
                 <configuration>
                     <projectId>ludo-in-in</projectId>
                     <version>liveruntimejava8maven</version>
@@ -253,7 +253,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <release>8</release>
                 </configuration>
@@ -261,7 +261,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-enforcer-plugin</artifactId>
-              <version>3.1.0</version>
+              <version>3.4.0</version>
               <executions>
                 <execution>
                   <id>enforce-maven</id>
diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml
index d35ad917..fa6d48b4 100644
--- a/applications/springboot/pom.xml
+++ b/applications/springboot/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>springboot</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>applications</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: springboot</name>
@@ -31,7 +35,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring.boot.version>2.7.2</spring.boot.version>
+        <spring.boot.version>2.7.15</spring.boot.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
@@ -40,7 +44,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.boot.version}</version>
             <!-- Exclude Tomcat so that it doesn't conflict w/ Jetty server -->
             <exclusions>
                 <exclusion>
@@ -54,7 +57,6 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.30</version>
             <scope>provided</scope>
         </dependency>
 
@@ -62,20 +64,17 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -103,7 +102,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>appengine-maven-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>2.4.4</version>
                 <configuration>
                     <!-- can be set w/ -DprojectId=myProjectId on command line -->
                     <projectId>ludo-in-in</projectId>
@@ -114,7 +113,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java
index c6306a50..5fdd5e76 100644
--- a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java
+++ b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java
@@ -177,7 +177,7 @@ private static String getWarPath(String directoryName) {
                     + directoryName
                     + "/target/"
                     + directoryName
-                    + "-0.0.1-SNAPSHOT")
+                    + "-2.0.21-SNAPSHOT")
             .getAbsolutePath();
 
 //    assertThat(appRoot.isDirectory()).isTrue();
diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java
index c24e3a61..8d4c9098 100644
--- a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java
+++ b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java
@@ -56,7 +56,7 @@ static File createApp(String directoryName) {
     File appRoot =
         new File(
             currentDirectory,
-            "../testlocalapps/" + directoryName + "/target/" + directoryName + "-0.0.1-SNAPSHOT");
+            "../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.21-SNAPSHOT");
     return appRoot;
   }
 
diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml
index 77d4917b..42f5c704 100644
--- a/e2etests/testlocalapps/allinone/pom.xml
+++ b/e2etests/testlocalapps/allinone/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>allinone</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: allinone test application</name>
@@ -39,18 +43,15 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>2.0.19</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
             <type>jar</type>
         </dependency>
     </dependencies>
@@ -71,7 +72,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml
index 39c877ad..8a2a735e 100644
--- a/e2etests/testlocalapps/badcron/pom.xml
+++ b/e2etests/testlocalapps/badcron/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>badcron</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: badcron</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml
index 1563c0c8..91a1af53 100644
--- a/e2etests/testlocalapps/bundle_standard/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard/pom.xml
@@ -21,7 +21,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard</name>
@@ -39,7 +43,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -58,13 +61,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
index a48e36e9..5f44e4c5 100644
--- a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
@@ -22,7 +22,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard_with_container_initializer</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard_with_container_initializer</name>
@@ -69,13 +73,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
index 38299e0c..622f727c 100644
--- a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
@@ -21,7 +21,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard_with_no_jsp</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard_with_no_jsp</name>
@@ -30,7 +34,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.deploy.skip>true</maven.deploy.skip>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.boot.version>2.7.2</spring.boot.version>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
@@ -59,13 +62,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
index 412feb0e..5151455a 100644
--- a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
+++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
@@ -21,7 +21,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard_with_weblistener_memcache</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard_with_weblistener_memcache</name>
@@ -30,7 +34,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.deploy.skip>true</maven.deploy.skip>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.boot.version>2.7.2</spring.boot.version>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
@@ -64,13 +67,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
index 467b45ee..129f4d59 100644
--- a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
+++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>cron-bad-job-age-limit</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: cron-bad-job-age-limit</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
index 8e9d7c79..2213ccd4 100644
--- a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
+++ b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>cron-good-retry-parameters</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: cron-good-retry-parameters</name>
@@ -58,13 +62,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
index 1056d48a..423dd536 100644
--- a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
+++ b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>cron-negative-max-backoff</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: cron-negative-max-backoff</name>
@@ -58,13 +62,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
index 66b828c1..4ce62cc4 100644
--- a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
+++ b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>cron-negative-retry-limit</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: cron-negative-retry-limit</name>
@@ -58,13 +62,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
index 6157f4d4..462784ab 100644
--- a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
+++ b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>cron-two-max-doublings</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: cron-two-max-doublings</name>
@@ -58,13 +62,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml
index d7a54f21..c362eadb 100644
--- a/e2etests/testlocalapps/http-headers/pom.xml
+++ b/e2etests/testlocalapps/http-headers/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>http-headers</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: http-headers</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml
index b71bbfa7..8569a333 100644
--- a/e2etests/testlocalapps/java8-jar/pom.xml
+++ b/e2etests/testlocalapps/java8-jar/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>java8-jar</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: java8-jar</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml
index 0948a3d3..d2f0dc21 100644
--- a/e2etests/testlocalapps/java8-no-webxml/pom.xml
+++ b/e2etests/testlocalapps/java8-no-webxml/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>java8-no-webxml</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: java8-no-webxml</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml
index 34b873c2..a23b59ce 100644
--- a/e2etests/testlocalapps/pom.xml
+++ b/e2etests/testlocalapps/pom.xml
@@ -17,7 +17,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
-  <artifactId>testlocalapss</artifactId>
+  <artifactId>testlocalapps</artifactId>
   <name>AppEngine :: Test local applications</name>
   <parent>
     <groupId>com.google.appengine</groupId>
@@ -71,4 +71,15 @@
       <module>bundle_standard_with_weblistener_memcache</module>
       <module>allinone</module>
   </modules>
+  <build>
+      <plugins>
+          <plugin>
+              <artifactId>maven-war-plugin</artifactId>
+              <version>3.4.0</version>
+              <configuration>
+                  <failOnMissingWebXml>false</failOnMissingWebXml>
+              </configuration>
+          </plugin>
+      </plugins>
+  </build>
 </project>
diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml
index b63affb5..3abeb14d 100644
--- a/e2etests/testlocalapps/sample-badaeweb/pom.xml
+++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-badaeweb</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-badaeweb</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
index 5f8e11bf..0cd22f2a 100644
--- a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
+++ b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-baddispatch-yaml</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-baddispatch-yaml</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml
index 0e8eb885..eb6d1dab 100644
--- a/e2etests/testlocalapps/sample-baddispatch/pom.xml
+++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-baddispatch</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-baddispatch</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml
index 46af394c..6c5d5d1a 100644
--- a/e2etests/testlocalapps/sample-badentrypoint/pom.xml
+++ b/e2etests/testlocalapps/sample-badentrypoint/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-badentrypoint</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-badentrypoint</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml
index 765687d4..1b9db0bb 100644
--- a/e2etests/testlocalapps/sample-badindexes/pom.xml
+++ b/e2etests/testlocalapps/sample-badindexes/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-badindexes</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-badindexes</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
index 317690db..ea813149 100644
--- a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
+++ b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-badruntimechannel</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-badruntimechannel</name>
@@ -40,7 +44,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -59,13 +62,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml
index be1486df..5dc8b97b 100644
--- a/e2etests/testlocalapps/sample-badweb/pom.xml
+++ b/e2etests/testlocalapps/sample-badweb/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-badweb</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-badweb</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
index 0899475f..c31df681 100644
--- a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
+++ b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-default-auto-ids</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-default-auto-ids</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
index 34ca1c9e..65bfef19 100644
--- a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
+++ b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-error-in-tag-file</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-error-in-tag-file</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml
index 23c6a0c1..18ffbab8 100644
--- a/e2etests/testlocalapps/sample-java11/pom.xml
+++ b/e2etests/testlocalapps/sample-java11/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-java11</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-java11</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml
index adddb06f..cbd228a1 100644
--- a/e2etests/testlocalapps/sample-java17/pom.xml
+++ b/e2etests/testlocalapps/sample-java17/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-java17</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-java17</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
index 07aa9b40..82efab37 100644
--- a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
+++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml
@@ -15,29 +15,17 @@
  limitations under the License.
 -->
 
-<!--
- Copyright 2021 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-jsptaglibrary</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-jsptaglibrary</name>
@@ -55,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -74,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml
index 9ad92ff8..8aa5c302 100644
--- a/e2etests/testlocalapps/sample-jspx/pom.xml
+++ b/e2etests/testlocalapps/sample-jspx/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-jspx</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-jspx</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
index afdd85b2..15081f8e 100644
--- a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
+++ b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-legacy-auto-ids</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-legacy-auto-ids</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml
index 2e4810e7..96b4234d 100644
--- a/e2etests/testlocalapps/sample-missingappid/pom.xml
+++ b/e2etests/testlocalapps/sample-missingappid/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-missingappid</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-missingappid</name>
@@ -30,7 +34,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring.boot.version>2.7.2</spring.boot.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
@@ -40,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -59,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml
index 3a7aeb33..c0fd181c 100644
--- a/e2etests/testlocalapps/sample-nojsps/pom.xml
+++ b/e2etests/testlocalapps/sample-nojsps/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-nojsps</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-nojsps</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
index 24f1d0d5..88f359b2 100644
--- a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
+++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-unspecified-auto-ids</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-unspecified-auto-ids</name>
@@ -40,7 +44,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -59,13 +62,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml
index a708af40..867b99c2 100644
--- a/e2etests/testlocalapps/sample-with-classes/pom.xml
+++ b/e2etests/testlocalapps/sample-with-classes/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sample-with-classes</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sample-with-classes</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
index 1f0fac21..c544c408 100644
--- a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sampleapp-automatic-module</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sampleapp-automatic-module</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml
index 82be059e..824b99af 100644
--- a/e2etests/testlocalapps/sampleapp-backends/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml
@@ -21,9 +21,12 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sampleapp-backends</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
-
     <name>AppEngine :: sampleapp-backends</name>
 
     <properties>
@@ -39,7 +42,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +60,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
index 052de12d..0643f6ce 100644
--- a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sampleapp-basic-module</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sampleapp-basic-module</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
index 4058efdc..8525e0aa 100644
--- a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sampleapp-manual-module</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sampleapp-manual-module</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml
index 11cf1eb5..d5a17f92 100644
--- a/e2etests/testlocalapps/sampleapp-runtime/pom.xml
+++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sampleapp-runtime</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: sampleapp-runtime</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml
index 8d016593..5e379366 100644
--- a/e2etests/testlocalapps/sampleapp/pom.xml
+++ b/e2etests/testlocalapps/sampleapp/pom.xml
@@ -21,9 +21,12 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>sampleapp</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
-
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <name>AppEngine :: sampleapp</name>
 
     <properties>
@@ -39,7 +42,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +60,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml
index e5a04a86..a121f811 100644
--- a/e2etests/testlocalapps/stage-sampleapp/pom.xml
+++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>stage-sampleapp</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: stage-sampleapp</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml
index fc653166..51f7e676 100644
--- a/e2etests/testlocalapps/stage-with-staging-options/pom.xml
+++ b/e2etests/testlocalapps/stage-with-staging-options/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>stage-with-staging-options</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: stage-with-staging-options</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml
index 7dabab74..445e2c6d 100644
--- a/e2etests/testlocalapps/xmlorder/pom.xml
+++ b/e2etests/testlocalapps/xmlorder/pom.xml
@@ -21,9 +21,12 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>xmlorder</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
-
     <name>AppEngine :: xmlorder</name>
 
     <properties>
@@ -39,7 +42,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +60,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 79f5b024..3083efae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -888,19 +888,25 @@
             <fileTemplate>${project.basedir}/licenses/resources/third-party-file-template.ftl</fileTemplate>
           </configuration>
         </plugin>
-        <plugin>
-            <groupId>org.cyclonedx</groupId>
-            <artifactId>cyclonedx-maven-plugin</artifactId>
-            <version>2.7.9</version>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>makeAggregateBom</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
+    <plugin>
+        <groupId>org.spdx</groupId>
+        <artifactId>spdx-maven-plugin</artifactId>
+        <!-- please check for updates on https://search.maven.org/search?q=a:spdx-maven-plugin -->
+        <version>0.7.0</version>
+        <executions>
+            <execution>
+                <id>build-spdx</id>
+                <goals>
+                    <goal>createSPDX</goal>
+                </goals>
+            </execution>
+        </executions>
+        <configuration>
+          <excludedFilePatterns>
+            <excludedFilePattern>*.spdx</excludedFilePattern>
+          </excludedFilePatterns>
+        </configuration>
+    </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml
index ea6434bb..41acfdd5 100644
--- a/runtime/annotationscanningwebapp/pom.xml
+++ b/runtime/annotationscanningwebapp/pom.xml
@@ -20,8 +20,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
-
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>runtime-parent</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>annotationscanningwebapp</artifactId>
     <name>AppEngine :: annotationscanningwebapp</name>
diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml
index 497f4ca0..5a7bd2eb 100644
--- a/runtime/failinitfilterwebapp/pom.xml
+++ b/runtime/failinitfilterwebapp/pom.xml
@@ -20,8 +20,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
-
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>runtime-parent</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>failinitfilterwebapp</artifactId>
     <name>AppEngine :: failinitfilterwebapp</name>
@@ -46,7 +49,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
+                <version>3.4.0</version>
                 <configuration>
                     <archiveClasses>true</archiveClasses>
                     <webResources>
@@ -61,7 +64,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <release>8</release>
                 </configuration>
@@ -69,7 +72,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>appengine-maven-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.4.4</version>
                 <configuration>
                     <projectId>ludo-in-in</projectId>
                     <version>failinitfilter</version>
diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml
index 46cd76e4..0707a83f 100644
--- a/runtime/nogaeapiswebapp/pom.xml
+++ b/runtime/nogaeapiswebapp/pom.xml
@@ -20,8 +20,11 @@
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
-
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>runtime-parent</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>nogaeapiswebapp</artifactId>
     <name>AppEngine :: nogaeapiswebapp</name>
@@ -61,7 +64,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <release>8</release>
                 </configuration>
diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java
index 98c914ea..aa554c68 100644
--- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java
+++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java
@@ -45,7 +45,7 @@ public static void beforeClass() throws IOException, InterruptedException {
     File currentDirectory = new File("").getAbsoluteFile();
     appRoot =
         new File(
-            currentDirectory, "../annotationscanningwebapp/target/annotationscanningwebapp-1.0");
+            currentDirectory, "../annotationscanningwebapp/target/annotationscanningwebapp-2.0.21-SNAPSHOT");
     assertThat(appRoot.isDirectory()).isTrue();
   }
 
diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java
index 4292ef75..2ce669f7 100644
--- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java
+++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java
@@ -32,7 +32,7 @@ public final class FailureFilterTest extends JavaRuntimeViaHttpBase {
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
     File currentDirectory = new File("").getAbsoluteFile();
-    appRoot = new File(currentDirectory, "../failinitfilterwebapp/target/failinitfilterwebapp-1.0");
+    appRoot = new File(currentDirectory, "../failinitfilterwebapp/target/failinitfilterwebapp-2.0.21-SNAPSHOT");
     assertThat(appRoot.isDirectory()).isTrue();
   }
 
diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java
index 49986aaa..b65c8d1f 100644
--- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java
+++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java
@@ -42,7 +42,7 @@ public NoGaeApisTest(Boolean useJetty12) {
   @BeforeClass
   public static void beforeClass() throws IOException, InterruptedException {
     File currentDirectory = new File("").getAbsoluteFile();
-    appRoot = new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-1.0");
+    appRoot = new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-2.0.21-SNAPSHOT");
     assertThat(appRoot.isDirectory()).isTrue();
   }
 
diff --git a/sessiondata/src/main/java/com/google/apphosting/runtime/VirtualThreadSetup.java b/sessiondata/src/main/java/com/google/apphosting/runtime/VirtualThreadSetup.java
new file mode 100644
index 00000000..806ee59d
--- /dev/null
+++ b/sessiondata/src/main/java/com/google/apphosting/runtime/VirtualThreadSetup.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.apphosting.runtime;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.Executor;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Try to setup a Jetty QueuedThreadPool to use JDK21 virtual threads via
+ * introspection. No op if this cannot be done (i.e running with old JDKs.
+ */
+public class VirtualThreadSetup {
+
+    private static final Logger logger = Logger.getLogger(VirtualThreadSetup.class.getName());
+
+    /*
+     * Try to setup a Jetty QueuedThreadPool to use JDK21 virtual threads via
+     * introspection. No op if this cannot be done (i.e running with old JDKs.
+    Object should be a Jetty QueuedThreadPool.
+     */
+    public static Object tryToSetVirtualThread(Object threadPool) {
+        try {
+            Method newVirtualThreadPerTaskExecutor = Executor.class.getMethod("newVirtualThreadPerTaskExecutor");
+            Method setVirtualThreadsExecutor = threadPool.getClass().getMethod("setVirtualThreadsExecutor",
+                    Class.forName("org.eclipse.jetty.util.thread.QueuedThreadPool"));
+            setVirtualThreadsExecutor.invoke(threadPool, newVirtualThreadPerTaskExecutor.invoke(null));
+        } catch (Exception e) {
+            logger.log(Level.INFO, "Could not configure JDK21 virtual threads in Jetty runtime.", e);
+        }
+        return threadPool;
+    }
+
+    private VirtualThreadSetup() {
+
+    }
+}