Merge "Fix pom and mvn script"

1 files changed, 22 insertions, 63 deletions

diff --git a/cdap/pom.xml b/cdap/pom.xml
index 482e0a8..2004c7e 100644
--- a/cdap/pom.xml
+++ b/cdap/pom.xml
@@ -30,8 +30,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <name>cdap-plugin</name>
   <version>1.0.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <sonar.skip>true</sonar.skip>
     <sonar.sources>.</sonar.sources>
     <!-- customize the SONARQUBE URL -->
     <!-- sonar.host.url>http://localhost:9000</sonar.host.url -->
@@ -121,6 +123,26 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
             <skipTests>true</skipTests>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.2.1</version>
+          <configuration>
+            <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+            <environmentVariables>
+              <!-- make mvn properties as env for our script -->
+              <MVN_PROJECT_GROUPID>${parent.groupId}</MVN_PROJECT_GROUPID>
+              <MVN_PROJECT_ARTIFACTID>${parent.artifactId}</MVN_PROJECT_ARTIFACTID>
+              <MVN_PROJECT_VERSION>${parent.version}</MVN_PROJECT_VERSION>
+              <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+              <MVN_RAWREPO_BASEURL_UPLOAD>${onap.nexus.rawrepo.baseurl.upload}</MVN_RAWREPO_BASEURL_UPLOAD>
+              <MVN_RAWREPO_BASEURL_DOWNLOAD>${onap.nexus.rawrepo.baseurl.download}</MVN_RAWREPO_BASEURL_DOWNLOAD>
+              <MVN_RAWREPO_SERVERID>${onap.nexus.rawrepo.serverid}</MVN_RAWREPO_SERVERID>
+              <MVN_DOCKERREGISTRY_DAILY>${onap.nexus.dockerregistry.daily}</MVN_DOCKERREGISTRY_DAILY>
+              <MVN_DOCKERREGISTRY_RELEASE>${onap.nexus.dockerregistry.release}</MVN_DOCKERREGISTRY_RELEASE>
+            </environmentVariables>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -155,19 +177,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>clean</argument>
               </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>
             </configuration>
           </execution>
           <execution>
@@ -177,19 +190,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>mvn-phase-script.sh</executable>
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>generate-sources</argument>
               </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>
             </configuration>
           </execution>
           <execution>
@@ -199,19 +203,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>mvn-phase-script.sh</executable>
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>compile</argument>
               </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>
             </configuration>
           </execution>
           <execution>
@@ -221,19 +216,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>mvn-phase-script.sh</executable>
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>package</argument>
               </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>
             </configuration>
           </execution>
           <execution>
@@ -243,19 +229,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>mvn-phase-script.sh</executable>
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>test</argument>
               </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>
             </configuration>
           </execution>
           <execution>
@@ -265,19 +242,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>mvn-phase-script.sh</executable>
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>install</argument>
               </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>
             </configuration>
           </execution>
           <execution>
@@ -287,19 +255,10 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>mvn-phase-script.sh</executable>
               <arguments>
                 <argument>${project.artifactId}</argument>
                 <argument>deploy</argument>
               </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>
             </configuration>
           </execution>
         </executions>