From e61d855d8e0e00fe147b78a37bb55cfb273811a2 Mon Sep 17 00:00:00 2001
From: Manoop Talasila <talasila@research.att.com>
Date: Thu, 6 Apr 2017 16:37:05 -0400
Subject: onap nexus url added

Change-Id: I6a35a127974060b977ed472e892c9ed1f9a9fc31
Signed-off-by: Manoop Talasila <talasila@research.att.com>
---
 dcae_dmaapbc_client/pom.xml | 20 ++++++++++++----
 dcae_dmaapbc_model/pom.xml  | 10 +++++---
 dcae_dmaapbc_webapp/pom.xml | 58 +++++++++++++++++++--------------------------
 pom.xml                     | 13 +++++++---
 4 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/dcae_dmaapbc_client/pom.xml b/dcae_dmaapbc_client/pom.xml
index 0623dca..a65f1f8 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,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>${nexusproxy}/${stagingNexusPath}</url>
 		</repository>
 	</repositories>
 
@@ -64,7 +74,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 +203,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 e7f2027..67a5637 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 0b3c2fb..d84f1ba 100644
--- a/dcae_dmaapbc_webapp/pom.xml
+++ b/dcae_dmaapbc_webapp/pom.xml
@@ -27,27 +27,48 @@
 		<build.number>0</build.number>
 		<sonar.exclusions>**.js</sonar.exclusions>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<sitePath>/content/sites/site/org/openecomp/ui/dmaapbc/${project.version}</sitePath>
+		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 	</properties>
 
+	<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>
+
 	<repositories>
 		<repository>
 			<!-- 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>
 
@@ -132,35 +153,6 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<!-- 
-			Generate javadoc jar; see profile for Java 8.
-			This attempts to run dot (of graphviz), but failure 
-			(missing program) does not stop the build. 
-			-->
-			<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>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index bccbd53..96f0731 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>
-- 
cgit 1.2.3-korg