X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d217ba85c1b8a05a5de81389f497923ba83c777e;hb=be45d5c85393c85e9ab345993125a27bfd5c0e5c;hp=2228b40ee4e68b986db00e02aa3fcb3d6b0f18e1;hpb=ef768a7c864f0d807d8696449f5eed7a4552316f;p=aai%2Fmodel-loader.git

diff --git a/pom.xml b/pom.xml
index 2228b40..d217ba8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,47 +28,19 @@
 	
 	<properties>
 		<docker.location>${basedir}/target</docker.location>
-		<docker.url>${dockerurl}</docker.url>
-		<docker.imagetag>${dockertag}</docker.imagetag>
-		<docker.login>${dockerlogin}</docker.login>
-		<docker.password>${dockerpassword}</docker.password>
-		<docker.registry>${dockerregistry}</docker.registry>
 		<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>
-	
-	<repositories>
-	        <repository>
-          		<id>maven-central</id>
-          		<name>maven-central</name>
-          		<url>http://central.maven.org/maven2/</url>
-          		<releases>
-            			<enabled>true</enabled>
-            			<updatePolicy>never</updatePolicy>
-          		</releases>
-          		<snapshots>
-            			<enabled>false</enabled>
-          		</snapshots>
-        	</repository>
-        	<repository>
-          		<id>ecomp-nexus</id>
-          		<name>ecomp-nexus</name>
-          		<url>https://ecomp-nexus:8443/repository/maven-releases/</url>
-          		<releases>
-            			<enabled>true</enabled>
-            			<updatePolicy>never</updatePolicy>
-          		</releases>
-          		<snapshots>
-            			<enabled>false</enabled>
-          		</snapshots>
-        	</repository>
-	</repositories>
 
-	
 	<dependencies>
-		<!-- powermockito dependencies -->
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
@@ -133,15 +105,14 @@
 		</dependency>
 		<!-- Common logging framework -->
 		<dependency>
-			<groupId>org.openecomp.cl</groupId>
+			<groupId>org.openecomp.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-		<!-- ASDC Client Library -->
 		<dependency>
 			<groupId>org.openecomp.sdc</groupId>
-		        <artifactId>sdc-distribution-client</artifactId>
-			<version>1.1.2</version>
+		    <artifactId>sdc-distribution-client</artifactId>
+			<version>0.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
@@ -168,8 +139,83 @@
         
 	</dependencies>
 	
+	<!-- Plugins and repositories -->
+          <pluginRepositories>
+                <pluginRepository>
+                           <id>central</id>
+                          <url>http://repo1.maven.org/maven2</url>
+                   </pluginRepository>
+                  <pluginRepository>
+                          <id>EvoSuite</id>
+                        <name>EvoSuite Repository</name>
+                         <url>http://www.evosuite.org/m2</url>
+                  </pluginRepository>
+          </pluginRepositories>
+           <repositories>
+                   <repository>
+                          <id>central</id>
+                          <name>Maven 2 repository 2</name>
+                          <url>http://repo2.maven.org/maven2/</url>
+                  </repository>
+              <repository>
+                         <id>ecomp-releases</id>
+                          <name>ECOMP Release Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/releases/</url>
+                  </repository>
+                  <repository>
+                         <id>ecomp-snapshots</id>
+                          <name>ECOMP Snapshot Repository</name>
+                         <url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+                  </repository>
+
+          </repositories>
+	
+	
 	<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>${docker.imagetag}</imageTag>
+						<imageTag>latest</imageTag>
+					</imageTags>
+					<forceTags>true</forceTags>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -200,8 +246,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>
@@ -230,73 +275,7 @@
 				<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>
-					<dockerHost>${docker.url}</dockerHost>
-					<registry>${docker.registry}</registry>
-					<authConfig>
-                        <username>${docker.login}</username>
-                        <password>${docker.password}</password>
-                    </authConfig>
-					<imageName>${docker.registry}/ecomp/${project.artifactId}</imageName>
-					<dockerDirectory>${docker.location}</dockerDirectory>
-					<registryUrl>https://${docker.registry}</registryUrl>
-					<imageTags>
-						<imageTag>${docker.imagetag}</imageTag>
-						<imageTag>latest</imageTag>
-					</imageTags>
-					<forceTags>true</forceTags>
-				</configuration>
-			</plugin>
-			<!-- blackduck maven plugin -->
-			<plugin>
-				<groupId>com.blackducksoftware.integration</groupId>
-				<artifactId>hub-maven-plugin</artifactId>
-				<version>1.0.4</version>
-				<inherited>false</inherited>
-				<configuration>
-					<target>${project.basedir/target}</target>
-				</configuration>
-				<executions>
-					<execution>
-						<id>create-bdio-file</id>
-						<phase>package</phase>
-						<goals>
-							<goal>createHubOutput</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+		
 			<!-- Checkstyle plugin - used to report on compliance with -->
 			<!-- the Google style guide. -->
 			<plugin>
@@ -366,7 +345,40 @@
                 </execution>
               </executions>
             </plugin>
-		</plugins>
+             <plugin>
+             	<groupId>org.apache.maven.plugins</groupId>
+             	<artifactId>maven-deploy-plugin</artifactId>             	
+             	<configuration>
+             	<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>
 	
+	
 </project>