You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cs...@apache.org on 2026/07/15 22:48:30 UTC
(activemq) 03/05: [Jetty 12] Use proper jetty-ee9-maven-plugin
This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 92efb318cbfd2494bc69a18077ee138370dd6c59
Author: Grzegorz Grzybek <gr...@gmail.com>
AuthorDate: Wed May 14 13:30:23 2025 +0200
[Jetty 12] Use proper jetty-ee9-maven-plugin
---
activemq-web-console/pom.xml | 33 ++++++++++++++++++---------------
activemq-web-demo/pom.xml | 17 ++++++++---------
pom.xml | 4 ++--
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 04f5c2f5a2..96da33def0 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -52,20 +52,18 @@
</configuration>
</plugin>
<plugin>
- <groupId>${jetty.maven.groupid}</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
+ <groupId>org.eclipse.jetty.ee9</groupId>
+ <artifactId>jetty-ee9-maven-plugin</artifactId>
<version>${jetty-version}</version>
<configuration>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.ServerConnector">
- <port>${jetty.port}</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
-
- <webAppConfig>
+ <httpConnector>
+ <port>${jetty.port}</port>
+ <idleTimeout>60000</idleTimeout>
+ </httpConnector>
+ <scan>10</scan>
+ <webApp>
<contextPath>/</contextPath>
- </webAppConfig>
+ </webApp>
<systemProperties>
<!-- enable easy connection to JConsole -->
@@ -100,7 +98,6 @@
</systemProperty>
-->
</systemProperties>
- <scanIntervalSeconds>10</scanIntervalSeconds>
</configuration>
</plugin>
<plugin>
@@ -288,18 +285,24 @@
<scope>provided</scope>
</dependency>
- <!-- Tag Libs -->
+ <!-- Tag Libs -->
+ <!--
+ These two should be available either in the WAR itself or from the container. We can't configure
+ jetty-ee9-maven-plugin with <useProvidedScope>true</useProvidedScope> because we don't need ALL provided
+ dependencies. But we shouldn't build the WAR with these two included either, because _full_ web container
+ may provide own taglibs... Not me to decide ;)
+ -->
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
<version>3.0.2</version>
- <scope>provided</scope>
+<!-- <scope>provided</scope>-->
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
<version>3.0.1</version>
- <scope>provided</scope>
+<!-- <scope>provided</scope>-->
</dependency>
<!--
<dependency>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 19769639dc..d8c59dc766 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -33,16 +33,15 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
+ <groupId>org.eclipse.jetty.ee9</groupId>
+ <artifactId>jetty-ee9-maven-plugin</artifactId>
<configuration>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.ServerConnector">
- <port>${jetty.port}</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- <scanIntervalSeconds>10</scanIntervalSeconds>
+ <httpConnector>
+ <port>${jetty.port}</port>
+ <idleTimeout>60000</idleTimeout>
+ </httpConnector>
+ <scan>10</scan>
+ <useTestScope>true</useTestScope>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index 56414e2d6d..5ec8535c0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1024,8 +1024,8 @@
<version>${javacc-maven-plugin-version}</version>
</plugin>
<plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
+ <groupId>org.eclipse.jetty.ee9</groupId>
+ <artifactId>jetty-ee9-maven-plugin</artifactId>
<version>${jetty-version}</version>
</plugin>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact