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>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 00800b6..bd580b0 100755 (executable)
--- 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 ff841b5..7154708 100755 (executable)
--- 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 034d92d..62e5f87 100644 (file)
--- 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 7ed4ef7..f899cdc 100755 (executable)
--- 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 0fcf9a6..acb9813 100755 (executable)
--- 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 5c87337..c0dfd19 100755 (executable)
--- 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 0d4fe3d..51b72d9 100755 (executable)
--- 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 ac63b59..26b288b 100755 (executable)
--- 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 cb4833d..a77d17b 100755 (executable)
--- 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>