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
Merge "Change the Dependency Source of Jackson"
[holmes/engine-management.git]
/
engine-d
/
pom.xml
diff --git
a/engine-d/pom.xml
b/engine-d/pom.xml
index
3d06046
..
548ac76
100644
(file)
--- a/
engine-d/pom.xml
+++ b/
engine-d/pom.xml
@@
-37,12
+37,12
@@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.
2.3
</version>
+ <version>1.
1.2
</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>
com.fasterxml.jackson.cor
e</groupId>
- <artifactId>
jackson-databind
</artifactId>
- <version>
2.7.0
</version>
+ <groupId>
org.hibernat
e</groupId>
+ <artifactId>
hibernate-validator
</artifactId>
+ <version>
5.4.2.Final
</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
@@
-75,7
+75,7
@@
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-
core
</artifactId>
+ <artifactId>jackson-
databind
</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
@@
-117,6
+117,10
@@
<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>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
@@
-182,9
+186,12
@@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@
-226,6
+233,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>