From 2042dba2cf604ae314df342060a76de22f827ec2 Mon Sep 17 00:00:00 2001
From: FengLiang <feng.liang1@zte.com.cn>
Date: Mon, 20 Feb 2017 09:51:10 +0800
Subject: Modify exception

private static IterableProvider<MQConfig> mqConfigProvider; Remove static

Issue-ID:HOLMES-37
Change-Id: I31d962050544522cbb169dde8fe69b1491713126
Signed-off-by: FengLiang <feng.liang1@zte.com.cn>
---
 holmes-actions/pom.xml                               | 20 +++++++++++++++-----
 .../org/openo/holmes/common/producer/MQProducer.java |  2 +-
 pom.xml                                              | 13 ++-----------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 3a3f827..0c891c6 100644
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -20,13 +20,23 @@
     <packaging>jar</packaging>
     <artifactId>holmes-actions</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-client</artifactId>
+            <artifactId>activemq-all</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openo.common-services.common-utilities</groupId>
diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java b/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
index a9a869c..826a565 100644
--- a/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
@@ -39,7 +39,7 @@ import org.openo.holmes.common.constant.AlarmConst;
 public class MQProducer {
 
     @Inject
-    private static IterableProvider<MQConfig> mqConfigProvider;
+    private IterableProvider<MQConfig> mqConfigProvider;
     private ConnectionFactory connectionFactory;
 
     @PostConstruct
diff --git a/pom.xml b/pom.xml
index f0720ab..aad8980 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,31 +116,22 @@
                 <version>4.8.2</version>
                 <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-core</artifactId>
                 <version>1.3</version>
                 <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.powermock</groupId>
                 <artifactId>powermock-module-junit4</artifactId>
                 <version>1.6.4</version>
                 <scope>test</scope>
             </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jms_1.1_spec</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-client</artifactId>
-                <version>5.13.4</version>
+                <artifactId>activemq-all</artifactId>
+                <version>5.8.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
-- 
cgit 1.2.3-korg