X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=3ed13c355a7276c03d39a88aade0a6f2b0e24453;hb=6d1ca7d232210e9477a6c6040317738eb63dd809;hp=59374aea80a80ab2bab85642a4112e47c553386c;hpb=80fa392258c5ea6f88e99441630b7c303237b1d1;p=aai%2Frest-client.git

diff --git a/pom.xml b/pom.xml
index 59374ae..3ed13c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,20 +1,45 @@
+<!--
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 Amdocs
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+-->
+
 <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.1.0</version>
+	</parent>
+
+	<groupId>org.onap.aai</groupId>
 	<artifactId>rest-client</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
-	<name>REST Client</name>
+	<version>1.3.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,19 +52,52 @@
 		</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.2.2</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>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>javax.ws.rs-api</artifactId>
+      <version>2.0</version>
+    </dependency>
 
-	</dependencies>
+  </dependencies>
 
 	<build>
 		<pluginManagement>
@@ -69,28 +127,13 @@
 				<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>
 		<plugins>
 			<!-- license plugin -->
+			<!-- Uncomment this to add a license header to every source file
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
@@ -110,6 +153,7 @@
 					</execution>
 				</executions>
 			</plugin>
+			-->
 
                         <plugin>
                               <groupId>org.sonatype.plugins</groupId>
@@ -117,7 +161,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 +186,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>