summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--engine-d-standalone/src/main/assembly/conf/engine-d.yml2
-rw-r--r--engine-d/pom.xml60
-rw-r--r--pom.xml4
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
@@ -35,19 +35,14 @@
<dependencies>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>5.4.2.Final</version>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>2.8.6</version>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
@@ -86,6 +81,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -108,6 +107,10 @@
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -130,6 +133,10 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -145,6 +152,12 @@
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>${drools.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.drools</groupId>
@@ -155,6 +168,10 @@
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -184,20 +201,12 @@
<artifactId>logback</artifactId>
</exclusion>
<exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-over-slf4j</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
</exclusion>
<exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -212,6 +221,12 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -230,10 +245,6 @@
<artifactId>powermock-api-mockito</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<scope>provided</scope>
@@ -285,6 +296,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -319,6 +334,7 @@
<excludes>
<exclude>org/onap/holmes/common/**</exclude>
<exclude>com/fasterxml/jackson/core/jackson-databind/**</exclude>
+ <exclude>org/slf4j/**</exclude>
</excludes>
</filter>
</filters>
diff --git a/pom.xml b/pom.xml
index a9f1ea2..d7d8d2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,12 +48,12 @@
<stringtemplate.version>3.2.1</stringtemplate.version>
<postgres.jdbc.driver.version>42.1.1</postgres.jdbc.driver.version>
- <dropwizard.version>0.8.0</dropwizard.version>
+ <dropwizard.version>1.3.0</dropwizard.version>
<swagger.version>1.5.3</swagger.version>
<lombok.version>1.16.8</lombok.version>
<jersey.version>2.22.2</jersey.version>
<jaxrs.consumer.version>5.0</jaxrs.consumer.version>
- <slf4j.version>1.6.1</slf4j.version>
+ <slf4j.version>1.7.25</slf4j.version>
<reflections.version>0.9.9</reflections.version>
<quartz.version>2.2.1</quartz.version>