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

This closes #3483

This commit is contained in:
Justin Bertram 2021-03-09 12:18:27 -06:00
parent af9e50d1db 6f0cb8bfc5
commit 1d2df0ecb2
6 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,8 @@
<!-- servlet API is provided by the container --> <!-- servlet API is provided by the container -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>servlet-api</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -37,9 +37,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>servlet-api</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${servlet-api-version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -80,8 +80,8 @@
<!-- servlet API is provided by the container --> <!-- servlet API is provided by the container -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>servlet-api</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

8
artemis-hawtio/pom.xml
View File

@ -45,7 +45,7 @@
<maven-plugin-version>3.3</maven-plugin-version> <maven-plugin-version>3.3</maven-plugin-version>
<maven-source-plugin-version>2.1.2</maven-source-plugin-version> <maven-source-plugin-version>2.1.2</maven-source-plugin-version>
<maven-resources-plugin-version>2.6</maven-resources-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 --> <!-- use slf4j-api 1.6.x to be easy compatible with older Karaf/Camel releases -->
<slf4j-api-version>1.6.6</slf4j-api-version> <slf4j-api-version>1.6.6</slf4j-api-version>
@ -67,9 +67,9 @@
<!-- servlet API is provided by the container --> <!-- servlet API is provided by the container -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>servlet-api</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${servlet-api-version}</version> <version>${geronimo.servlet.3.0.spec.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

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

@ -36,7 +36,7 @@ under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<projectBaseUri>${project.baseUri}</projectBaseUri> <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> </properties>
<dependencies> <dependencies>
@ -66,9 +66,9 @@ under the License.
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>servlet-api</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>${servlet-api.version}</version> <version>${geronimo.servlet.3.0.spec.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
pom.xml
View File

@ -98,7 +98,7 @@
<fuse.mqtt.client.version>1.16</fuse.mqtt.client.version> <fuse.mqtt.client.version>1.16</fuse.mqtt.client.version>
<guava.version>30.1-jre</guava.version> <guava.version>30.1-jre</guava.version>
<jboss.logging.version>3.4.0.Final</jboss.logging.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> <jgroups.version>3.6.13.Final</jgroups.version>
<maven.assembly.plugin.version>2.4</maven.assembly.plugin.version> <maven.assembly.plugin.version>2.4</maven.assembly.plugin.version>
<mockito.version>3.3.3</mockito.version> <mockito.version>3.3.3</mockito.version>