Code Review
/
aai
/
esr-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Modify JAVA Env Setting"
[aai/esr-server.git]
/
esr-mgr
/
pom.xml
diff --git
a/esr-mgr/pom.xml
b/esr-mgr/pom.xml
index
8cf1933
..
adfdef3
100644
(file)
--- a/
esr-mgr/pom.xml
+++ b/
esr-mgr/pom.xml
@@
-1,7
+1,7
@@
<?xml version="1.0"?>
<!--
<?xml version="1.0"?>
<!--
- Copyright 2016-201
7
ZTE Corporation.
+ Copyright 2016-201
8
ZTE Corporation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@
-21,13
+21,12
@@
<parent>
<groupId>org.onap.aai.esr-server</groupId>
<artifactId>aai-esr-server</artifactId>
<parent>
<groupId>org.onap.aai.esr-server</groupId>
<artifactId>aai-esr-server</artifactId>
- <version>1.
1
.0-SNAPSHOT</version>
+ <version>1.
7
.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>esr-mgr</artifactId>
<name>esr-server/esr-mgr</name>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>esr-mgr</artifactId>
<name>esr-server/esr-mgr</name>
- <version>1.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<packaging>jar</packaging>
<build>
@@
-129,24
+128,27
@@
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-assets</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-assets</artifactId>
</dependency>
- <dependency>
- <groupId>io.dropwizard</groupId>
- <artifactId>dropwizard-hibernate</artifactId>
- </dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.4</version>
- </dependency>
<!-- jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<!-- jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@
-194,15
+196,15
@@
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.powermock</groupId>
-
<artifactId>powermock-api-mockito
</artifactId>
-
<version>1.7.1
</version>
- <scope>test</scope>
+
<groupId>org.powermock</groupId>
+
<artifactId>powermock-module-junit4
</artifactId>
+
<version>1.5.5
</version>
+
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-
module-junit4-rule
</artifactId>
- <version>1.
6
.5</version>
+ <artifactId>powermock-
api-mockito
</artifactId>
+ <version>1.
5
.5</version>
<scope>test</scope>
</dependency>
<dependency>
<scope>test</scope>
</dependency>
<dependency>
@@
-218,13
+220,12
@@
<scope>test</scope>
</dependency>
<!-- MSB java-sdk -->
<scope>test</scope>
</dependency>
<!-- MSB java-sdk -->
- <dependency>
+
<dependency>
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
<groupId>org.onap.msb.java-sdk</groupId>
<artifactId>msb-java-sdk</artifactId>
- <version>1.
1.0-SNAPSHOT
</version>
- </dependency>
+ <version>1.
2.5
</version>
+ </dependency>
</dependencies>
</dependencies>
-
<profiles>
<profile>
<id>swagger</id>
<profiles>
<profile>
<id>swagger</id>
@@
-279,13
+280,6
@@
</goals>
</execution>
</executions>
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-hibernate-validations</artifactId>
- <version>1.5.6</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</build>