You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2022/03/04 02:59:19 UTC
[activemq-artemis] branch main updated: ARTEMIS-3695: use specific jetty deps instead of uber jar, rationalise servlet api deps
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic 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 dcbd4b0 ARTEMIS-3695: use specific jetty deps instead of uber jar, rationalise servlet api deps
dcbd4b0 is described below
commit dcbd4b059aebc75b7bae7e2bfe990e4bbc2cab02
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Mar 3 13:27:04 2022 +0000
ARTEMIS-3695: use specific jetty deps instead of uber jar, rationalise servlet api deps
Partially reverts c5f94f340d721600c4b67dc003eace023b046211
---
artemis-distribution/src/main/assembly/dep.xml | 14 -------------
artemis-hawtio/activemq-branding/pom.xml | 4 ++--
artemis-hawtio/artemis-console/pom.xml | 4 ++--
artemis-hawtio/artemis-plugin/pom.xml | 4 ++--
artemis-hawtio/pom.xml | 10 ---------
artemis-rest/pom.xml | 16 +++++++++++----
artemis-web/pom.xml | 18 +++++++++++++----
examples/features/sub-modules/tomcat/pom.xml | 8 ++------
pom.xml | 28 +++++++++++++++++++++-----
tests/integration-tests/pom.xml | 10 +++++----
10 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index 9f15317..8d1c4f9 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -32,25 +32,11 @@
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
- <dependencySet>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>org.eclipse.jetty.aggregate:jetty-all:jar:uber</include>
- </includes>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <useProjectArtifact>false</useProjectArtifact>
- </dependencySet>
<dependencySet>
<directoryMode>0755</directoryMode>
<fileMode>0644</fileMode>
<excludes>
- <!-- Handled above for now to avoid it bringing in duplicative transitive deps -->
- <!-- Should not be using this according to the jetty folks: https://www.eclipse.org//lists/jetty-users/msg06029.html -->
- <exclude>org.eclipse.jetty.aggregate:jetty-all:jar:uber</exclude>
-
<!-- Handled above -->
<exclude>org.apache.activemq:artemis-boot</exclude>
diff --git a/artemis-hawtio/activemq-branding/pom.xml b/artemis-hawtio/activemq-branding/pom.xml
index cd1068c..f9cd775 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.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/artemis-console/pom.xml b/artemis-hawtio/artemis-console/pom.xml
index 33fa2e7..f80c4c3 100644
--- a/artemis-hawtio/artemis-console/pom.xml
+++ b/artemis-hawtio/artemis-console/pom.xml
@@ -36,8 +36,8 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/artemis-plugin/pom.xml b/artemis-hawtio/artemis-plugin/pom.xml
index cd4b2cd..15d2266 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.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
index 4b98182..814b54e 100644
--- a/artemis-hawtio/pom.xml
+++ b/artemis-hawtio/pom.xml
@@ -33,8 +33,6 @@
<properties>
<activemq.basedir>${project.basedir}/..</activemq.basedir>
-
- <geronimo.servlet.3.0.spec.version>1.0</geronimo.servlet.3.0.spec.version>
</properties>
<dependencyManagement>
@@ -48,14 +46,6 @@
<version>${hawtio.version}</version>
</dependency>
- <!-- servlet API is provided by the container -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo.servlet.3.0.spec.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/artemis-rest/pom.xml b/artemis-rest/pom.xml
index 1bff2b1..f49f662 100644
--- a/artemis-rest/pom.xml
+++ b/artemis-rest/pom.xml
@@ -57,10 +57,12 @@
<artifactId>jboss-logmanager</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <type>jar</type>
- <classifier>uber</classifier>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
@@ -94,6 +96,12 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>tjws</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/artemis-web/pom.xml b/artemis-web/pom.xml
index af6bec6..5c021b2 100644
--- a/artemis-web/pom.xml
+++ b/artemis-web/pom.xml
@@ -102,10 +102,20 @@
<artifactId>netty-handler</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <type>jar</type>
- <classifier>uber</classifier>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/features/sub-modules/tomcat/pom.xml b/examples/features/sub-modules/tomcat/pom.xml
index 0926156..b3e196f 100644
--- a/examples/features/sub-modules/tomcat/pom.xml
+++ b/examples/features/sub-modules/tomcat/pom.xml
@@ -35,8 +35,6 @@ under the License.
<activemq.basedir>${project.basedir}/../../../..</activemq.basedir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<projectBaseUri>${project.baseUri}</projectBaseUri>
-
- <geronimo.servlet.3.0.spec.version>1.0</geronimo.servlet.3.0.spec.version>
</properties>
<dependencies>
@@ -58,7 +56,6 @@ under the License.
<version>${spring.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-jms-client</artifactId>
@@ -66,9 +63,8 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <version>${geronimo.servlet.3.0.spec.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index f4e6385..8d26cb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
<jsr305.version>3.0.2</jsr305.version>
<jboss.logging.version>3.4.2.Final</jboss.logging.version>
<jetty.version>9.4.44.v20210927</jetty.version>
+ <tomcat.servlet-api.version>8.5.76</tomcat.servlet-api.version>
<jgroups.version>5.2.0.Final</jgroups.version>
<errorprone.version>2.10.0</errorprone.version>
<maven.enforcer.plugin.version>3.0.0-M3</maven.enforcer.plugin.version>
@@ -771,13 +772,30 @@
<!-- ## Jetty web Dependencies ##-->
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
- <type>jar</type>
- <classifier>uber</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
- </dependency>
+ </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 -->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ <version>${tomcat.servlet-api.version}</version>
+ </dependency>
<!-- ## End Jetty Wed Dependencies ## -->
<!-- for URL reflection. Using Populate on URI Factory at activemq-commons -->
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 19d1793..8c4b5a2 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -362,10 +362,12 @@
<!-- rest test -->
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <type>jar</type>
- <classifier>uber</classifier>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>