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>

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 3a3f827..0c891c6 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -20,13 +20,23 @@
     <packaging>jar</packaging>\r
     <artifactId>holmes-actions</artifactId>\r
     <dependencies>\r
-        <dependency>\r
-            <groupId>org.apache.geronimo.specs</groupId>\r
-            <artifactId>geronimo-jms_1.1_spec</artifactId>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.apache.activemq</groupId>\r
-            <artifactId>activemq-client</artifactId>\r
+            <artifactId>activemq-all</artifactId>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <artifactId>log4j</artifactId>\r
+                    <groupId>log4j</groupId>\r
+                </exclusion>\r
+                <exclusion>\r
+                    <groupId>org.slf4j</groupId>\r
+                    <artifactId>slf4j-log4j12</artifactId>\r
+                </exclusion>\r
+                <exclusion>\r
+                    <groupId>org.slf4j</groupId>\r
+                    <artifactId>slf4j-api</artifactId>\r
+                </exclusion>\r
+            </exclusions>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.openo.common-services.common-utilities</groupId>\r

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 (file)
--- 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 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -116,31 +116,22 @@
                 <version>4.8.2</version>\r
                 <scope>test</scope>\r
             </dependency>\r
-\r
             <dependency>\r
                 <groupId>org.hamcrest</groupId>\r
                 <artifactId>hamcrest-core</artifactId>\r
                 <version>1.3</version>\r
                 <scope>test</scope>\r
             </dependency>\r
-\r
             <dependency>\r
                 <groupId>org.powermock</groupId>\r
                 <artifactId>powermock-module-junit4</artifactId>\r
                 <version>1.6.4</version>\r
                 <scope>test</scope>\r
             </dependency>\r
-\r
-            <dependency>\r
-                <groupId>org.apache.geronimo.specs</groupId>\r
-                <artifactId>geronimo-jms_1.1_spec</artifactId>\r
-                <version>1.1.1</version>\r
-            </dependency>\r
-\r
             <dependency>\r
                 <groupId>org.apache.activemq</groupId>\r
-                <artifactId>activemq-client</artifactId>\r
-                <version>5.13.4</version>\r
+                <artifactId>activemq-all</artifactId>\r
+                <version>5.8.0</version>\r
             </dependency>\r
         </dependencies>\r
     </dependencyManagement>\r