From bcba2d712fc1b87104c93006d16c760ed833ff0a Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Wed, 28 Mar 2018 11:28:50 +0800 Subject: [PATCH] Excluded Some Dependencies to Fix Nexus Issues Change-Id: I26530b778245d2706ea54bea19633ed82b2fce05 Issue-ID: HOLMES-123 Signed-off-by: GuangrongFu --- .../src/main/assembly/conf/engine-d.yml | 2 +- engine-d/pom.xml | 60 ++++++++++++++-------- pom.xml | 4 +- 3 files changed, 41 insertions(+), 25 deletions(-) diff --git a/engine-d-standalone/src/main/assembly/conf/engine-d.yml b/engine-d-standalone/src/main/assembly/conf/engine-d.yml index 74e26ba..e2f1f64 100644 --- a/engine-d-standalone/src/main/assembly/conf/engine-d.yml +++ b/engine-d-standalone/src/main/assembly/conf/engine-d.yml @@ -62,7 +62,7 @@ database: driverClass: org.postgresql.Driver user: holmes password: holmespwd - url: jdbc:postgresql://10.74.156.206:5432/holmes + url: jdbc:postgresql://10.96.33.33:5432/holmes properties: charSet: UTF-8 maxWaitForConnection: 1s diff --git a/engine-d/pom.xml b/engine-d/pom.xml index 55dfe5b..e4fdcb9 100644 --- a/engine-d/pom.xml +++ b/engine-d/pom.xml @@ -34,20 +34,15 @@ - - ch.qos.logback - logback-classic - 1.1.2 - org.hibernate hibernate-validator 5.4.2.Final - com.fasterxml.jackson.core - jackson-core - 2.8.6 + ch.qos.logback + logback-classic + 1.2.3 net.sf.json-lib @@ -86,6 +81,10 @@ com.fasterxml.jackson.core jackson-core + + org.slf4j + slf4j-api + @@ -108,6 +107,10 @@ org.onap.msb.java-sdk msb-java-sdk + + org.slf4j + slf4j-api + @@ -130,6 +133,10 @@ io.swagger swagger-jersey2-jaxrs + + org.slf4j + slf4j-api + @@ -145,6 +152,12 @@ org.drools drools-core ${drools.version} + + + org.slf4j + slf4j-api + + org.drools @@ -155,6 +168,10 @@ org.eclipse.jdt.core.compiler ecj + + org.slf4j + slf4j-api + @@ -183,21 +200,13 @@ ch.qos.logback logback - - ch.qos.logback - logback-classic - - - log4j-over-slf4j - org.slf4j - org.hibernate hibernate-validator - com.fasterxml.jackson.core - jackson-core + org.slf4j + slf4j-api @@ -212,6 +221,12 @@ org.quartz-scheduler quartz + + + org.slf4j + slf4j-api + + junit @@ -229,10 +244,6 @@ org.powermock powermock-api-mockito - - org.slf4j - slf4j-api - io.swagger swagger-jersey2-jaxrs @@ -285,6 +296,10 @@ com.google.guava guava + + org.slf4j + slf4j-api + @@ -319,6 +334,7 @@ org/onap/holmes/common/** com/fasterxml/jackson/core/jackson-databind/** + org/slf4j/** diff --git a/pom.xml b/pom.xml index a9f1ea2..d7d8d2b 100644 --- a/pom.xml +++ b/pom.xml @@ -48,12 +48,12 @@ 3.2.1 42.1.1 - 0.8.0 + 1.3.0 1.5.3 1.16.8 2.22.2 5.0 - 1.6.1 + 1.7.25 0.9.9 2.2.1 -- 2.16.6