Merge pull request #685 from mattrpav/AMQ-8329
[AMQ-8329] Update Tomcat to 9.0.48
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index bd19355..8357ad1 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -86,14 +86,6 @@
<artifactId>howl-logger</artifactId>
</exclusion>
<exclusion>
- <groupId>activemq</groupId>
- <artifactId>smackx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>activemq</groupId>
- <artifactId>smack</artifactId>
- </exclusion>
- <exclusion>
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</exclusion>
diff --git a/activemq-web-console/src/main/webapp/META-INF/LICENSE b/activemq-web-console/src/main/webapp/META-INF/LICENSE
index 8731741..b0a0ba8 100644
--- a/activemq-web-console/src/main/webapp/META-INF/LICENSE
+++ b/activemq-web-console/src/main/webapp/META-INF/LICENSE
@@ -965,9 +965,6 @@
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
=========================================================================
-== Smackx is under the Apache License v 2.0 ==
-=========================================================================
-=========================================================================
== Spring is under the Apache License v 2.0 ==
=========================================================================
=========================================================================
diff --git a/activemq-web-console/src/main/webapp/META-INF/NOTICE b/activemq-web-console/src/main/webapp/META-INF/NOTICE
index b91150c..80335fd 100644
--- a/activemq-web-console/src/main/webapp/META-INF/NOTICE
+++ b/activemq-web-console/src/main/webapp/META-INF/NOTICE
@@ -88,13 +88,6 @@
OpenSymphony Group (http://www.opensymphony.com/).
=========================================================================
-== Smackx Notice (not from Jive Software) ==
-=========================================================================
-
-This product includes software developed by JiveSoftware
-(http://www.igniterealtime.org/).
-
-=========================================================================
== Woodstox Notice (http://woodstox.codehaus.org) ==
=========================================================================
This product currently only contains code developed by authors
diff --git a/pom.xml b/pom.xml
index 758beed..c147a4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,10 @@
<commons-collections-version>3.2.2</commons-collections-version>
<commons-daemon-version>1.2.4</commons-daemon-version>
<commons-dbcp2-version>2.8.0</commons-dbcp2-version>
- <commons-io-version>2.10.0</commons-io-version>
+ <commons-io-version>2.11.0</commons-io-version>
<commons-lang-version>3.12.0</commons-lang-version>
<commons-logging-version>1.2</commons-logging-version>
- <commons-pool2-version>2.9.0</commons-pool2-version>
+ <commons-pool2-version>2.10.0</commons-pool2-version>
<commons-primitives-version>1.0</commons-primitives-version>
<commons-net-version>3.8.0</commons-net-version>
<directory-version>2.0.0.AM25</directory-version>
@@ -65,10 +65,10 @@
<httpclient-version>4.5.13</httpclient-version>
<httpcore-version>4.4.14</httpcore-version>
<insight-version>1.2.0.Beta4</insight-version>
- <jackson-version>2.12.3</jackson-version>
+ <jackson-version>2.12.4</jackson-version>
<jasypt-version>1.9.3</jasypt-version>
<jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
- <jetty9-version>9.4.42.v20210604</jetty9-version>
+ <jetty9-version>9.4.43.v20210629</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jmdns-version>3.4.1</jmdns-version>
<tomcat-api-version>9.0.48</tomcat-api-version>
@@ -95,11 +95,11 @@
<qpid-jms-proton-version>0.33.8</qpid-jms-proton-version>
<netty-all-version>4.1.63.Final</netty-all-version>
<regexp-version>1.3</regexp-version>
- <rome-version>1.15.0</rome-version>
+ <rome-version>1.16.0</rome-version>
<shiro-version>1.7.1</shiro-version>
- <slf4j-version>1.7.30</slf4j-version>
+ <slf4j-version>1.7.31</slf4j-version>
<snappy-version>1.1.2</snappy-version>
- <spring-version>5.3.7</spring-version>
+ <spring-version>5.3.9</spring-version>
<taglibs-version>1.2.5</taglibs-version>
<velocity-version>2.3</velocity-version>
<xalan-version>2.7.2</xalan-version>
@@ -128,6 +128,7 @@
<maven-assembly-plugin-version>3.3.0</maven-assembly-plugin-version>
<maven-release-plugin-version>2.4.1</maven-release-plugin-version>
<maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
+ <maven-enforcer-plugin-version>3.0.0-M3</maven-enforcer-plugin-version>
<maven-war-plugin-version>3.2.2</maven-war-plugin-version>
<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
<maven-jar-plugin-version>3.1.0</maven-jar-plugin-version>
@@ -817,19 +818,6 @@
<version>${commons-pool2-version}</version>
</dependency>
- <!-- Optional Jabber support -->
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>smack</artifactId>
- <version>1.5.0</version>
- </dependency>
-
- <dependency>
- <groupId>activemq</groupId>
- <artifactId>smackx</artifactId>
- <version>1.5.0</version>
- </dependency>
-
<!-- To use XPath using JAXP 1.3 (std in Java 5) -->
<dependency>
<groupId>activesoap</groupId>
@@ -1071,6 +1059,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin-version}</version>
<configuration>
@@ -1287,6 +1280,25 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>3.0.5</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
