Merge "Point Nexus proxy to new URL"

4 files changed, 33 insertions, 14 deletions

diff --git a/dcae_dmaapbc_client/pom.xml b/dcae_dmaapbc_client/pom.xml
index b749912..b347ac1 100644
--- a/dcae_dmaapbc_client/pom.xml
+++ b/dcae_dmaapbc_client/pom.xml
@@ -17,6 +17,10 @@
 	<properties>
 		<encoding>UTF-8</encoding>
 		<skiptests>true</skiptests>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 	</properties>
 
 	<repositories>
@@ -24,13 +28,13 @@
 			<!-- Releases repository has ECOMP release artifacts -->
 			<id>ecomp-releases</id>
 			<name>OpenECOMP - Release Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/releases/</url>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<repository>
 			<!-- Snapshots repository has ECOMP snapshot artifacts -->
 			<id>ecomp-snapshots</id>
 			<name>OpenECOMP - Snapshot Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</repository>
 	</repositories>
 
@@ -64,7 +68,7 @@
 				<version>1.6.7</version>
 				<extensions>true</extensions>
 				<configuration>
-					<nexusUrl>https://nexus.openecomp.org/</nexusUrl>
+					<nexusUrl>${nexusproxy}</nexusUrl>
 					<stagingProfileId>176c31dfe190a</stagingProfileId>
 					<serverId>ecomp-staging</serverId>
 				</configuration>
@@ -193,12 +197,12 @@
 		<repository>
 			<id>ecomp-releases</id>
 			<name>OpenECOMP - Release Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/releases/</url>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<snapshotRepository>
 			<id>ecomp-snapshots</id>
 			<name>OpenECOMP - Snapshot Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</snapshotRepository>
 	</distributionManagement>
 
diff --git a/dcae_dmaapbc_model/pom.xml b/dcae_dmaapbc_model/pom.xml
index 783a3fb..7ce9fea 100644
--- a/dcae_dmaapbc_model/pom.xml
+++ b/dcae_dmaapbc_model/pom.xml
@@ -16,6 +16,10 @@
 	<properties>
 		<encoding>UTF-8</encoding>
 		<skiptests>true</skiptests>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 	</properties>
 
 	<profiles>
@@ -48,7 +52,7 @@
 				<version>1.6.7</version>
 				<extensions>true</extensions>
 				<configuration>
-					<nexusUrl>https://nexus.openecomp.org/</nexusUrl>
+					<nexusUrl>${nexusproxy}</nexusUrl>
 					<stagingProfileId>176c31dfe190a</stagingProfileId>
 					<serverId>ecomp-staging</serverId>
 				</configuration>
@@ -113,12 +117,12 @@
 		<repository>
 			<id>ecomp-releases</id>
 			<name>OpenECOMP - Release Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/releases/</url>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<snapshotRepository>
 			<id>ecomp-snapshots</id>
 			<name>OpenECOMP - Snapshot Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</snapshotRepository>
 	</distributionManagement>
 
diff --git a/dcae_dmaapbc_webapp/pom.xml b/dcae_dmaapbc_webapp/pom.xml
index d57ed43..5481605 100644
--- a/dcae_dmaapbc_webapp/pom.xml
+++ b/dcae_dmaapbc_webapp/pom.xml
@@ -26,6 +26,10 @@
 		<!-- Jenkins invokes mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
 		<build.number>0</build.number>
 		<sonar.exclusions>**.js</sonar.exclusions>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 	</properties>
 
 	<repositories>
@@ -33,19 +37,19 @@
 			<!-- Releases repository has ECOMP release artifacts -->
 			<id>ecomp-releases</id>
 			<name>OpenECOMP - Release Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/releases/</url>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<repository>
 			<!-- Snapshots repository has ECOMP snapshot artifacts -->
 			<id>ecomp-snapshots</id>
 			<name>OpenECOMP - Snapshot Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</repository>
 		<repository>
 			<!-- Staging repository has ECOMP staging artifacts -->
 			<id>ecomp-staging</id>
 			<name>OpenECOMP - Staging Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/staging/</url>
+			<url>${nexusproxy}/${stagingNexusPath}</url>
 		</repository>
 	</repositories>
 
diff --git a/pom.xml b/pom.xml
index 75d0bd8..c54c5cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,13 @@
 		<module>dcae_dmaapbc_webapp</module>
 	</modules>
 
+	<properties>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+	</properties>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -28,7 +35,7 @@
 				<version>1.6.7</version>
 				<extensions>true</extensions>
 				<configuration>
-					<nexusUrl>https://nexus.openecomp.org/</nexusUrl>
+					<nexusUrl>${nexusproxy}</nexusUrl>
 					<stagingProfileId>176c31dfe190a</stagingProfileId>
 					<serverId>ecomp-staging</serverId>
 				</configuration>
@@ -43,12 +50,12 @@
 		<repository>
 			<id>ecomp-releases</id>
 			<name>OpenECOMP - Release Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/releases/</url>
+			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<snapshotRepository>
 			<id>ecomp-snapshots</id>
 			<name>OpenECOMP - Snapshot Repository</name>
-			<url>https://nexus.openecomp.org/content/repositories/snapshots/</url>
+			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>