From: Venkata Harish K Kajur <vk250x@att.com>
Date: Mon, 15 May 2017 17:24:25 +0000 (-0400)
Subject: Update the pom files to fix the junit failure
X-Git-Tag: v1.1.0~112
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=12c3c52d783af9922a373254d035ea4e7298682d;p=aai%2Faai-common.git

Update the pom files to fix the junit failure

Add the changes made for javadocs and surefire plugin

Change-Id: Ic01b2c72030d8014ad32e44d2aeebda14d698719
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 4cfbf37d..c5fcfe22 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -11,7 +11,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 0300087c..1fc32a09 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -13,7 +13,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<aai-schema.version>1.1.0-SNAPSHOT</aai-schema.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@ -400,6 +400,18 @@
 						</execution>
 					</executions>
 				</plugin>
+			<plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12.4</version>
+				<configuration>
+					<argLine>-noverify ${argLine}</argLine>
+                    <systemPropertyVariables>
+						<AJSC_HOME>.</AJSC_HOME>
+						<BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 87fc27ee..8d6836aa 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -11,7 +11,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<aai.annotations.version>1.1.0-SNAPSHOT</aai.annotations.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/${project.artifactId}/${project.version}</sitePath>
+        <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 00fd2f7c..64cc47b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,12 @@
   	<module>aai-annotations</module>
   	<module>aai-core</module>
   </modules>
-  
+
+	<properties>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
+	</properties>
+
   <build>
         <pluginManagement>
             <plugins>