This is an automated email from the ASF dual-hosted git repository.
bipinprasad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new cc75516e0 [STORM-3867] Bump activemq to 5.16.5 (highest for Jdk8);
undo guava downgrade (#3482)
cc75516e0 is described below
commit cc75516e0cfe9d75d67a0ab93196ece09a24c0b3
Author: Bipin Prasad <[email protected]>
AuthorDate: Thu May 26 07:32:53 2022 -0700
[STORM-3867] Bump activemq to 5.16.5 (highest for Jdk8); undo guava
downgrade (#3482)
Co-authored-by: Bipin Prasad <[email protected]>
---
DEPENDENCY-LICENSES | 10 +++++-----
examples/storm-jms-examples/pom.xml | 1 +
examples/storm-mqtt-examples/pom.xml | 5 -----
external/storm-jms/pom.xml | 1 +
external/storm-mqtt/pom.xml | 5 -----
pom.xml | 2 +-
6 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index b3494a367..bff022ec3 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -13,11 +13,11 @@ List of third-party dependencies grouped by their license
type.
Apache License, Version 2.0
- * ActiveMQ :: Broker (org.apache.activemq:activemq-broker:5.15.15 -
http://activemq.apache.org/activemq-broker)
- * ActiveMQ :: Client (org.apache.activemq:activemq-client:5.15.15 -
http://activemq.apache.org/activemq-client)
- * ActiveMQ :: KahaDB Store
(org.apache.activemq:activemq-kahadb-store:5.15.15 -
http://activemq.apache.org/activemq-kahadb-store)
- * ActiveMQ :: MQTT Protocol (org.apache.activemq:activemq-mqtt:5.15.15
- http://activemq.apache.org/activemq-mqtt)
- * ActiveMQ :: Openwire Legacy Support
(org.apache.activemq:activemq-openwire-legacy:5.15.15 -
http://activemq.apache.org/activemq-openwire-legacy)
+ * ActiveMQ :: Broker (org.apache.activemq:activemq-broker:5.16.5 -
http://activemq.apache.org/activemq-broker)
+ * ActiveMQ :: Client (org.apache.activemq:activemq-client:5.16.5 -
http://activemq.apache.org/activemq-client)
+ * ActiveMQ :: KahaDB Store
(org.apache.activemq:activemq-kahadb-store:5.16.5 -
http://activemq.apache.org/activemq-kahadb-store)
+ * ActiveMQ :: MQTT Protocol (org.apache.activemq:activemq-mqtt:5.16.5
- http://activemq.apache.org/activemq-mqtt)
+ * ActiveMQ :: Openwire Legacy Support
(org.apache.activemq:activemq-openwire-legacy:5.16.5 -
http://activemq.apache.org/activemq-openwire-legacy)
* ActiveMQ Protocol Buffers Implementation and Compiler
(org.apache.activemq.protobuf:activemq-protobuf:1.1 -
http://activemq.apache.org/activemq-protobuf)
* Aether :: API (org.sonatype.aether:aether-api:1.7 -
http://aether.sonatype.org/aether-api/)
* Aether :: Implementation (org.sonatype.aether:aether-impl:1.7 -
http://aether.sonatype.org/aether-impl/)
diff --git a/examples/storm-jms-examples/pom.xml
b/examples/storm-jms-examples/pom.xml
index 8d63e771e..d506e9530 100644
--- a/examples/storm-jms-examples/pom.xml
+++ b/examples/storm-jms-examples/pom.xml
@@ -72,6 +72,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
+ <version>${activemq.version}</version>
</dependency>
</dependencies>
<build>
diff --git a/examples/storm-mqtt-examples/pom.xml
b/examples/storm-mqtt-examples/pom.xml
index e8a7a6082..f16261eb2 100644
--- a/examples/storm-mqtt-examples/pom.xml
+++ b/examples/storm-mqtt-examples/pom.xml
@@ -30,11 +30,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <!-- Required downgrade by activemq-broker 5.15.3 -->
- <guava.version>16.0.1</guava.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.storm</groupId>
diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml
index dfcf39b51..da225bc34 100644
--- a/external/storm-jms/pom.xml
+++ b/external/storm-jms/pom.xml
@@ -52,6 +52,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
+ <version>${activemq.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
diff --git a/external/storm-mqtt/pom.xml b/external/storm-mqtt/pom.xml
index e6dd62769..ca0804725 100644
--- a/external/storm-mqtt/pom.xml
+++ b/external/storm-mqtt/pom.xml
@@ -29,11 +29,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <!-- Required downgrade by activemq-broker 5.15.3 -->
- <guava.version>16.0.1</guava.version>
- </properties>
-
<repositories>
<repository>
<id>bintray</id>
diff --git a/pom.xml b/pom.xml
index 084666c2f..7693b3514 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,7 +335,7 @@
<solr.version>5.2.1</solr.version>
<jpmml.version>1.0.22</jpmml.version>
<jedis.version>2.9.0</jedis.version>
- <activemq.version>5.15.15</activemq.version>
+ <activemq.version>5.16.5</activemq.version>
<rocketmq.version>4.2.0</rocketmq.version>
<jackson.version>2.10.5</jackson.version>
