STORM-3061: mqtt-update

taniakhalafbeigi · Jun 27, 2018 · ffb60e0 · ffb60e0
1 parent 95db8fc
commit ffb60e0
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 40 deletions.
diff --git a/examples/storm-jms-examples/pom.xml b/examples/storm-jms-examples/pom.xml
@@ -30,7 +30,7 @@
     <artifactId>storm-jms-examples</artifactId>
 
     <properties>
-        <spring.version>2.5.6</spring.version>
+        <spring.version>5.0.4.RELEASE</spring.version>
     </properties>
     <dependencies>
         <dependency>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-spring</artifactId>
-            <version>3.7</version>
+            <version>4.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.storm</groupId>
@@ -72,18 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>5.4.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>activemq-client</artifactId>
         </dependency>
     </dependencies>
     <build>

diff --git a/examples/storm-mqtt-examples/pom.xml b/examples/storm-mqtt-examples/pom.xml
@@ -43,16 +43,6 @@
       <artifactId>storm-mqtt</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.1</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.storm</groupId>
       <artifactId>flux-core</artifactId>
@@ -66,17 +56,14 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
-      <version>5.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-mqtt</artifactId>
-      <version>5.9.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
-      <version>5.9.0</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/external/storm-jms/pom.xml b/external/storm-jms/pom.xml
@@ -25,12 +25,8 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-
-
     <artifactId>storm-jms</artifactId>
 
-
-
     <developers>
         <developer>
             <id>ptgoetz</id>
@@ -59,11 +55,10 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Active MQ -->
+        <!-- Active MQ for testing JMS-->
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>5.5.1</version>
+            <artifactId>activemq-all</artifactId>
             <scope>test</scope>
             <exclusions>
                 <exclusion>

diff --git a/external/storm-mqtt/pom.xml b/external/storm-mqtt/pom.xml
@@ -29,9 +29,6 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-
-
-
     <repositories>
         <repository>
             <id>bintray</id>
@@ -49,19 +46,16 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-broker</artifactId>
-            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-mqtt</artifactId>
-            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-kahadb-store</artifactId>
-            <version>5.9.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -310,6 +310,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.3</activemq.version>
         <rocketmq.version>4.2.0</rocketmq.version>
 
         <jackson.version>2.9.4</jackson.version>
@@ -1118,6 +1119,51 @@
                 <artifactId>rocksdbjni</artifactId>
                 <version>${rocksdb-version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-client</artifactId>
+                <version>${activemq.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-broker</artifactId>
+                <version>${activemq.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-mqtt</artifactId>
+                <version>${activemq.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-kahadb-store</artifactId>
+                <version>${activemq.version}</version>
+           </dependency>
+           <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-all</artifactId>
+                <version>${activemq.version}</version>
+                <exclusions>
+                   <exclusion>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                   </exclusion>
+                   <exclusion>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
+                   </exclusion>
+                </exclusions>
+           </dependency>
         </dependencies>
     </dependencyManagement>