Code Review
/
holmes
/
engine-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed the Instantiation Problem of Engine
[holmes/engine-management.git]
/
engine-d
/
pom.xml
diff --git
a/engine-d/pom.xml
b/engine-d/pom.xml
index
3d06046
..
27c76ef
100644
(file)
--- a/
engine-d/pom.xml
+++ b/
engine-d/pom.xml
@@
-34,16
+34,16
@@
</properties>
<dependencies>
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>5.4.2.Final</version>
+ </dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.7.0</version>
- </dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
@@
-70,16
+70,20
@@
<artifactId>msb-java-sdk</artifactId>
<exclusions>
<exclusion>
<artifactId>msb-java-sdk</artifactId>
<exclusions>
<exclusion>
- <groupId>com.eclipsesource.jaxrs</groupId>
- <artifactId>jersey-all</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
- <groupId>
ch.qos.logback
</groupId>
- <artifactId>
logback-classic
</artifactId>
+ <groupId>
org.slf4j
</groupId>
+ <artifactId>
slf4j-api
</artifactId>
</exclusion>
</exclusions>
</dependency>
</exclusion>
</exclusions>
</dependency>
@@
-99,6
+103,14
@@
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-actions</artifactId>
</exclusion>
<groupId>org.onap.holmes.common</groupId>
<artifactId>holmes-actions</artifactId>
</exclusion>
+ <exclusion>
+ <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>
</exclusions>
</dependency>
<dependency>
@@
-117,6
+129,14
@@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</exclusion>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-jersey2-jaxrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
@@
-132,6
+152,12
@@
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
<version>${drools.version}</version>
<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>
</dependency>
<dependency>
<groupId>org.drools</groupId>
@@
-142,6
+168,10
@@
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
</exclusion>
<groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
@@
-171,20
+201,19
@@
<artifactId>logback</artifactId>
</exclusion>
<exclusion>
<artifactId>logback</artifactId>
</exclusion>
<exclusion>
- <groupId>
ch.qos.logback
</groupId>
- <artifactId>
logback-classic
</artifactId>
+ <groupId>
org.hibernate
</groupId>
+ <artifactId>
hibernate-validator
</artifactId>
</exclusion>
<exclusion>
</exclusion>
<exclusion>
- <artifactId>log4j-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
<groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>io.dropwizard</groupId>
+ <artifactId>dropwizard-jdbi</artifactId>
+ </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@
-196,6
+225,12
@@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<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>
</dependency>
<dependency>
<groupId>junit</groupId>
@@
-213,10
+248,6
@@
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
</dependency>
<groupId>org.powermock</groupId>
<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>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
@@
-226,6
+257,10
@@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
@@
-255,7
+290,7
@@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.
10
</version>
+ <version>1.4.
9
</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@
-265,6
+300,10
@@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
</dependencies>
<build>
@@
-298,6
+337,8
@@
<artifact>org.onap.holmes.dsa:dmaap-dsa</artifact>
<excludes>
<exclude>org/onap/holmes/common/**</exclude>
<artifact>org.onap.holmes.dsa:dmaap-dsa</artifact>
<excludes>
<exclude>org/onap/holmes/common/**</exclude>
+ <exclude>com/fasterxml/jackson/core/jackson-databind/**</exclude>
+ <exclude>org/slf4j/**</exclude>
</excludes>
</filter>
</filters>
</excludes>
</filter>
</filters>