Merge "Simplify Aai connection result"

[so.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 3d78f52..486ce5c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1</version>
                <relativePath/>
        </parent>
        <groupId>org.onap.so</groupId>
        <artifactId>so</artifactId>
        <packaging>pom</packaging>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.4.0-SNAPSHOT</version>
        <name>so</name>
        <description>This Maven project is responsible to build and package all child projects - contributions in the MSO project.
        This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB.
@@ -47,6 +47,7 @@
                <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
                <jacoco.version>0.7.5.201505241946</jacoco.version>
                <org.apache.maven.user-settings/>
+               <!-- TODO: update to version 1.4.0 for Dublin -->
                <openstack.version>1.3.0</openstack.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
                <springboot.version>1.5.13.RELEASE</springboot.version> 
@@ -66,7 +67,7 @@
                <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
                <publicNexusPath>content/repositories/public/</publicNexusPath>
                <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
-               <cxf.version>3.2.5</cxf.version>
+               <cxf.version>3.2.6</cxf.version>
                <jax.ws.rs>2.1</jax.ws.rs>
        </properties>
        <distributionManagement>
@@ -511,7 +512,6 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.8.10</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
@@ -679,12 +679,6 @@
                        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
                        <!-- force use of version 4.5 everywhere in transient deps, aligned on 
                                WildFly 10 version -->
-                       <dependency>
-                               <groupId>org.apache.httpcomponents</groupId>
-                               <artifactId>httpclient</artifactId>
-                               <version>4.5.5</version>
-                               <scope>compile</scope>
-                       </dependency>
                        <dependency>
                                <groupId>org.apache.httpcomponents</groupId>
                                <artifactId>httpcore</artifactId>
@@ -731,7 +725,7 @@
                        <dependency>
                                <groupId>org.yaml</groupId>
                                <artifactId>snakeyaml</artifactId>
-                               <version>1.15</version>
+                               <version>1.23</version>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.boot</groupId>