From dc5186ed8d5a9a280a36afb40b6b7f457a8c82f2 Mon Sep 17 00:00:00 2001
From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Fri, 18 Aug 2017 11:58:52 -0700
Subject: Update POM to inherit from oparent

Removed some redundant and inheritable elements
Fixed warnings related to building effective pom
Removed duplicate dependencies
Add version to maven-deploy-plugin

Issue-Id: AAI-77
Change-Id: Ie634874299489fb2971b065c66ff9467839bb36f
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
---
 aai-core/pom.xml | 165 +++++++++++++------------------------------------------
 1 file changed, 38 insertions(+), 127 deletions(-)

(limited to 'aai-core')

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 01156bf0..4ccc0f8e 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -12,9 +12,6 @@
 	<name>aai-core</name>
 	<packaging>jar</packaging>
 	<properties>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -446,24 +443,6 @@
 			<artifactId>camel-jms</artifactId>
 			<version>2.15.5</version>
 		</dependency>
-		<dependency>
-			<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>
@@ -500,95 +479,40 @@
 				</executions>
 			</plugin>
 			<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<version>1.12</version>
-					<configuration>
-						<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-						<licenseName>apache_v2</licenseName>
-						<inceptionYear>2017</inceptionYear>
-						<organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-						<projectName>org.openecomp.aai</projectName>
-						<canUpdateCopyright>true</canUpdateCopyright>
-						<canUpdateDescription>true</canUpdateDescription>
-						<canUpdateLicense>true</canUpdateLicense>
-						<emptyLineAfterHeader>true</emptyLineAfterHeader>
-						<processStartTag>============LICENSE_START=======================================================</processStartTag>
-						<processEndTag>============LICENSE_END=========================================================</processEndTag>
-						<sectionDelimiter>================================================================================</sectionDelimiter>
-						<includes>
-							<include>**/*.java</include>
-							<include>**/*.ksh</include>
-							<include>**/*.sh</include>
-							<include>**/*.ftl</include>
-							<include>**/*.xsd</include>
-							<include>**/*.xjb</include>
-							<include>**/aai*.xml</include>
-							<include>**/*logback*.xml</include>
-							<include>**/*aaiconfig*.properties</include>
-							<include>**/*titan*.properties</include>
-						</includes>
-					</configuration>
-					<executions>
-						<execution>
-							<id>first</id>
-							<goals>
-								<goal>update-file-header</goal>
-							</goals>
-							<phase>process-sources</phase>
-						</execution>
-					</executions>
-				</plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.12.4</version>
 				<configuration>
 					<argLine>-noverify ${argLine}</argLine>
-                    <systemPropertyVariables>
+					<systemPropertyVariables>
 						<AJSC_HOME>.</AJSC_HOME>
 						<BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR>
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
-        <plugin>
-    		<groupId>org.apache.maven.plugins</groupId>
-    		<artifactId>maven-deploy-plugin</artifactId>
-    		<executions>
-        		<execution>
-            		<id>default-deploy</id>
-            		<phase>none</phase>
-        		</execution>
-   			</executions>
-		</plugin>
-		<plugin>
-		    <groupId>org.sonatype.plugins</groupId>
-		    <artifactId>nexus-staging-maven-plugin</artifactId>
-		    <version>1.6.7</version>
-		    <extensions>true</extensions>
-		    <configuration>
-			<nexusUrl>${nexusproxy}</nexusUrl>
-			<stagingProfileId>176c31dfe190a</stagingProfileId>
-			<serverId>ecomp-staging</serverId>
-		    </configuration>
-		</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</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>
 		<site>
 			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
+			<url>dav:${onap.nexus.url}${sitePath}</url>
 		</site>
 	</distributionManagement>
 
@@ -605,37 +529,24 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<repositories>
-		<repository>
-			<id>AJSC</id>
-			<name>AJSC repository</name>
-			<url>https://mvnrepository.com/artifact/com.att.ajsc</url>
-		</repository>
-		<repository>
-			<id>restlet</id>
-			<name>maven reslet</name>
-			<url>https://maven.restlet.com/</url>
-		</repository>
-
-		<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>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>ECOMP Staging Repository</name>
-			<url>${nexusproxy}/content/repositories/staging/</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${nexusproxy}/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
+	<reporting>
+	  <plugins>
+	    <plugin>
+	      <groupId>org.apache.maven.plugins</groupId>
+	      <artifactId>maven-javadoc-plugin</artifactId>
+	      <version>2.10.4</version>
+	      <configuration>
+	        <failOnError>false</failOnError>
+	        <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+	        <docletArtifact>
+	          <groupId>org.umlgraph</groupId>
+	          <artifactId>umlgraph</artifactId>
+	          <version>5.6</version>
+	        </docletArtifact>
+	        <additionalparam>-views</additionalparam>
+	        <useStandardDocletOptions>true</useStandardDocletOptions>
+	      </configuration>
+	    </plugin>
+	  </plugins>
+	</reporting>
 </project>
-- 
cgit