mirror of https://github.com/apache/activemq.git
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
This commit is contained in:
parent
e597017200
commit
fa461c876a
|
@ -77,10 +77,13 @@
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<!-- using it for Jetty's JNDI context to work /w Joram tests. -->
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<artifactId>jetty-all</artifactId>
|
<scope>test</scope>
|
||||||
<classifier>uber</classifier>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
|
<artifactId>jetty-jndi</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -57,9 +57,16 @@
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-all</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<classifier>uber</classifier>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
|
<artifactId>jetty-xml</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
|
<artifactId>jetty-webapp</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
|
|
|
@ -248,9 +248,8 @@
|
||||||
|
|
||||||
<!-- web container -->
|
<!-- web container -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-all</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<classifier>uber</classifier>
|
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -198,9 +198,8 @@
|
||||||
|
|
||||||
<!-- web container -->
|
<!-- web container -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-all</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<classifier>uber</classifier>
|
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
|
@ -82,9 +82,8 @@
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-all</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<classifier>uber</classifier>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -314,9 +314,12 @@
|
||||||
<artifactId>jettison</artifactId>
|
<artifactId>jettison</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty.aggregate</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>jetty-all</artifactId>
|
<artifactId>jetty-server</artifactId>
|
||||||
<classifier>uber</classifier>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
|
<artifactId>jetty-rewrite</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- jetty.orbit artifact will be removed as soon as https://github.com/eclipse/jetty.project/issues/4621 is fixed -->
|
<!-- jetty.orbit artifact will be removed as soon as https://github.com/eclipse/jetty.project/issues/4621 is fixed -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -249,7 +249,21 @@
|
||||||
<includes>
|
<includes>
|
||||||
<include>org.springframework:spring-web</include>
|
<include>org.springframework:spring-web</include>
|
||||||
<include>org.springframework:spring-webmvc</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.eclipse.jetty.orbit:javax.security.auth.message</include>
|
||||||
<include>org.apache.tomcat:tomcat-servlet-api</include>
|
<include>org.apache.tomcat:tomcat-servlet-api</include>
|
||||||
<include>org.apache.tomcat:tomcat-websocket-api</include>
|
<include>org.apache.tomcat:tomcat-websocket-api</include>
|
||||||
|
|
33
pom.xml
33
pom.xml
|
@ -70,7 +70,7 @@
|
||||||
<jackson-version>2.13.1</jackson-version>
|
<jackson-version>2.13.1</jackson-version>
|
||||||
<jasypt-version>1.9.3</jasypt-version>
|
<jasypt-version>1.9.3</jasypt-version>
|
||||||
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-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>
|
<jetty-version>${jetty9-version}</jetty-version>
|
||||||
<jmdns-version>3.4.1</jmdns-version>
|
<jmdns-version>3.4.1</jmdns-version>
|
||||||
<tomcat-api-version>9.0.48</tomcat-api-version>
|
<tomcat-api-version>9.0.48</tomcat-api-version>
|
||||||
|
@ -952,39 +952,14 @@
|
||||||
<version>${xpp3-version}</version>
|
<version>${xpp3-version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
<groupId>org.eclipse.jetty</groupId>
|
||||||
<artifactId>apache-jsp</artifactId>
|
<artifactId>jetty-bom</artifactId>
|
||||||
<version>${jetty-version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>apache-jstl</artifactId>
|
|
||||||
<version>${jetty-version}</version>
|
<version>${jetty-version}</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
</dependency>
|
</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>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
|
|
Loading…
Reference in New Issue