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 2021/03/09 18:36:26 UTC
[activemq-artemis] branch master updated: ARTEMIS-3169 Update jetty
to 9.4.38 and servlet-api to 3.0
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 6f0cb8b ARTEMIS-3169 Update jetty to 9.4.38 and servlet-api to 3.0
new 1d2df0e This closes #3483
6f0cb8b is described below
commit 6f0cb8bfc52c324d8f73da148cf325daf7b4af2b
Author: Domenico Francesco Bruscino <br...@apache.org>
AuthorDate: Tue Mar 9 12:51:07 2021 +0100
ARTEMIS-3169 Update jetty to 9.4.38 and servlet-api to 3.0
---
artemis-hawtio/activemq-branding/pom.xml | 4 ++--
artemis-hawtio/artemis-console/pom.xml | 5 ++---
artemis-hawtio/artemis-plugin/pom.xml | 4 ++--
artemis-hawtio/pom.xml | 8 ++++----
examples/features/sub-modules/tomcat/pom.xml | 8 ++++----
pom.xml | 2 +-
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/artemis-hawtio/activemq-branding/pom.xml b/artemis-hawtio/activemq-branding/pom.xml
index 242e646..b20f634 100644
--- a/artemis-hawtio/activemq-branding/pom.xml
+++ b/artemis-hawtio/activemq-branding/pom.xml
@@ -76,8 +76,8 @@
<!-- servlet API is provided by the container -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/artemis-console/pom.xml b/artemis-hawtio/artemis-console/pom.xml
index 184a283..be94d36 100644
--- a/artemis-hawtio/artemis-console/pom.xml
+++ b/artemis-hawtio/artemis-console/pom.xml
@@ -37,9 +37,8 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api-version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/artemis-plugin/pom.xml b/artemis-hawtio/artemis-plugin/pom.xml
index 919246e..cdb7ce4 100644
--- a/artemis-hawtio/artemis-plugin/pom.xml
+++ b/artemis-hawtio/artemis-plugin/pom.xml
@@ -80,8 +80,8 @@
<!-- servlet API is provided by the container -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/artemis-hawtio/pom.xml b/artemis-hawtio/pom.xml
index ee53280..3e6396b 100644
--- a/artemis-hawtio/pom.xml
+++ b/artemis-hawtio/pom.xml
@@ -45,7 +45,7 @@
<maven-plugin-version>3.3</maven-plugin-version>
<maven-source-plugin-version>2.1.2</maven-source-plugin-version>
<maven-resources-plugin-version>2.6</maven-resources-plugin-version>
- <servlet-api-version>2.5</servlet-api-version>
+ <geronimo.servlet.3.0.spec.version>1.0</geronimo.servlet.3.0.spec.version>
<!-- use slf4j-api 1.6.x to be easy compatible with older Karaf/Camel releases -->
<slf4j-api-version>1.6.6</slf4j-api-version>
@@ -67,9 +67,9 @@
<!-- servlet API is provided by the container -->
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api-version}</version>
+ <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>
diff --git a/examples/features/sub-modules/tomcat/pom.xml b/examples/features/sub-modules/tomcat/pom.xml
index 9ceab2d..f024395 100644
--- a/examples/features/sub-modules/tomcat/pom.xml
+++ b/examples/features/sub-modules/tomcat/pom.xml
@@ -36,7 +36,7 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<projectBaseUri>${project.baseUri}</projectBaseUri>
- <servlet-api.version>3.0-alpha-1</servlet-api.version>
+ <geronimo.servlet.3.0.spec.version>1.0</geronimo.servlet.3.0.spec.version>
</properties>
<dependencies>
@@ -66,9 +66,9 @@ under the License.
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
+ <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>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 84be081..c48f8ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
<fuse.mqtt.client.version>1.16</fuse.mqtt.client.version>
<guava.version>30.1-jre</guava.version>
<jboss.logging.version>3.4.0.Final</jboss.logging.version>
- <jetty.version>9.4.35.v20201120</jetty.version>
+ <jetty.version>9.4.38.v20210224</jetty.version>
<jgroups.version>3.6.13.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>3.3.3</mockito.version>