From 2ecd0a09d87503bb1c0e3f194221967d9899bbb4 Mon Sep 17 00:00:00 2001
From: Carsten Lund <lund@research.att.com>
Date: Sun, 23 Apr 2017 14:11:18 +0000
Subject: [DCAE-13] POM changes to enable JavaDoc

Change-Id: Ife7de96012d7965cb6918e0081ca65b07c0f30b8
Signed-off-by: Carsten Lund <lund@research.att.com>
---
 ncomp-utils-java-extra/pom.xml | 23 ++++++++++++++++++-----
 ncomp-utils-java/pom.xml       | 23 ++++++++++++++++++-----
 ncomp-utils-journaling/pom.xml | 23 ++++++++++++++++++-----
 pom.xml                        |  5 ++---
 4 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/ncomp-utils-java-extra/pom.xml b/ncomp-utils-java-extra/pom.xml
index 5594b84..dc13350 100644
--- a/ncomp-utils-java-extra/pom.xml
+++ b/ncomp-utils-java-extra/pom.xml
@@ -5,16 +5,29 @@
 	<artifactId>ncomp-utils-java-extra</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 
+
+
+
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases>
-		<openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
-		<openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases>
+		<openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots>
+		<openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy>
 		<openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
 		<openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
-	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
+		<groupPath>ncomp/utils</groupPath>
+		<site.path>content/sites/site/org/openecomp/${groupPath}/${project.artifactId}/${project.version}</site.path>
+		<site.urlroot>dav:${nexusproxy}</site.urlroot>
+		<site.url>${site.urlroot}/${site.path}/</site.url>
+	</properties>
+
+
+
+
 
 	
 <build>
@@ -116,7 +129,7 @@
 			</snapshotRepository>
 			<site>
 				<id>ecomp-site</id>
-				<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/utils/${project.artifactId}/${project.version}/</url>
+			<url>${site.url}</url>
 			</site>
 		</distributionManagement>
 	
diff --git a/ncomp-utils-java/pom.xml b/ncomp-utils-java/pom.xml
index efc183e..d78d9e5 100644
--- a/ncomp-utils-java/pom.xml
+++ b/ncomp-utils-java/pom.xml
@@ -5,16 +5,29 @@
 	<artifactId>ncomp-utils-java</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 
+
+
+
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases>
-		<openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
-		<openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases>
+		<openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots>
+		<openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy>
 		<openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
 		<openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
-	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
+		<groupPath>ncomp/utils</groupPath>
+		<site.path>content/sites/site/org/openecomp/${groupPath}/${project.artifactId}/${project.version}</site.path>
+		<site.urlroot>dav:${nexusproxy}</site.urlroot>
+		<site.url>${site.urlroot}/${site.path}/</site.url>
+	</properties>
+
+
+
+
 
 	
 <build>
@@ -116,7 +129,7 @@
 			</snapshotRepository>
 			<site>
 				<id>ecomp-site</id>
-				<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/utils/${project.artifactId}/${project.version}/</url>
+			<url>${site.url}</url>
 			</site>
 		</distributionManagement>
 	
diff --git a/ncomp-utils-journaling/pom.xml b/ncomp-utils-journaling/pom.xml
index b0a64f3..9e8898d 100644
--- a/ncomp-utils-journaling/pom.xml
+++ b/ncomp-utils-journaling/pom.xml
@@ -5,16 +5,29 @@
 	<artifactId>ncomp-utils-journaling</artifactId>
 	<version>1.1.0-SNAPSHOT</version>
 
+
+
+
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.target>1.7</maven.compiler.target>
 		<maven.compiler.source>1.7</maven.compiler.source>
-		<openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases>
-		<openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
-		<openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy>
+		<nexusproxy>https://nexus.onap.org</nexusproxy>
+		<openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases>
+		<openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots>
+		<openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy>
 		<openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId>
 		<openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId>
-	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
+		<groupPath>ncomp/utils</groupPath>
+		<site.path>content/sites/site/org/openecomp/${groupPath}/${project.artifactId}/${project.version}</site.path>
+		<site.urlroot>dav:${nexusproxy}</site.urlroot>
+		<site.url>${site.urlroot}/${site.path}/</site.url>
+	</properties>
+
+
+
+
 
 	
 <build>
@@ -116,7 +129,7 @@
 			</snapshotRepository>
 			<site>
 				<id>ecomp-site</id>
-				<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/utils/${project.artifactId}/${project.version}/</url>
+			<url>${site.url}</url>
 			</site>
 		</distributionManagement>
 	
diff --git a/pom.xml b/pom.xml
index 4bc4b36..7ed8861 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   <name>ncomp-utils</name>
 
   <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <site.path>content/sites/site/org/openecomp/ncomp/utils/${project.artifactId}/${project.version}</site.path>
   <nexusproxy>https://nexus.onap.org</nexusproxy></properties>
 
   
@@ -55,7 +55,7 @@
 <distributionManagement>
                         <site>
                                 <id>ecomp-site</id>
-                                <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/maven/${project.artifactId}/${project.version}/</url>
+                                <url>${site.url}</url>
                         </site>
                 </distributionManagement>
 
@@ -69,6 +69,5 @@
   	<groupId>org.openecomp.ncomp.maven</groupId>
   	<artifactId>ncomp-maven-base</artifactId>
   	<version>1.1.0-SNAPSHOT</version>
-  	<relativePath>../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath>
   </parent>
 </project>
-- 
cgit 1.2.3-korg