X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=889fbfb909f18e43b5f7610b9098b4ba00fcd739;hb=b290acafdc85b7d0b6d2c6ab6de87a89f2852f82;hp=eb3586717d5bd7f540f4fbe40f3828396ef7cc0b;hpb=1d3a119024573301c33338ce072517b7b5d5f46c;p=aai%2Fmodel-loader.git

diff --git a/pom.xml b/pom.xml
index eb35867..889fbfb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,15 +23,23 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.openecomp.aai.model-loader</groupId>
 	<artifactId>model-loader</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.0</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>
 	</properties>
 
 	<dependencies>
@@ -101,12 +109,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>
@@ -160,12 +168,11 @@
                          <id>ecomp-snapshots</id>
                           <name>ECOMP Snapshot Repository</name>
                          <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
-                          <snapshots>
-            <updatePolicy>always</updatePolicy>
-        </snapshots>
-        <releases>
-            <updatePolicy>always</updatePolicy>
-        </releases>
+                  </repository>
+                  <repository>
+                         <id>ecomp-staging</id>
+                          <name>ECOMP Staging Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/staging/</url>
                   </repository>
 
           </repositories>
@@ -173,6 +180,48 @@
 	
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.7</version>
+				<executions>
+					<execution>
+						<id>copy-docker-file</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target</outputDirectory>
+							<overwrite>true</overwrite>
+							<resources>
+								<resource>
+									<directory>${basedir}/src/main/docker</directory>
+									<filtering>true</filtering>
+									<includes>
+										<include>**/*</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.4.11</version>
+				<configuration>		
+					<verbose>true</verbose>
+					<serverId>docker-hub</serverId>
+					<imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>					
+					<dockerDirectory>${docker.location}</dockerDirectory>
+					<imageTags>
+						<imageTag>latest</imageTag>
+					</imageTags>
+					<forceTags>true</forceTags>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -203,8 +252,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>
@@ -233,47 +281,6 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.1</version>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.7</version>
-				<executions>
-					<execution>
-						<id>copy-docker-file</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<overwrite>true</overwrite>
-							<resources>
-								<resource>
-									<directory>${basedir}/src/main/docker</directory>
-									<filtering>true</filtering>
-									<includes>
-										<include>**/*</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.11</version>
-				<configuration>		
-					<serverId>nexus3.openecomp.org:10003</serverId>
-					<imageName>${docker.registry}/ecomp/${project.artifactId}</imageName>					
-					<imageTags>
-						<imageTag>${docker.imagetag}</imageTag>
-						<imageTag>latest</imageTag>
-					</imageTags>
-					<forceTags>true</forceTags>
-				</configuration>
-			</plugin>
 		
 			<!-- Checkstyle plugin - used to report on compliance with -->
 			<!-- the Google style guide. -->
@@ -351,6 +358,31 @@
              	<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>
 		</plugins>		
 	</build>