From 486fb24691a5882517de05c17debad1c045b364b Mon Sep 17 00:00:00 2001
From: Thomas Broyer <t.broyer@ltgt.net>
Date: Thu, 2 Jan 2025 15:32:35 +0100
Subject: [PATCH] Upgrade Jetty to v12 now that JDK 17 is needed

Also bump to Jakarta EE 10.

The launcherDir/warDir has to be moved into the *-server module
so the resourceBase path doesn't use a ../ (that makes it an
"alias" resource, and Jetty then refuses to load the resources
without an AliasCheck to allow them)
---
 .../__rootArtifactId__-server/pom.xml                | 10 +++++-----
 .../src/main/jettyconf/context.xml                   |  2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 12 ++++++------
 .../basic-rf/reference/basic-rf-server/pom.xml       | 10 +++++-----
 .../basic-rf-server/src/main/jettyconf/context.xml   |  2 +-
 .../resources/projects/basic-rf/reference/pom.xml    | 12 ++++++------
 .../__rootArtifactId__-server/pom.xml                | 10 +++++-----
 .../src/main/jettyconf/context.xml                   |  2 +-
 .../src/main/resources/archetype-resources/pom.xml   | 12 ++++++------
 .../reference/basic-webapp-server/pom.xml            | 10 +++++-----
 .../src/main/jettyconf/context.xml                   |  2 +-
 .../projects/basic-webapp/reference/pom.xml          | 12 ++++++------
 12 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml b/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml
index 8bb43df..1684ab5 100644
--- a/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml
+++ b/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml
@@ -72,8 +72,8 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
           <configuration>
             <scan>1</scan>
             <contextXml>${dollar}{basedir}/src/main/jettyconf/context.xml</contextXml>
@@ -138,13 +138,13 @@
         <pluginManagement>
           <plugins>
             <plugin>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-maven-plugin</artifactId>
+              <groupId>org.eclipse.jetty.ee10</groupId>
+              <artifactId>jetty-ee10-maven-plugin</artifactId>
               <configuration>
                 <webApp>
                   <resourceBases>
                     <resourceBase>${dollar}{basedir}/src/main/webapp</resourceBase>
-                    <resourceBase>${dollar}{basedir}/../target/gwt/launcherDir/</resourceBase>
+                    <resourceBase>${dollar}{project.build.directory}/gwt/launcherDir/</resourceBase>
                   </resourceBases>
                 </webApp>
               </configuration>
diff --git a/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml b/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml
index 25bd246..95ca407 100644
--- a/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml
+++ b/modular-requestfactory/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Call name="setInitParameter">
     <Arg>org.eclipse.jetty.servlet.Default.useFileMappedBuffer</Arg>
     <Arg>false</Arg>
diff --git a/modular-requestfactory/src/main/resources/archetype-resources/pom.xml b/modular-requestfactory/src/main/resources/archetype-resources/pom.xml
index 236087f..7fa8ac0 100644
--- a/modular-requestfactory/src/main/resources/archetype-resources/pom.xml
+++ b/modular-requestfactory/src/main/resources/archetype-resources/pom.xml
@@ -26,7 +26,7 @@
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
-        <version>5.0.0</version>
+        <version>6.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -38,9 +38,9 @@
         <artifactId>gwt-maven-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
-          <launcherDir>${project.build.directory}/gwt/launcherDir</launcherDir>
+          <launcherDir>${dollar}{basedir}/${artifactId}-server/target/gwt/launcherDir</launcherDir>
           <!-- To be able to use gwt:devmode (useful on Windows where Ctrl+C won't kill gwt:codeserver)-->
-          <warDir>${project.build.directory}/gwt/launcherDir</warDir>
+          <warDir>${dollar}{basedir}/${artifactId}-server/target/gwt/launcherDir</warDir>
           <devmodeArgs>
             <arg>-noserver</arg>
           </devmodeArgs>
@@ -73,9 +73,9 @@
           <version>3.4.0</version>
         </plugin>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
-          <version>11.0.24</version>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
+          <version>12.0.16</version>
         </plugin>
         <plugin>
           <groupId>net.ltgt.gwt.maven</groupId>
diff --git a/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/pom.xml b/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/pom.xml
index 5d1e060..3596fd9 100644
--- a/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/pom.xml
+++ b/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/pom.xml
@@ -71,8 +71,8 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
           <configuration>
             <scan>1</scan>
             <contextXml>${basedir}/src/main/jettyconf/context.xml</contextXml>
@@ -137,13 +137,13 @@
         <pluginManagement>
           <plugins>
             <plugin>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-maven-plugin</artifactId>
+              <groupId>org.eclipse.jetty.ee10</groupId>
+              <artifactId>jetty-ee10-maven-plugin</artifactId>
               <configuration>
                 <webApp>
                   <resourceBases>
                     <resourceBase>${basedir}/src/main/webapp</resourceBase>
-                    <resourceBase>${basedir}/../target/gwt/launcherDir/</resourceBase>
+                    <resourceBase>${project.build.directory}/gwt/launcherDir/</resourceBase>
                   </resourceBases>
                 </webApp>
               </configuration>
diff --git a/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/src/main/jettyconf/context.xml b/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/src/main/jettyconf/context.xml
index 25bd246..95ca407 100644
--- a/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/src/main/jettyconf/context.xml
+++ b/modular-requestfactory/src/test/resources/projects/basic-rf/reference/basic-rf-server/src/main/jettyconf/context.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Call name="setInitParameter">
     <Arg>org.eclipse.jetty.servlet.Default.useFileMappedBuffer</Arg>
     <Arg>false</Arg>
diff --git a/modular-requestfactory/src/test/resources/projects/basic-rf/reference/pom.xml b/modular-requestfactory/src/test/resources/projects/basic-rf/reference/pom.xml
index 12e1f5b..7946397 100644
--- a/modular-requestfactory/src/test/resources/projects/basic-rf/reference/pom.xml
+++ b/modular-requestfactory/src/test/resources/projects/basic-rf/reference/pom.xml
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
-        <version>5.0.0</version>
+        <version>6.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -37,9 +37,9 @@
         <artifactId>gwt-maven-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
-          <launcherDir>${project.build.directory}/gwt/launcherDir</launcherDir>
+          <launcherDir>${basedir}/basic-rf-server/target/gwt/launcherDir</launcherDir>
           <!-- To be able to use gwt:devmode (useful on Windows where Ctrl+C won't kill gwt:codeserver)-->
-          <warDir>${project.build.directory}/gwt/launcherDir</warDir>
+          <warDir>${basedir}/basic-rf-server/target/gwt/launcherDir</warDir>
           <devmodeArgs>
             <arg>-noserver</arg>
           </devmodeArgs>
@@ -72,9 +72,9 @@
           <version>3.4.0</version>
         </plugin>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
-          <version>11.0.24</version>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
+          <version>12.0.16</version>
         </plugin>
         <plugin>
           <groupId>net.ltgt.gwt.maven</groupId>
diff --git a/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml b/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml
index 3e7ad2d..a1fa611 100644
--- a/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml
+++ b/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/pom.xml
@@ -33,8 +33,8 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
           <configuration>
             <scan>1</scan>
             <contextXml>${dollar}{basedir}/src/main/jettyconf/context.xml</contextXml>
@@ -73,13 +73,13 @@
         <pluginManagement>
           <plugins>
             <plugin>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-maven-plugin</artifactId>
+              <groupId>org.eclipse.jetty.ee10</groupId>
+              <artifactId>jetty-ee10-maven-plugin</artifactId>
               <configuration>
                 <webApp>
                   <resourceBases>
                     <resourceBase>${dollar}{basedir}/src/main/webapp</resourceBase>
-                    <resourceBase>${dollar}{basedir}/../target/gwt/launcherDir/</resourceBase>
+                    <resourceBase>${dollar}{project.build.directory}/gwt/launcherDir/</resourceBase>
                   </resourceBases>
                 </webApp>
               </configuration>
diff --git a/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml b/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml
index 25bd246..95ca407 100644
--- a/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml
+++ b/modular-webapp/src/main/resources/archetype-resources/__rootArtifactId__-server/src/main/jettyconf/context.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Call name="setInitParameter">
     <Arg>org.eclipse.jetty.servlet.Default.useFileMappedBuffer</Arg>
     <Arg>false</Arg>
diff --git a/modular-webapp/src/main/resources/archetype-resources/pom.xml b/modular-webapp/src/main/resources/archetype-resources/pom.xml
index 37bef89..9deb1e8 100644
--- a/modular-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/modular-webapp/src/main/resources/archetype-resources/pom.xml
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
-        <version>5.0.0</version>
+        <version>6.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -36,9 +36,9 @@
         <artifactId>gwt-maven-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
-          <launcherDir>${project.build.directory}/gwt/launcherDir</launcherDir>
+          <launcherDir>${dollar}{basedir}/${artifactId}-server/target/gwt/launcherDir</launcherDir>
           <!-- To be able to use gwt:devmode (useful on Windows where Ctrl+C won't kill gwt:codeserver)-->
-          <warDir>${project.build.directory}/gwt/launcherDir</warDir>
+          <warDir>${dollar}{basedir}/${artifactId}-server/target/gwt/launcherDir</warDir>
           <devmodeArgs>
             <arg>-noserver</arg>
           </devmodeArgs>
@@ -71,9 +71,9 @@
           <version>3.4.0</version>
         </plugin>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
-          <version>11.0.24</version>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
+          <version>12.0.16</version>
         </plugin>
         <plugin>
           <groupId>net.ltgt.gwt.maven</groupId>
diff --git a/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/pom.xml b/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/pom.xml
index 7033b45..b218875 100644
--- a/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/pom.xml
+++ b/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/pom.xml
@@ -32,8 +32,8 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
           <configuration>
             <scan>1</scan>
             <contextXml>${basedir}/src/main/jettyconf/context.xml</contextXml>
@@ -72,13 +72,13 @@
         <pluginManagement>
           <plugins>
             <plugin>
-              <groupId>org.eclipse.jetty</groupId>
-              <artifactId>jetty-maven-plugin</artifactId>
+              <groupId>org.eclipse.jetty.ee10</groupId>
+              <artifactId>jetty-ee10-maven-plugin</artifactId>
               <configuration>
                 <webApp>
                   <resourceBases>
                     <resourceBase>${basedir}/src/main/webapp</resourceBase>
-                    <resourceBase>${basedir}/../target/gwt/launcherDir/</resourceBase>
+                    <resourceBase>${project.build.directory}/gwt/launcherDir/</resourceBase>
                   </resourceBases>
                 </webApp>
               </configuration>
diff --git a/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/src/main/jettyconf/context.xml b/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/src/main/jettyconf/context.xml
index 25bd246..95ca407 100644
--- a/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/src/main/jettyconf/context.xml
+++ b/modular-webapp/src/test/resources/projects/basic-webapp/reference/basic-webapp-server/src/main/jettyconf/context.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://jetty.org/configure_10_0.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee10.webapp.WebAppContext">
   <Call name="setInitParameter">
     <Arg>org.eclipse.jetty.servlet.Default.useFileMappedBuffer</Arg>
     <Arg>false</Arg>
diff --git a/modular-webapp/src/test/resources/projects/basic-webapp/reference/pom.xml b/modular-webapp/src/test/resources/projects/basic-webapp/reference/pom.xml
index ffb1243..6d72c3e 100644
--- a/modular-webapp/src/test/resources/projects/basic-webapp/reference/pom.xml
+++ b/modular-webapp/src/test/resources/projects/basic-webapp/reference/pom.xml
@@ -23,7 +23,7 @@
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>
-        <version>5.0.0</version>
+        <version>6.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -35,9 +35,9 @@
         <artifactId>gwt-maven-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
-          <launcherDir>${project.build.directory}/gwt/launcherDir</launcherDir>
+          <launcherDir>${basedir}/basic-webapp-server/target/gwt/launcherDir</launcherDir>
           <!-- To be able to use gwt:devmode (useful on Windows where Ctrl+C won't kill gwt:codeserver)-->
-          <warDir>${project.build.directory}/gwt/launcherDir</warDir>
+          <warDir>${basedir}/basic-webapp-server/target/gwt/launcherDir</warDir>
           <devmodeArgs>
             <arg>-noserver</arg>
           </devmodeArgs>
@@ -70,9 +70,9 @@
           <version>3.4.0</version>
         </plugin>
         <plugin>
-          <groupId>org.eclipse.jetty</groupId>
-          <artifactId>jetty-maven-plugin</artifactId>
-          <version>11.0.24</version>
+          <groupId>org.eclipse.jetty.ee10</groupId>
+          <artifactId>jetty-ee10-maven-plugin</artifactId>
+          <version>12.0.16</version>
         </plugin>
         <plugin>
           <groupId>net.ltgt.gwt.maven</groupId>