diff options
| -rw-r--r-- | holmes-actions/pom.xml | 20 | ||||
| -rw-r--r-- | holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java | 2 | ||||
| -rw-r--r-- | 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 @@ -21,12 +21,22 @@ <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 @@ -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>
|