Merge "Check for existing VNF in VNFM"

[so.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1be848a..01d66b4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
                <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>
+               <openstack.version>1.4.0-SNAPSHOT</openstack.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>            
                <originalClassifier>original</originalClassifier>
                <docker.skip>true</docker.skip>
@@ -65,8 +65,8 @@
                <siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
                <cxf.version>3.2.6</cxf.version>
                <jax.ws.rs>2.1</jax.ws.rs>
-               <springboot.version>2.0.5.RELEASE</springboot.version>  
-               <camunda.springboot.version>3.0.0</camunda.springboot.version>
+               <springboot.version>2.0.5.RELEASE</springboot.version>
+               <camunda.springboot.version>3.2.0</camunda.springboot.version>
        </properties>
        <distributionManagement>
                <repository>
@@ -397,13 +397,13 @@
                                                <skip>${docker.skip}</skip>
                                                <skipBuild>${docker.skip.build}</skipBuild>
                                                <skipPush>${docker.skip.push}</skipPush>
-                                               <dockerHost>${docker.newHost}</dockerHost> <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY 
+                                               <dockerHost>${docker.newHost}</dockerHost> <!-- 1. Update address to your local docker VM. 2. Add IP to your NO_PROXY
                                                        environment variable -->
-                                               <certPath>${docker.host.cert.path}</certPath><!-- Add -Ddocker.host.cert.pat="path 
+                                               <certPath>${docker.host.cert.path}</certPath><!-- Add -Ddocker.host.cert.pat="path
                                                        to your local certs directory" to maven build command -->
-                                               <pushRegistry>${dockerPushRepo}</pushRegistry> <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username, 
+                                               <pushRegistry>${dockerPushRepo}</pushRegistry> <!-- Update .m2/settings.xml Add server id settings.dockerRepository, username,
                                                        and password -->
-                                               <pullRegistry>${dockerPullRepo}</pullRegistry> <!-- If docker repo is not public. Update .m2/settings.xml Add server id 
+                                               <pullRegistry>${dockerPullRepo}</pullRegistry> <!-- If docker repo is not public. Update .m2/settings.xml Add server id
                                                        settings.dockerRepository, username, and password -->
                                                <images>
                                                        <image>
@@ -434,6 +434,9 @@
                                                        <so.log.level>DEBUG</so.log.level>
                                                </systemPropertyVariables>
                                                <rerunFailingTestsCount>2</rerunFailingTestsCount>
+                                               <parallel>classes</parallel>
+                                               <useUnlimitedThreads>false</useUnlimitedThreads>
+                                               <threadCount>1</threadCount>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -501,6 +504,19 @@
                                                </execution>
                                        </executions>
                                </plugin>
+                               <plugin>
+                                       <groupId>org.springframework.boot</groupId>
+                                       <artifactId>spring-boot-maven-plugin</artifactId>
+                                       <version>${springboot.version}</version>
+                                       <executions>
+                                               <execution>
+                                                       <id>build-info</id>
+                                                       <goals>
+                                                               <goal>build-info</goal>
+                                                       </goals>
+                                               </execution>
+                                       </executions>
+                               </plugin>
                        </plugins>
                </pluginManagement>
        </build>
@@ -509,27 +525,27 @@
        <dependencies>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>                   
+                       <artifactId>jackson-core</artifactId>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
-                       <artifactId>jackson-module-jaxb-annotations</artifactId>                        
+                       <artifactId>jackson-module-jaxb-annotations</artifactId>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>                       
+                       <artifactId>jackson-databind</artifactId>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>                    
+                       <artifactId>jackson-annotations</artifactId>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                       <artifactId>jackson-jaxrs-base</artifactId>                     
+                       <artifactId>jackson-jaxrs-base</artifactId>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                       <artifactId>jackson-jaxrs-json-provider</artifactId>                    
+                       <artifactId>jackson-jaxrs-json-provider</artifactId>
                </dependency>
                <dependency>
                        <groupId>javax.ws.rs</groupId>
@@ -560,7 +576,7 @@
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>          
+                       <artifactId>junit</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
@@ -653,7 +669,7 @@
        <dependencyManagement>
                <dependencies>
                        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
-                       <!-- force use of version 4.5 everywhere in transient deps, aligned on 
+                       <!-- force use of version 4.5 everywhere in transient deps, aligned on
                                WildFly 10 version -->
                        <dependency>
                                <groupId>org.apache.httpcomponents</groupId>
@@ -672,7 +688,7 @@
                                <artifactId>commons-io</artifactId>
                                <version>2.5</version>
                                <scope>compile</scope>
-                       </dependency>           
+                       </dependency>
                        <dependency>
                                <groupId>com.sun.xml.fastinfoset</groupId>
                                <artifactId>FastInfoset</artifactId>