Update version to 1.1.0-SNAPSHOT

[aai/model-loader.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index fbd564e..4cd7d83 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,17 +23,38 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.openecomp.aai.model-loader</groupId>
        <artifactId>model-loader</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
        <packaging>war</packaging>
        
        <properties>
                <docker.location>${basedir}/target</docker.location>
+               <!-- Ecomp Version -->
+               <ecomp.version>1.0.0</ecomp.version>
                <dependency.scope>provided</dependency.scope>
                <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
                <maven.compiler.source>1.8</maven.compiler.source>
        <maven.compiler.target>1.8</maven.compiler.target>
+              <sonar.language>java</sonar.language>
+              <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
+              <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+              <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+              <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
+              <sonar.projectVersion>${project.version}</sonar.projectVersion>
+               <nexusproxy>https://nexus.openecomp.org</nexusproxy>
        </properties>
 
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>ECOMP Release Repository</name>
+                       <url>${nexusproxy}/content/repositories/releases/</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <name>ECOMP Snapshot Repository</name>
+                       <url>${nexusproxy}/content/repositories/snapshots/</url>
+               </snapshotRepository>
+       </distributionManagement>
        <dependencies>
                <dependency>
                        <groupId>org.mockito</groupId>
@@ -101,12 +122,12 @@
                <dependency>
                        <groupId>org.openecomp.aai.logging-service</groupId>
                        <artifactId>common-logging</artifactId>
-                       <version>1.0.0-SNAPSHOT</version>
+                       <version>${ecomp.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.openecomp.sdc</groupId>
                    <artifactId>sdc-distribution-client</artifactId>
-                       <version>0.9.0</version>
+                   <version>${ecomp.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
@@ -161,6 +182,11 @@
                           <name>ECOMP Snapshot Repository</name>
                          <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
                   </repository>
+                  <repository>
+                         <id>ecomp-staging</id>
+                          <name>ECOMP Staging Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/staging/</url>
+                  </repository>
 
           </repositories>
        
@@ -199,11 +225,11 @@
                                <artifactId>docker-maven-plugin</artifactId>
                                <version>0.4.11</version>
                                <configuration>         
-                                       <serverId>nexus3.openecomp.org:10003</serverId>
+                                       <verbose>true</verbose>
+                                       <serverId>docker-hub</serverId>
                                        <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>                                  
                                        <dockerDirectory>${docker.location}</dockerDirectory>
                                        <imageTags>
-                                               <imageTag>${docker.imagetag}</imageTag>
                                                <imageTag>latest</imageTag>
                                        </imageTags>
                                        <forceTags>true</forceTags>
@@ -239,8 +265,7 @@
                                <artifactId>maven-surefire-plugin</artifactId>
                                <version>2.12.4</version>
                                <configuration>
-                                       <argLine>-javaagent:${project.build.directory}/agents/powermock-javaagent.jar
-                                               -noverify</argLine>
+                                  <argLine>-noverify ${argLine}</argLine>
                                </configuration>
                        </plugin>
                        <plugin>
@@ -346,6 +371,43 @@
                <skip>true</skip>
                </configuration>
              </plugin>
+            <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>sonar-maven-plugin</artifactId>
+             <version>3.2</version>
+           </plugin>
+           <plugin>
+             <groupId>org.jacoco</groupId>
+             <artifactId>jacoco-maven-plugin</artifactId>
+             <version>0.7.7.201606060606</version>
+             <configuration>
+                  <dumpOnExit>true</dumpOnExit>
+             </configuration>
+             <executions>
+                  <execution>
+                    <id>jacoco-initialize-unit-tests</id>
+                    <goals>
+                          <goal>prepare-agent</goal>
+                    </goals>
+                    <configuration>
+                          <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                          <!-- <append>true</append> -->
+                    </configuration>
+                  </execution>
+             </executions>
+           </plugin>
+           <plugin>
+               <groupId>org.sonatype.plugins</groupId>
+               <artifactId>nexus-staging-maven-plugin</artifactId>
+               <version>1.6.7</version>
+               <extensions>true</extensions>
+               <configuration>
+                       <nexusUrl>${nexusproxy}</nexusUrl>
+                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                       <serverId>ecomp-staging</serverId>
+               </configuration>
+           </plugin>
+
                </plugins>              
        </build>