summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCongcong Peng <peng.congcong@zte.com.cn>2018-02-27 16:39:44 +0800
committerCongcong Peng <peng.congcong@zte.com.cn>2018-02-27 16:39:44 +0800
commit6f324f1894738bd5d6bb3cab0ca3689300d25c56 (patch)
tree7da4e1916a683a47e4761b462368a1134131356f
parenta72452c75abacbc92ec2101f69baf129ff80ecb0 (diff)
change version
Issue-ID: HOLMES-115 Change-Id: I8ea172d89cf7617983934525c35aeccc70f6f7fb Signed-off-by: Congcong Peng <peng.congcong@zte.com.cn>
-rw-r--r--engine-d/pom.xml17
-rw-r--r--engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java2
-rw-r--r--pom.xml4
3 files changed, 20 insertions, 3 deletions
diff --git a/engine-d/pom.xml b/engine-d/pom.xml
index 8ec0bf8..36b4f27 100644
--- a/engine-d/pom.xml
+++ b/engine-d/pom.xml
@@ -36,6 +36,23 @@
<dependencies>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>2.5.4</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.4</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
</dependency>
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java b/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java
index 40a3940..522ec0b 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java
@@ -52,7 +52,7 @@ public class DcaeConfigurationPolling implements Runnable {
prevConfigMd5 = md5;
} catch (CorrelationException e) {
log.error("Failed to poll the DCAE configurations. " + e.getMessage(), e);
- } catch (JsonProcessingException e) {
+ } catch (Exception e) {
log.info("Failed to generate the MD5 information for new configurations.", e);
}
if (dcaeConfigurations != null) {
diff --git a/pom.xml b/pom.xml
index f393ab7..2ef7799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-actions</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>io.dropwizard</groupId>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.onap.holmes.dsa</groupId>
<artifactId>dmaap-dsa</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>