You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2022/03/02 15:25:08 UTC
[activemq] branch activemq-5.16.x updated: Use Jetty atomic jar files instead of jetty-all (deprecated) and update to Jetty 9.4.45.v20220203 (#784)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
new b9d24e5 Use Jetty atomic jar files instead of jetty-all (deprecated) and update to Jetty 9.4.45.v20220203 (#784)
b9d24e5 is described below
commit b9d24e586d8da9cd47c4364efefe311eb07eef37
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Mar 1 15:33:50 2022 +0100
Use Jetty atomic jar files instead of jetty-all (deprecated) and update to Jetty 9.4.45.v20220203 (#784)
* [AMQ-7358] Use jetty atomic jar files instead of jetty-all uber jar
(deprecated according to Jetty team)
[AMQ-8461] Upgrade to Jetty 9.4.45.v20220203
(cherry picked from commit fa461c876abdced9906a865a9a47a819febb2fb9)
---
activemq-amqp/pom.xml | 11 ++++++----
activemq-http/pom.xml | 13 ++++++++---
activemq-unit-tests/pom.xml | 11 ++++++----
activemq-web-console/pom.xml | 5 ++---
activemq-web-demo/pom.xml | 5 ++---
activemq-web/pom.xml | 5 ++---
assembly/pom.xml | 9 +++++---
assembly/src/main/descriptors/common-bin.xml | 16 +++++++++++++-
pom.xml | 33 ++++------------------------
9 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index 554a42f..f24f8eb 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -77,10 +77,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <!-- using it for Jetty's JNDI context to work /w Joram tests. -->
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index b1806b9..fda9cc7 100644
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -57,9 +57,16 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index cbaa3ec..3f41f58 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -257,10 +257,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <!-- using it for Jetty's JNDI context to work /w Joram tests. -->
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jndi</artifactId>
<scope>test</scope>
</dependency>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 350fd97..e66c265 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -246,9 +246,8 @@
<!-- web container -->
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index b406714..bec478e 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -192,9 +192,8 @@
<!-- web container -->
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 131bc95..2234ab4 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -78,9 +78,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index b18e606..df71443 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -318,9 +318,12 @@
<artifactId>jettison</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <classifier>uber</classifier>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-rewrite</artifactId>
</dependency>
<!-- jetty.orbit artifact will be removed as soon as https://github.com/eclipse/jetty.project/issues/4621 is fixed -->
<dependency>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 9651d1d..a591442 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -268,7 +268,21 @@
<includes>
<include>org.springframework:spring-web</include>
<include>org.springframework:spring-webmvc</include>
- <include>org.eclipse.jetty.aggregate:jetty-all</include>
+ <include>org.eclipse.jetty:jetty-annotations</include>
+ <include>org.eclipse.jetty:jetty-server</include>
+ <include>org.eclipse.jetty:jetty-xml</include>
+ <include>org.eclipse.jetty:jetty-webapp</include>
+ <include>org.eclipse.jetty:jetty-util</include>
+ <include>org.eclipse.jetty:jetty-http</include>
+ <include>org.eclipse.jetty:jetty-io</include>
+ <include>org.eclipse.jetty:jetty-plus</include>
+ <include>org.eclipse.jetty:jetty-servlet</include>
+ <include>org.eclipse.jetty:jetty-security</include>
+ <include>org.eclipse.jetty:jetty-rewrite</include>
+ <include>org.eclipse.jetty.websocket:websocket-api</include>
+ <include>org.eclipse.jetty.websocket:websocket-common</include>
+ <include>org.eclipse.jetty.websocket:websocket-server</include>
+ <include>org.eclipse.jetty.websocket:websocket-servlet</include>
<include>org.eclipse.jetty.orbit:javax.security.auth.message</include>
<include>org.apache.tomcat:tomcat-servlet-api</include>
<include>org.apache.tomcat:tomcat-websocket-api</include>
diff --git a/pom.xml b/pom.xml
index d91009d..97d8691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<jackson-version>2.13.1</jackson-version>
<jasypt-version>1.9.3</jasypt-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
- <jetty9-version>9.4.43.v20210629</jetty9-version>
+ <jetty9-version>9.4.45.v20220203</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jmdns-version>3.4.1</jmdns-version>
<tomcat-api-version>9.0.48</tomcat-api-version>
@@ -926,40 +926,15 @@
<version>${xpp3-version}</version>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>apache-jsp</artifactId>
- <version>${jetty-version}</version>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>apache-jstl</artifactId>
+ <artifactId>jetty-bom</artifactId>
<version>${jetty-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all</artifactId>
- <version>${jetty-version}</version>
- <classifier>uber</classifier>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.websocket</groupId>
- <artifactId>javax.websocket-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty-version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient-version}</version>