X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=1e328b338e158fe61fe7710f06bc6462aad19c36;hb=c484e22cd6c0b379abb919ce5c81905331a390ab;hp=8d98e174d5a132d1910df495331bd43af9cdc28a;hpb=8a665d85c9ea91f024e9a378779aad107550b832;p=aai%2Frest-client.git

diff --git a/pom.xml b/pom.xml
index 8d98e17..1e328b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-        
-	<groupId>org.openecomp.aai</groupId>
+	<parent>
+		<groupId>org.onap.oparent</groupId>
+		<artifactId>oparent</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.onap.aai</groupId>
 	<artifactId>rest-client</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<name>REST Client</name>
+	<version>1.1.0-SNAPSHOT</version>
+	<name>aai-rest-client</name>
         
 	<properties>
               <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-              <nexusproxy>https://nexus.onap.org</nexusproxy>
               <!-- Sonar Properties -->
               <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.reportPath>${project.build.directory}/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
               <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
               <sonar.projectVersion>${project.version}</sonar.projectVersion>
         </properties>
@@ -27,17 +31,45 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.openecomp.aai.logging-service</groupId>
+			<groupId>org.onap.aai.logging-service</groupId>
 			<artifactId>common-logging</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0-SNAPSHOT</version>
 		</dependency>
-
+		
 		<dependency>
-			<groupId>com.sun.jersey.jersey-test-framework</groupId>
-			<artifactId>jersey-test-framework-grizzly2</artifactId>
-			<version>1.18</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.2</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.2</version>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-javaagent</artifactId>
+			<version>1.6.2</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4-rule-agent</artifactId>
+			<version>1.6.2</version>
+			<scope>test</scope>
+		</dependency>		
 
 	</dependencies>
 
@@ -69,23 +101,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.3</version>
-					<configuration>
-						<reportPlugins>
-							<plugin>
-								<groupId>org.apache.maven.plugins</groupId>
-								<artifactId>maven-checkstyle-plugin</artifactId>
-								<version>2.17</version>
-								<reportSets>
-									<reportSet>
-										<reports>
-											<report>checkstyle</report>
-										</reports>
-									</reportSet>
-								</reportSets>
-							</plugin>
-						</reportPlugins>
-					</configuration>
+					<version>3.6</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -117,7 +133,7 @@
                               <version>1.6.7</version>
                               <extensions>true</extensions>
                               <configuration>
-                                    <nexusUrl>${nexusproxy}</nexusUrl>
+                                    <nexusUrl>${onap.nexus.url}</nexusUrl>
                                     <stagingProfileId>176c31dfe190a</stagingProfileId>
                                     <serverId>ecomp-staging</serverId>
                               </configuration>
@@ -142,26 +158,31 @@
                                                 <goal>prepare-agent</goal>
                                           </goals>
                                           <configuration>
-                                                <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+						 <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
                                                 <!-- <append>true</append> -->
                                           </configuration>
                                     </execution>
                               </executions>
-                        </plugin>
+		      </plugin>
+
 		</plugins>
 	</build>
 
-        <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>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<version>2.17</version>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>checkstyle</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+		</plugins>
+	</reporting>
         
 </project>