From a810265553e84083c2ccc2d9d789dae3f1067eb8 Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Tue, 18 Nov 2025 15:25:41 -0600
Subject: [PATCH] ARTEMIS-5774 Bump web console to Jetty 12.1.4

---
 README.md                   |  2 +-
 artemis-console-war/pom.xml | 17 ++++++-----------
 pom.xml                     |  2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 179def2..16c2015 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Jetty server and deploys the plugin WAR application. From the 'artemis-console-w
 
 ```console
 cd artemis-console-war
-mvn jetty:run -Dskip.yarn
+mvn jetty:run-war -Dskip.yarn
 ```
 
 You can access the Artemis console with the sample plugin at: <http://localhost:8080/console/>. To connect to a running 
diff --git a/artemis-console-war/pom.xml b/artemis-console-war/pom.xml
index 9917d94..2f3ad2b 100644
--- a/artemis-console-war/pom.xml
+++ b/artemis-console-war/pom.xml
@@ -97,21 +97,16 @@
             </plugin>
 
             <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
+                <groupId>org.eclipse.jetty.ee11</groupId>
+                <artifactId>jetty-ee11-maven-plugin</artifactId>
                 <version>${jetty-version}</version>
                 <configuration>
                     <deployMode>EMBED</deployMode>
                     <scan>10</scan>
-                    <contextHandlers>
-                        <contextHandler implementation="org.eclipse.jetty.maven.plugin.MavenWebAppContext">
-                            <war>${project.build.directory}/artemis-console-war-${project.version}.war</war>
-                            <contextPath>/console</contextPath>
-                        </contextHandler>
-                    </contextHandlers>
-                    <modules>
-                        <module>jmx</module>
-                    </modules>
+                    <webApp>
+                        <war>${project.build.directory}/artemis-console-war-${project.version}.war</war>
+                        <contextPath>/console</contextPath>
+                    </webApp>
                     <systemProperties>
                         <hawtio.authenticationEnabled>false</hawtio.authenticationEnabled>
                         <hawtio.disableProxy>false</hawtio.disableProxy>
diff --git a/pom.xml b/pom.xml
index a6e319f..c2d730b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <log4j.version>2.24.3</log4j.version>
         <jolokia-integration-artemis.version>0.8.0</jolokia-integration-artemis.version>
         <jolokia.version>2.4.2</jolokia.version>
-        <jetty-version>11.0.24</jetty-version>
+        <jetty-version>12.1.4</jetty-version>
         <corepack-version>0.34.0</corepack-version>
         <node-version>v22.17.1</node-version>
         <yarn-version>v4.9.2</yarn-version>