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 2020/03/01 15:52:03 UTC
[activemq] branch master updated: [AMQ-7388] Upgrade to Jetty
9.4.27.20200227
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new 0d5b535 [AMQ-7388] Upgrade to Jetty 9.4.27.20200227
new c92be4c Merge pull request #484 from jbonofre/AMQ-7388
0d5b535 is described below
commit 0d5b53529ad420260d770732a174981f4366ec73
Author: jbonofre <jb...@apache.org>
AuthorDate: Wed Feb 19 08:09:58 2020 +0100
[AMQ-7388] Upgrade to Jetty 9.4.27.20200227
---
assembly/pom.xml | 6 ++++++
assembly/src/main/descriptors/common-bin.xml | 1 +
pom.xml | 2 +-
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3a68b37..f8326d7 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -336,6 +336,12 @@
<artifactId>jetty-all</artifactId>
<classifier>uber</classifier>
</dependency>
+ <!-- jetty.orbit artifact will be removed as soon as https://github.com/eclipse/jetty.project/issues/4621 is fixed -->
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.security.auth.message</artifactId>
+ <version>1.0.0.v201108011116</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 9a9400c..b3a15b7 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -263,6 +263,7 @@
<include>org.springframework:spring-web</include>
<include>org.springframework:spring-webmvc</include>
<include>org.eclipse.jetty.aggregate:jetty-all</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 0876aa7..3b7cf74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
<jackson-databind-version>2.9.10.2</jackson-databind-version>
<jasypt-version>1.9.3</jasypt-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
- <jetty9-version>9.4.22.v20191022</jetty9-version>
+ <jetty9-version>9.4.27.v20200227</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jmdns-version>3.4.1</jmdns-version>
<tomcat-api-version>9.0.31</tomcat-api-version>