Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #484 from jbonofre/AMQ-7388 

[AMQ-7388] Upgrade to Jetty 9.4.27.20200227
This commit is contained in:
Jean-Baptiste Onofré 2020-03-01 16:51:55 +01:00 committed by GitHub
parent 34d4bb8c82 0d5b53529a
commit c92be4c8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assembly/pom.xml
View File

@ -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>

1
assembly/src/main/descriptors/common-bin.xml
View File

@ -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>

2
pom.xml
View File

@ -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>