Merge "false positive license issue on nexus IQ + unused"

[clamp.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 69755e4..31997cd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
                <parent>
                                <groupId>org.onap.oparent</groupId>
                                <artifactId>oparent</artifactId>
-                               <version>1.1.0-SNAPSHOT</version>
+                               <version>1.1.0</version>
                </parent>
 
                <description>
@@ -70,6 +70,8 @@
                                <project.scm.id>git-server</project.scm.id>
                                <java.version>1.8</java.version>
 
+                               <swagger.jaxrs2.version>2.0.0-rc4</swagger.jaxrs2.version>
+                               <guava.version>20.0</guava.version>
                                <eelf.core.version>1.0.0</eelf.core.version>
                                <camel.version>2.20.1</camel.version>
                                <springboot.version>1.5.10.RELEASE</springboot.version>
@@ -168,6 +170,17 @@
                </dependencyManagement>
 
                <dependencies>
+                               <!-- Swagger requires at least v20 and policy is bringing version 14 -->
+                               <dependency>
+                                       <groupId>com.google.guava</groupId>
+                                       <artifactId>guava</artifactId>
+                                       <version>${guava.version}</version>
+                               </dependency>
+                               <dependency>
+                                       <groupId>io.swagger.core.v3</groupId>
+                                       <artifactId>swagger-jaxrs2</artifactId>
+                                       <version>${swagger.jaxrs2.version}</version>
+                               </dependency>
                                <dependency>
                                                <groupId>com.att.eelf</groupId>
                                                <artifactId>eelf-core</artifactId>
@@ -274,10 +287,6 @@
                                                <groupId>com.fasterxml.jackson.core</groupId>
                                                <artifactId>jackson-core</artifactId>
                                </dependency>
-                               <dependency>
-                                               <groupId>com.fasterxml.jackson.core</groupId>
-                                               <artifactId>jackson-databind</artifactId>
-                               </dependency>
                                <dependency>
                                                <groupId>javax.transaction</groupId>
                                                <artifactId>jta</artifactId>
@@ -303,6 +312,10 @@
                                                <artifactId>PolicyEngineAPI</artifactId>
                                                <version>1.1.0</version>
                                                <exclusions>
+                                                               <exclusion>
+                                                                               <groupId>com.google.guava</groupId>
+                                                                               <artifactId>guava</artifactId>
+                                                               </exclusion>
                                                                <exclusion>
                                                                                <artifactId>log4j</artifactId>
                                                                                <groupId>log4j</groupId>
@@ -436,10 +449,6 @@
                                                                </exclusion>
                                                </exclusions>
                                </dependency>
-                               <dependency>
-                                               <groupId>com.fasterxml.jackson.core</groupId>
-                                               <artifactId>jackson-databind</artifactId>
-                               </dependency>
                                <dependency>
                                                <groupId>com.fasterxml.jackson.dataformat</groupId>
                                                <artifactId>jackson-dataformat-yaml</artifactId>
@@ -475,6 +484,11 @@
                                        <artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
                                        <version>1.0.1.Final</version>
                                </dependency>
+                               <dependency>
+                                               <groupId>com.fasterxml.jackson.core</groupId>
+                                               <artifactId>jackson-databind</artifactId>
+                                               <version>2.8.11.1</version>
+                               </dependency>
                                <!-- Remove the MYSQL connector and replace it by Mariadb -->
                                <dependency>
                                                <groupId>org.mariadb.jdbc</groupId>