Merge " Duplicate service entry removed"

[so.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 8b9b295..df6c19f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <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>
@@ -29,6 +29,8 @@
                <module>asdc-controller</module>
                <module>bpmn</module>
                <module>cloudify-client</module>
+               <module>cxf-logging</module>
+                <module>so-monitoring</module>
                <module>packages</module>
        </modules>
        <properties>
@@ -45,9 +47,12 @@
                <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
                <jacoco.version>0.7.5.201505241946</jacoco.version>
                <org.apache.maven.user-settings/>
-               <openstack.version>1.2.2</openstack.version>
+               <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> 
+               <springframework.version>5.0.8.RELEASE</springframework.version>
+               <tomcat.version>8.5.33</tomcat.version>
+                <h2.version>1.4.196</h2.version>
                <originalClassifier>original</originalClassifier>
                <docker.skip>true</docker.skip>
                <docker.skip.build>true</docker.skip.build>
@@ -57,7 +62,6 @@
                <docker.buildArg.docker_repository>${dockerPullRepo}</docker.buildArg.docker_repository>
                <enforcer.skip>true</enforcer.skip>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <stagingNexusPath>content/repositories/staging/</stagingNexusPath>
                <releaseNexusPath>content/repositories/releases/</releaseNexusPath>
                <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
                <publicNexusPath>content/repositories/public/</publicNexusPath>
@@ -111,13 +115,6 @@
                        <id>restlet</id>
                        <url>http://maven.restlet.com</url>
                </pluginRepository>
-               <pluginRepository>
-                       <id>ecomp-staging</id>
-                       <url>${nexusproxy}/${stagingNexusPath}</url>
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-               </pluginRepository>
                <pluginRepository>
                        <id>ecomp-public</id>
                        <url>${nexusproxy}/${publicNexusPath}</url>
@@ -141,13 +138,6 @@
                </pluginRepository>
        </pluginRepositories>
        <repositories>
-               <repository>
-                       <id>ecomp-staging</id>
-                       <url>https://nexus.onap.org/content/repositories/staging/</url>
-                       <snapshots>
-                               <enabled>false</enabled>
-                       </snapshots>
-               </repository>
                <repository>
                        <id>ecomp-public</id>
                        <url>https://nexus.onap.org/content/repositories/public/</url>
@@ -442,7 +432,7 @@
                                        <version>2.20</version>
                                        <configuration>
                                                <systemPropertyVariables>
-                                                       <so.log.level>${so.log.level}</so.log.level>
+                                                       <so.log.level>DEBUG</so.log.level>
                                                </systemPropertyVariables>
                                                <rerunFailingTestsCount>2</rerunFailingTestsCount>
                                        </configuration>
@@ -454,7 +444,7 @@
                                        <configuration>
                                                <skip>true</skip>
                                                <systemPropertyVariables>
-                                                       <so.log.level>${so.log.level}</so.log.level>
+                                                       <so.log.level>DEBUG</so.log.level>
                                                </systemPropertyVariables>
                                                <rerunFailingTestsCount>2</rerunFailingTestsCount>
                                        </configuration>
@@ -521,7 +511,6 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.8.7</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
@@ -531,12 +520,12 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.8.7</version>
+                       <version>2.8.10</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
-                       <version>2.8.7</version>
+                       <version>2.8.10</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -689,12 +678,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>
@@ -741,7 +724,7 @@
                        <dependency>
                                <groupId>org.yaml</groupId>
                                <artifactId>snakeyaml</artifactId>
-                               <version>1.15</version>
+                               <version>1.23</version>
                        </dependency>
                        <dependency>
                                <groupId>org.springframework.boot</groupId>
@@ -774,6 +757,56 @@
                        <artifactId>flyway-core</artifactId>
                        <version>4.2.0</version>
                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-core</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-el</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat.embed</groupId>
+                                <artifactId>tomcat-embed-websocket</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.apache.tomcat</groupId>
+                                <artifactId>tomcat-annotations-api</artifactId>
+                                <version>${tomcat.version}</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.json4s</groupId>
+                                <artifactId>json4s-jackson_2.12</artifactId>
+                                <version>3.6.0</version>
+                        </dependency>
+                        <dependency>
+                                <groupId>org.json4s</groupId>
+                                <artifactId>json4s-core_2.12</artifactId>
+                                <version>3.6.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.commons</groupId>
+                            <artifactId>commons-email</artifactId>
+                            <version>1.5</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.immutables</groupId>
+                            <artifactId>value</artifactId>
+                            <version>2.7.1</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.eclipse.jetty</groupId>
+                            <artifactId>jetty-server</artifactId>
+                            <version>9.4.12.v20180830</version>
+                        </dependency>
+                       <dependency>
+                           <groupId>com.h2database</groupId>
+                           <artifactId>h2</artifactId>
+                           <version>${h2.version}</version>
+                       </dependency>
                </dependencies>
        </dependencyManagement>
        <profiles>