Code Review
/
holmes
/
dsa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use managed guava version
[holmes/dsa.git]
/
dmaap-dsa
/
pom.xml
diff --git
a/dmaap-dsa/pom.xml
b/dmaap-dsa/pom.xml
index
debda23
..
4802dc1
100644
(file)
--- a/
dmaap-dsa/pom.xml
+++ b/
dmaap-dsa/pom.xml
@@
-1,4
+1,4
@@
-<?xml version="1.0" encoding="UTF-8"
?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2017 ZTE Corporation.
~
<!--
~ Copyright 2017 ZTE Corporation.
~
@@
-14,14
+14,13
@@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.holmes.dsa</groupId>
<artifactId>holmes-dsa-parent</artifactId>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.holmes.dsa</groupId>
<artifactId>holmes-dsa-parent</artifactId>
- <version>1.
1
.0-SNAPSHOT</version>
+ <version>1.
2
.0-SNAPSHOT</version>
</parent>
<artifactId>dmaap-dsa</artifactId>
</parent>
<artifactId>dmaap-dsa</artifactId>
@@
-29,6
+28,11
@@
<packaging>jar</packaging>
<dependencies>
<packaging>jar</packaging>
<dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>5.4.2.Final</version>
+ </dependency>
<dependency>
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
<dependency>
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
@@
-41,6
+45,14
@@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
<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>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
@@
-86,12
+98,8
@@
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
</exclusion>
</exclusions>
</dependency>
</exclusion>
</exclusions>
</dependency>
@@
-158,6
+166,12
@@
<version>1.6.5</version>
<scope>test</scope>
</dependency>
<version>1.6.5</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>1.7.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-rule</artifactId>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4-rule</artifactId>
@@
-220,7
+234,7
@@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>19.0</version>
+
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@@
-276,10
+290,8
@@
</goals>
<configuration>
<transformers>
</goals>
<configuration>
<transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.onap.holmes.dsa.DMaapDsaActiveApp</mainClass>
</transformer>
</transformers>
<mainClass>org.onap.holmes.dsa.DMaapDsaActiveApp</mainClass>
</transformer>
</transformers>