This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 116274e9ca ARTEMIS-4386: consolidate the used servlet api deps on the
jetty one already being shipped
116274e9ca is described below
commit 116274e9ca0f13c34715d5bb70faf73500536321
Author: Robbie Gemmell <[email protected]>
AuthorDate: Fri Aug 4 11:57:01 2023 +0100
ARTEMIS-4386: consolidate the used servlet api deps on the jetty one
already being shipped
---
artemis-hawtio/activemq-branding/pom.xml | 4 ++--
artemis-hawtio/artemis-console/pom.xml | 4 ++--
artemis-hawtio/artemis-plugin/pom.xml | 4 ++--
artemis-server/pom.xml | 4 ++++
artemis-web/pom.xml | 4 ++--
examples/features/sub-modules/tomcat/pom.xml | 4 ++--
pom.xml | 23 ++++++-----------------
7 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/artemis-hawtio/activemq-branding/pom.xml
b/artemis-hawtio/activemq-branding/pom.xml
index 6f9e9708b5..8319997ad5 100644
--- a/artemis-hawtio/activemq-branding/pom.xml
+++ b/artemis-hawtio/activemq-branding/pom.xml
@@ -82,8 +82,8 @@
<!-- servlet API is provided by the container -->
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/artemis-console/pom.xml
b/artemis-hawtio/artemis-console/pom.xml
index 2ca891b320..840df26db4 100644
--- a/artemis-hawtio/artemis-console/pom.xml
+++ b/artemis-hawtio/artemis-console/pom.xml
@@ -36,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/artemis-plugin/pom.xml
b/artemis-hawtio/artemis-plugin/pom.xml
index de194dba3d..a116970584 100644
--- a/artemis-hawtio/artemis-plugin/pom.xml
+++ b/artemis-hawtio/artemis-plugin/pom.xml
@@ -76,8 +76,8 @@
<!-- servlet API is provided by the container -->
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 62eef8ca6c..0c9bdd88c8 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -290,6 +290,10 @@
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml
index c473e56a4a..a6af7229d6 100644
--- a/artemis-web/pom.xml
+++ b/artemis-web/pom.xml
@@ -65,8 +65,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/examples/features/sub-modules/tomcat/pom.xml
b/examples/features/sub-modules/tomcat/pom.xml
index 231a9179fa..b3cb6038ca 100644
--- a/examples/features/sub-modules/tomcat/pom.xml
+++ b/examples/features/sub-modules/tomcat/pom.xml
@@ -63,8 +63,8 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 668565773e..8d94a0ce09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
<hawtio.version>2.15.0</hawtio.version>
<jsr305.version>3.0.2</jsr305.version>
<jetty.version>10.0.15</jetty.version>
- <tomcat.servlet-api.version>8.5.78</tomcat.servlet-api.version>
+ <jetty-servlet-api.version>4.0.6</jetty-servlet-api.version>
<jgroups.version>5.2.16.Final</jgroups.version>
<errorprone.version>2.20.0</errorprone.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
@@ -783,30 +783,19 @@
</dependency>
<!-- ## Jetty web Dependencies ##-->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- </exclusions>
- <!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>${jetty.version}</version>
<type>pom</type>
<scope>import</scope>
- <!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
+ <!-- License: (Joint): Apache 2.0 or EPL 2.0 -->
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat.servlet-api.version}</version>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-servlet-api</artifactId>
+ <version>${jetty-servlet-api.version}</version>
+ <!-- License: (Joint): Apache 2.0 or EPL 2.0 -->
</dependency>
<!-- ## End Jetty Wed Dependencies ## -->
