Dynamic Cloud Owner Support

[so.git] / common / pom.xml

diff --git a/common/pom.xml b/common/pom.xml
index 43cb531..d2dba45 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,5 +1,5 @@
-<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">
+<?xml version="1.0"?>
+<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.so</groupId>
@@ -19,21 +19,6 @@
                        <artifactId>javax.servlet-api</artifactId>
                        <version>3.1.0</version>
                </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>2.8.7</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-                       <version>2.8.7</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jaxb-annotations</artifactId>
-                       <version>2.4.0</version>
-               </dependency>
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-aspects</artifactId>
@@ -55,12 +40,6 @@
                <dependency>
                        <groupId>org.hibernate</groupId>
                        <artifactId>hibernate-core</artifactId>
-                       <version>4.3.6.Final</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.wordnik</groupId>
-                       <artifactId>swagger-annotations_2.9.1</artifactId>
-                       <version>1.3.0</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.appc.client</groupId>
@@ -76,13 +55,14 @@
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-web</artifactId>
                </dependency>
+               <dependency>
+               <groupId>org.springframework</groupId>
+               <artifactId>spring-webmvc</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.onap.aai.aai-common</groupId>
                        <artifactId>aai-schema</artifactId>
-                       <!-- TODO: replace with release a version when -->
-                       <!-- org.onap.aai.domain.yang.Collection has -->
-                       <!-- been released -->
-                       <version>1.3.0-SNAPSHOT</version>
+                       <version>1.3.1-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.modelmapper</groupId>
@@ -92,7 +72,7 @@
                <dependency>
                        <groupId>com.google.guava</groupId>
                        <artifactId>guava</artifactId>
-                       <version>22.0</version>
+
                </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
@@ -102,7 +82,7 @@
                <dependency>
                        <groupId>org.apache.cxf</groupId>
                        <artifactId>cxf-rt-rs-client</artifactId>
-                       <version>3.1.12</version>
+                       <version>${cxf.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -134,16 +114,11 @@
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-ext</artifactId>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.slf4j</groupId>
                        <artifactId>slf4j-api</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>janino</groupId>
-                       <artifactId>janino</artifactId>
-                       <version>2.5.15</version>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.boot</groupId>
                        <artifactId>spring-boot-configuration-processor</artifactId>
@@ -159,7 +134,17 @@
             <artifactId>spring-security-web</artifactId>
             <version>5.0.5.RELEASE</version>
         </dependency>
-
+               <dependency>
+                       <groupId>org.onap.logging-analytics</groupId>
+                       <artifactId>logging-slf4j</artifactId>
+                       <version>1.2.2-SNAPSHOT</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.att.eelf</groupId>
+                                       <artifactId>eelf-core</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
     </dependencies>
        <build>
                <resources>