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

ARTEMIS-4386: consolidate the used servlet api deps on the jetty one already being shipped

This commit is contained in:
Robbie Gemmell 2023-08-04 11:57:01 +01:00
parent 39a13aa07c
commit 116274e9ca
7 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-hawtio/activemq-branding/pom.xml
View File

@ -82,8 +82,8 @@
<!-- servlet API is provided by the container -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>

4
artemis-hawtio/artemis-console/pom.xml
View File

@ -36,8 +36,8 @@
<dependencies>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>

4
artemis-hawtio/artemis-plugin/pom.xml
View File

@ -76,8 +76,8 @@
<!-- servlet API is provided by the container -->
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>

4
artemis-server/pom.xml
View File

@ -290,6 +290,10 @@
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

4
artemis-web/pom.xml
View File

@ -65,8 +65,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>

4
examples/features/sub-modules/tomcat/pom.xml
View File

@ -63,8 +63,8 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

23
pom.xml
View File

@ -101,7 +101,7 @@
<hawtio.version>2.15.0</hawtio.version>
<jsr305.version>3.0.2</jsr305.version>
<jetty.version>10.0.15</jetty.version>
<tomcat.servlet-api.version>8.5.78</tomcat.servlet-api.version>
<jetty-servlet-api.version>4.0.6</jetty-servlet-api.version>
<jgroups.version>5.2.16.Final</jgroups.version>
<errorprone.version>2.20.0</errorprone.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
@ -783,30 +783,19 @@
</dependency>
<!-- ## Jetty web Dependencies ##-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
</exclusions>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>${jetty.version}</version>
<type>pom</type>
<scope>import</scope>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
<!-- License: (Joint): Apache 2.0 or EPL 2.0 -->
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
<version>${tomcat.servlet-api.version}</version>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<version>${jetty-servlet-api.version}</version>
<!-- License: (Joint): Apache 2.0 or EPL 2.0 -->
</dependency>
<!-- ## End Jetty Wed Dependencies ## -->