From 804a7ed2294046441e14870eb1fbfc6863cc297b 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: I2dbc5c7ffdb9757ecf3d742164faa31b6b5c4566
Signed-off-by: Carsten Lund <lund@research.att.com>
---
 ncomp-core-model/pom.xml |  7 +------
 ncomp-core-tools/pom.xml | 30 ++++++++++++++++++++++--------
 ncomp-core-types/pom.xml | 32 +++++++++++++++++++++++---------
 pom.xml                  |  9 +--------
 4 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/ncomp-core-model/pom.xml b/ncomp-core-model/pom.xml
index ee08f34..be94255 100644
--- a/ncomp-core-model/pom.xml
+++ b/ncomp-core-model/pom.xml
@@ -7,14 +7,9 @@
 		<groupId>org.openecomp.ncomp.maven</groupId>
 		<artifactId>ncomp-maven-xcore</artifactId>
 		<version>1.1.0-SNAPSHOT</version>
-		<relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-xcore</relativePath>
+		<relativePath>../../ncomp.maven/ncomp-maven-xcore</relativePath>
 	</parent>
 
-	<properties>
-	  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
-
-	
 <build>
 		<sourceDirectory>src/main/xcore-gen</sourceDirectory>
 		<plugins>
diff --git a/ncomp-core-tools/pom.xml b/ncomp-core-tools/pom.xml
index f02113b..afea8b9 100644
--- a/ncomp-core-tools/pom.xml
+++ b/ncomp-core-tools/pom.xml
@@ -6,16 +6,30 @@
 	<version>1.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
+
+
+
+
+
 	<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>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<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>
+		<site.path>content/sites/site/org/openecomp/${GERRIT_PROJECT}/${project.artifactId}/${project.version}</site.path>
+		<site.urlroot>dav:${nexusproxy}</site.urlroot>
+		<site.url>${site.urlroot}/${site.path}/</site.url>
+	</properties>
+
+
+
+
+
 
 	
 <build>
@@ -81,7 +95,7 @@
 			</snapshotRepository>
 			<site>
 				<id>ecomp-site</id>
-				<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/core/${project.artifactId}/${project.version}/</url>
+			<url>${site.url}</url>
 			</site>
 		</distributionManagement>
 	
diff --git a/ncomp-core-types/pom.xml b/ncomp-core-types/pom.xml
index 4453832..acc72c8 100644
--- a/ncomp-core-types/pom.xml
+++ b/ncomp-core-types/pom.xml
@@ -5,16 +5,30 @@
   <artifactId>ncomp-core-types</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>
+
+
+
+
+
+	<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>
+		<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>
+		<site.path>content/sites/site/org/openecomp/${GERRIT_PROJECT}/${project.artifactId}/${project.version}</site.path>
+		<site.urlroot>dav:${nexusproxy}</site.urlroot>
+		<site.url>${site.urlroot}/${site.path}/</site.url>
+	</properties>
+
+
+
+
+
 
   	
 <build>
@@ -88,7 +102,7 @@
 			</snapshotRepository>
 			<site>
 				<id>ecomp-site</id>
-				<url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/core/${project.artifactId}/${project.version}/</url>
+			<url>${site.url}</url>
 			</site>
 		</distributionManagement>
 	
diff --git a/pom.xml b/pom.xml
index e3101f3..4ea2d7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,6 @@
 	<artifactId>ncomp-core</artifactId>
 	<packaging>pom</packaging>
 
-	<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>
-	<nexusproxy>https://nexus.onap.org</nexusproxy></properties>
-
-	
 		
 <build>
 				<plugins>
@@ -42,6 +35,6 @@
 		<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>
+		<relativePath>../ncomp.maven/ncomp-maven-base</relativePath>
 	</parent>
 </project>
-- 
cgit 1.2.3-korg