From 53574ba587cb9f201e6ed1634f3c734d4156d194 Mon Sep 17 00:00:00 2001
From: Ruchira Agarwal <ra1926@att.com>
Date: Fri, 27 Jul 2018 18:47:27 +0000
Subject: [PATCH 1/1] fix CCSDK parent poms

Fix XML comment, remove maven-source-plugin block to avoid double sources.jar upload to nexus

Change-Id: I5500adf2e1471565397d5919c23aebf8b84e670a
Issue-ID: CCSDK-409
Signed-off-by: Ruchira Agarwal <ra1926@att.com>
---
 odlparent/binding-parent/pom.xml        | 22 ++--------------------
 odlparent/bundle-parent/pom.xml         | 22 ++--------------------
 odlparent/client-parent/pom.xml         |  2 +-
 odlparent/feature-repo-parent/pom.xml   | 22 ++--------------------
 odlparent/karaf4-parent/pom.xml         | 22 ++--------------------
 odlparent/mdsal-it-parent/pom.xml       | 22 ++--------------------
 odlparent/odlparent-lite/pom.xml        | 22 ++--------------------
 odlparent/odlparent/pom.xml             | 22 ++--------------------
 odlparent/single-feature-parent/pom.xml | 22 ++--------------------
 9 files changed, 17 insertions(+), 161 deletions(-)

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 00800b65..bd580b0f 100755
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1195,24 +1195,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index ff841b5f..71547082 100755
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1088,24 +1088,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index 034d92db..62e5f874 100644
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -22,7 +22,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 7ed4ef75..f899cdca 100755
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1088,24 +1088,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index 0fcf9a69..acb98133 100755
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1086,24 +1086,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 5c873379..c0dfd190 100755
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1089,24 +1089,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 0d4fe3d1..51b72d9a 100755
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1119,24 +1119,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index ac63b59d..26b288ba 100755
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1088,24 +1088,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index cb4833d8..a77d17b2 100755
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -30,7 +30,7 @@
 
 	<properties>
 
-		<!--- properties from oparent -->
+		<!-- properties from oparent -->
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -50,7 +50,7 @@
 		<swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 		<!-- If following file exist, auto-generation of sdk will be done -->
 		<swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
-		<!--- end of properties from oparent -->
+		<!-- end of properties from oparent -->
 
 		<!-- ONAP repositories -->
 		<onap.nexus.host>nexus.onap.org</onap.nexus.host>
@@ -1119,24 +1119,6 @@
 						</execution>
 					</executions>
 				</plugin>
-				<plugin>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.1</version>
-					<executions>
-						<execution>
-							<id>bundle-sources</id>
-							<phase>package</phase>
-							<goals>
-								<!-- produce source artifact for main project sources -->
-								<goal>jar-no-fork</goal>
-
-								<!-- produce source artifact for project test sources -->
-								<goal>test-jar-no-fork</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-
 
 			</plugins>
 
-- 
2.16.6