Trying to fix intermittently stuck unit tests

[sdc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e6e4d92..52f876d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,7 @@
        <artifactId>sdc-main</artifactId>
        <version>1.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
-       
-
+        <name>sdc</name>       
        <properties>
 
                <!-- ==================== -->
@@ -28,15 +27,13 @@
         <jersey-bom.version>2.24</jersey-bom.version>
         <servlet-api.version>2.5</servlet-api.version>
 
-               <artifact-generator-api.version>1.1.0-SNAPSHOT</artifact-generator-api.version>
-               <artifact-generator-core.version>1.1.0-SNAPSHOT</artifact-generator-core.version>
+               <artifact-generator-api.version>${project.version}</artifact-generator-api.version>
+               <artifact-generator-core.version>${project.version}</artifact-generator-core.version>
                <ecomp.version>1.1.0</ecomp.version>
-               <dox-common-lib.version>1.1.0-SNAPSHOT</dox-common-lib.version>
+               <dox-common-lib.version>${project.version}</dox-common-lib.version>
 
                <!-- Elastic Search mapper (reference the elastic search version actually). -->
                <elastic-search.version>2.1.0</elastic-search.version>
-               <catalog-artifacts.version>1.0.0-SNAPSHOT</catalog-artifacts.version>
-               <catalog-builders.version>1.0.0-SNAPSHOT</catalog-builders.version>
                <jetty.version>9.2.10.v20150310</jetty.version>
 
                <!-- JSON and YAML Parsing -->
@@ -88,7 +85,7 @@
                <extentreports.version>3.0.3</extentreports.version>
                
                <!-- parser-->
-               <sdc-tosca-parser.version>1.1.14-SNAPSHOT</sdc-tosca-parser.version>
+               <sdc-tosca-parser.version>1.1.34</sdc-tosca-parser.version>
                
                <!--JaCoCO -->
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -110,6 +107,7 @@
                <sonar.exclusions>**/scripts/**/*</sonar.exclusions>
                <sonar.test.exclusions>**/test/**/*,**/tests/**/*</sonar.test.exclusions>
                <sonar.inclusions>app/**/*.js,server-mock/**/*.js,src/**/*.js,src/main/**/*.java</sonar.inclusions>
+               <sonar.branch>${project.version}</sonar.branch>
 
                <!--nexus-->
                <nexus.proxy>https://nexus.onap.org</nexus.proxy>
@@ -124,7 +122,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.10.4</version>
+                               <version>3.0.0-M1</version>
                                <configuration>
                                        <failOnError>false</failOnError>
                                        <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
@@ -178,6 +176,20 @@
                </pluginManagement>
 
                <plugins>
+
+                       <!-- Staging Plugin -->
+                       <plugin>
+                                <groupId>org.sonatype.plugins</groupId>
+                                <artifactId>nexus-staging-maven-plugin</artifactId>
+                                <version>1.6.7</version>
+                                <extensions>true</extensions>
+                                <configuration>
+                                                <nexusUrl>${nexus.proxy}</nexusUrl>
+                                                <stagingProfileId>${staging.profile.id}</stagingProfileId>
+                                                <serverId>ecomp-staging</serverId>
+                                </configuration>
+                       </plugin>
+
                        <plugin>
                                <artifactId>maven-surefire-plugin</artifactId>
                                <version>2.19.1</version>
@@ -255,6 +267,18 @@
                                        </execution>
                                </executions>
                        </plugin>
+                       
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-site-plugin</artifactId>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.apache.maven.wagon</groupId>
+                                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                                               <version>2.10</version>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
 
                        <!-- Set the deployment repositories properties. -->
                        <plugin>
@@ -340,6 +364,7 @@
                                <activeByDefault>true</activeByDefault>
                        </activation>
                        <modules>
+                               <module>build-tools</module>
                                <module>onboarding</module>
                                <module>security-utils</module>
                                <module>common-app-api</module>
@@ -380,16 +405,12 @@
                        
                        <properties>
                                <ecomp.version>1.2.7</ecomp.version>
-                               <artifact-generator-api.version>1710.0.0-SNAPSHOT</artifact-generator-api.version>
-                               <artifact-generator-core.version>1710.0.0-SNAPSHOT</artifact-generator-core.version>
-                               <dox-common-lib.version>1710.0.0-SNAPSHOT</dox-common-lib.version>
+                               <artifact-generator-api.version>1710.0.0</artifact-generator-api.version>
+                               <artifact-generator-core.version>1710.0.0</artifact-generator-core.version>
+                               <dox-common-lib.version>1710.0.0</dox-common-lib.version>
                                <sdc-tosca-parser.version>1.1.14</sdc-tosca-parser.version>
-                       </properties>   
-                       
-                       
+                       </properties>
                </profile>
-               
-
 
                <profile>
                        <id>onboarding</id>
@@ -397,6 +418,7 @@
                                <activeByDefault>false</activeByDefault>
                        </activation>
                        <modules>
+                               <module>build-tools</module>
                                <module>onboarding</module>
                        </modules>
                </profile>