Fix pom.xml

Issue-Id: DCAEGEN2-60
Change-Id: Icc35867e2dcfa2105a4eb718e02b777a301ab04e
Signed-off-by: Lusheng Ji <lji@research.att.com>

diff --git a/dcae-cli/pom.xml b/dcae-cli/pom.xml
index 0124b48..e7f5534 100644 (file)
--- a/dcae-cli/pom.xml
+++ b/dcae-cli/pom.xml
@@ -20,11 +20,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <!--parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>oparent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent-->
   <parent>
     <groupId>org.onap.dcaegen2.platform</groupId>
     <artifactId>cli</artifactId>
@@ -39,7 +34,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonar.sources>.</sonar.sources>
     <!-- customize the SONARQUBE URL -->
-    <sonar.host.url>http://localhost:9000</sonar.host.url>
+    <!-- sonar.host.url>http://localhost:9000</sonar.host.url -->
     <!-- below are language dependent -->
     <!-- for Python -->
     <sonar.language>py</sonar.language>
@@ -52,19 +47,11 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <sonar.inclusions>**/*.js</sonar.inclusions>
     -->
   </properties>
-
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>sonar-maven-plugin</artifactId>
-          <version>2.7.1</version>
-        </plugin>
-
-        <!-- nexus-staging-maven-plugin is called during deploy phase by default behavior.
-         we do not need it -->
+        <!-- the following plugins are invoked from oparent, we do not need them -->
         <plugin>
           <groupId>org.sonatype.plugins</groupId>
           <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -73,9 +60,69 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <!-- This version supports the "deployAtEnd" parameter -->
+          <version>2.8</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- first disable the default Java plugins at various stages -->
+        <!-- maven-resources-plugin is called during "*resource" phases by default behavior.  it prepares 
+         the resources dir.  we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.6</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- maven-compiler-plugin is called during "compile" phases by default behavior.  we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.1</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- maven-jar-plugin is called during "compile" phase by default behavior.  we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.4</version>
+          <executions>
+            <execution>
+              <id>default-jar</id>
+              <phase/>
+            </execution>
+          </executions>
+        </plugin>
+        <!-- maven-install-plugin is called during "install" phase by default behavior.  it tries to copy stuff under 
+         target dir to ~/.m2.  we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.4</version>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
+        <!-- maven-surefire-plugin is called during "test" phase by default behavior.  it triggers junit test.
+         we do not need it -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.12.4</version>
+          <configuration>
+            <skipTests>true</skipTests>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
-
     <plugins>
       <!-- plugin>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -95,65 +142,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
           </execution>
         </executions>
       </plugin -->
-
-      <!-- first disable the default Java plugins at various stages -->
-      <!-- maven-resources-plugin is called during "*resource" phases by default behavior.  it prepares the resources
-       dir.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <!-- maven-compiler-plugin is called during "compile" phases by default behavior.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <!-- maven-jar-plugin is called during "compile" phase by default behavior.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <executions>
-          <execution>
-            <id>default-jar</id>
-            <phase/>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- maven-install-plugin is called during "install" phase by default behavior.  it tries to copy stuff under 
-       target dir to ~/.m2.  we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <!-- maven-surefire-plugin is called during "test" phase by default behavior.  it triggers junit test.
-       we do not need it -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12.4</version>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </plugin>
-
-
       <!-- now we configure custom action (calling a script) at various lifecycle phases -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -163,7 +151,9 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
           <execution>
             <id>clean phase script</id>
             <phase>clean</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
               <arguments>
@@ -172,19 +162,20 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>generate-sources script</id>
             <phase>generate-sources</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -193,19 +184,20 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>compile script</id>
             <phase>compile</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -214,19 +206,20 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>package script</id>
             <phase>package</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -235,19 +228,20 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>test script</id>
             <phase>test</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -256,19 +250,20 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>install script</id>
             <phase>install</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -277,19 +272,20 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
-
           <execution>
             <id>deploy script</id>
             <phase>deploy</phase>
-            <goals><goal>exec</goal></goals>
+            <goals>
+              <goal>exec</goal>
+            </goals>
             <configuration>
               <executable>mvn-phase-script.sh</executable>
               <arguments>
@@ -298,12 +294,12 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               </arguments>
               <environmentVariables>
                 <!-- make mvn properties as env for our script -->
-                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> 
-                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> 
-                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> 
-                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> 
-                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL--> 
-              </environmentVariables> 
+                <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+                <!--MVN_DOCKERREG_URL>${docker.push.registry}</MVN_DOCKERREG_URL-->
+              </environmentVariables>
             </configuration>
           </execution>
         </executions>