From: Christopher Lott (cl778h) <clott@research.att.com>
Date: Wed, 4 Oct 2017 15:18:13 +0000 (-0400)
Subject: Add missing POM property nexusproxy
X-Git-Tag: v2.1.0~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=79d729df66d997774a3ea87ea4f4fba255da51f6;p=portal%2Fsdk.git

Add missing POM property nexusproxy

Issue: PORTAL-53
Change-Id: I87d995c734e1ec101c560d6d3eff68335ed0afeb
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---

diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index d02aa727..c9664d03 100644
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -3,7 +3,7 @@
 	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>
 
-	<!-- OParent provides audits, distribution management, etc. -->
+	<!-- OParent provides audits etc. -->
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
@@ -34,49 +34,53 @@
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<skiptests>true</skiptests>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+		<stagingNexusPath>content/repositories/staging/</stagingNexusPath>
+		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
 	</properties>
 
-        <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
-                files among all developers. Also use values (not properties) so oparent can 
-                be resolved. -->
-        <repositories>
-                <repository>
-                        <id>onap-releases</id>
-                        <name>ONAP - Release Repository</name>
-                        <url>https://nexus.onap.org/content/repositories/releases</url>
-                </repository>
-                <repository>
-                        <id>onap-staging</id>
-                        <name>ONAP - Staging Repository</name>
-                        <url>https://nexus.onap.org/content/repositories/staging</url>
-                </repository>
-                <repository>
-                        <id>onap-snapshots</id>
-                        <name>ONAP - Snapshot Repository</name>
-                        <url>https://nexus.onap.org/content/repositories/snapshots</url>
-                </repository>
-                <repository>
-                        <id>onap-public</id>
-                        <url>https://nexus.onap.org/content/groups/public</url>
-                </repository>
-        </repositories>
-
-        <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
-                files among all developers. -->
-        <pluginRepositories>
-                <pluginRepository>
-                        <id>onap-plugin-release</id>
-                        <url>https://nexus.onap.org/content/repositories/releases/</url>
-                </pluginRepository>
-                <pluginRepository>
-                        <id>onap-plugin-staging</id>
-                        <url>https://nexus.onap.org/content/repositories/staging/</url>
-                </pluginRepository>
-                <pluginRepository>
-                        <id>onap-plugin-snapshots</id>
-                        <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-                </pluginRepository>
-        </pluginRepositories>
+	<!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
+		files among developers. Use values (not properties) so oparent can 
+		be resolved. -->
+	<repositories>
+		<repository>
+			<id>onap-releases</id>
+			<name>ONAP - Release Repository</name>
+			<url>https://nexus.onap.org/content/repositories/releases</url>
+		</repository>
+		<repository>
+			<id>onap-staging</id>
+			<name>ONAP - Staging Repository</name>
+			<url>https://nexus.onap.org/content/repositories/staging</url>
+		</repository>
+		<repository>
+			<id>onap-snapshots</id>
+			<name>ONAP - Snapshot Repository</name>
+			<url>https://nexus.onap.org/content/repositories/snapshots</url>
+		</repository>
+		<repository>
+			<id>onap-public</id>
+			<url>https://nexus.onap.org/content/groups/public</url>
+		</repository>
+	</repositories>
+
+	<!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml 
+		files among all developers. Can use properties. -->
+	<pluginRepositories>
+		<pluginRepository>
+			<id>onap-plugin-release</id>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-plugin-staging</id>
+			<url>${nexusproxy}/${stagingNexusPath}/</url>
+		</pluginRepository>
+		<pluginRepository>
+			<id>onap-plugin-snapshots</id>
+			<url>${nexusproxy}/${snapshotNexusPath}/</url>
+		</pluginRepository>
+	</pluginRepositories>
 
 	<profiles>
 		<!-- disable doclint, a new feature in Java 8, when generating javadoc -->
@@ -104,7 +108,8 @@
 
 		<pluginManagement>
 			<plugins>
-				<!-- Silence Eclipse/m2e complaints about checkstyle plugin brought in by OParent -->
+				<!-- Silence Eclipse/m2e complaints about checkstyle plugin brought in 
+					by OParent -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -192,7 +197,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<!-- defined in oparent <version>1.6.7</version> -->
 				<extensions>true</extensions>
 				<configuration>
 					<nexusUrl>${nexusproxy}</nexusUrl>
@@ -212,8 +217,8 @@
 	</build>
 
 	<distributionManagement>
-		<!-- Override the OParent sections which use id "ecomp-releases" etc.
-		     The ids below must match .m2/settings.xml/servers/server/id -->
+		<!-- Override the OParent sections which use id "ecomp-releases" etc. The 
+			ids below must match .m2/settings.xml/servers/server/id -->
 		<repository>
 			<id>releases</id>
 			<name>OpenECOMP - Release Repository</name>
@@ -227,7 +232,7 @@
 		<!-- Javadocs -->
 		<site>
 			<id>ecomp-site</id>
-			<url>dav:https://nexus.onap.org/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</url>
+			<url>dav:${nexusproxy}/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</url>
 		</site>
 	</distributionManagement>