Update parent ID

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

8 files changed, 14 insertions, 131 deletions

diff --git a/check-blueprint-vs-input/pom.xml b/check-blueprint-vs-input/pom.xml
index d3a9e5a..2bf822f 100644
--- a/check-blueprint-vs-input/pom.xml
+++ b/check-blueprint-vs-input/pom.xml
@@ -123,26 +123,6 @@ 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>${project.parent.groupId}</MVN_PROJECT_GROUPID>
-              <MVN_PROJECT_ARTIFACTID>${project.parent.artifactId}</MVN_PROJECT_ARTIFACTID>
-              <MVN_PROJECT_VERSION>${project.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>
diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
index 92e5786..47cd624 100755
--- a/mvn-phase-lib.sh
+++ b/mvn-phase-lib.sh
@@ -254,9 +254,9 @@ upload_raw_file()
     echo "Unreconfnized deployment type, quit"
     exit
   fi
-  if [ ! -z "$MVN_PROJECT_MODULEID" ]; then
-    SEND_TO="$SEND_TO/$MVN_PROJECT_MODULEID"
-  fi
+  #if [ ! -z "$MVN_PROJECT_MODULEID" ]; then
+  #  SEND_TO="$SEND_TO/$MVN_PROJECT_MODULEID"
+  #fi
 
   echo "Sending ${OUTPUT_FILE} to Nexus: ${SEND_TO}"
   curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}-${MVN_PROJECT_VERSION}-${TIMESTAMP}"
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 094e642..091abb6 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -56,7 +56,7 @@ case $MVN_PHASE in
 clean)
   echo "==> clean phase script"
   case $MVN_PROJECT_MODULEID in
-  check-blueprint-vs-input | repackage) 
+  check-blueprint-vs-input | repackage)
     if [ -f makefile -o -f Makefile ];then make clean; else :; fi
     ;;
   *)
@@ -69,7 +69,7 @@ clean)
 generate-sources)
   echo "==> generate-sources phase script"
   case $MVN_PROJECT_MODULEID in
-  check-blueprint-vs-input | repackage) 
+  check-blueprint-vs-input | repackage)
     if [ -f makefile -o -f Makefile ];then make generate-sources; else :; fi
     ;;
   *)
@@ -80,7 +80,7 @@ generate-sources)
 compile)
   echo "==> compile phase script"
   case $MVN_PROJECT_MODULEID in
-  check-blueprint-vs-input | repackage) 
+  check-blueprint-vs-input | repackage)
     if [ -f makefile -o -f Makefile ];then make compile; else :; fi
     ;;
   *)
@@ -90,7 +90,7 @@ compile)
 test)
   echo "==> test phase script"
   case $MVN_PROJECT_MODULEID in
-  check-blueprint-vs-input | repackage) 
+  check-blueprint-vs-input | repackage)
     if [ -f makefile -o -f Makefile ];then make test; else :; fi
     ;;
   *)
@@ -103,7 +103,7 @@ test)
 package)
   echo "==> package phase script"
   case $MVN_PROJECT_MODULEID in
-  check-blueprint-vs-input | repackage) 
+  check-blueprint-vs-input | repackage)
     if [ -f makefile -o -f Makefile ];then make package; else :; fi
     ;;
   *)
@@ -113,7 +113,7 @@ package)
 install)
   echo "==> install phase script"
   case $MVN_PROJECT_MODULEID in
-  check-blueprint-vs-input | repackage) 
+  check-blueprint-vs-input | repackage)
     if [ -f makefile -o -f Makefile ];then make install; else :; fi
     ;;
   *)
@@ -123,7 +123,7 @@ install)
 deploy)
   echo "==> deploy phase script"
   case $MVN_PROJECT_MODULEID in
-  check-blueprint-vs-input | repackage) 
+  check-blueprint-vs-input | repackage)
     if [ -f makefile -o -f Makefile ];then make deploy
     else 
       # Upload all files (listed as additional deployment arguments) to Nexus
@@ -136,7 +136,10 @@ deploy)
     fi
     ;;
   *)
-    generate_pypirc_then_publish
+    # uncomment after we figure out how to use pypi.  this command expects that the credentials are passed in
+    # settings.xml, and the URL and serverid are passed in from either oparent or dcaegen2's root pom
+    # before this is ready comment below out
+    #generate_pypirc_then_publish
     ;;
   esac
   ;;
diff --git a/python-cbs-docker-client/pom.xml b/python-cbs-docker-client/pom.xml
index ad704b4..d426bcc 100644
--- a/python-cbs-docker-client/pom.xml
+++ b/python-cbs-docker-client/pom.xml
@@ -123,26 +123,6 @@ 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>${project.parent.groupId}</MVN_PROJECT_GROUPID>
-              <MVN_PROJECT_ARTIFACTID>${project.parent.artifactId}</MVN_PROJECT_ARTIFACTID>
-              <MVN_PROJECT_VERSION>${project.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>
diff --git a/python-dcae-policy/pom.xml b/python-dcae-policy/pom.xml
index 1d02fcd..4cf3c48 100644
--- a/python-dcae-policy/pom.xml
+++ b/python-dcae-policy/pom.xml
@@ -122,26 +122,6 @@ 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>${project.parent.groupId}</MVN_PROJECT_GROUPID>
-              <MVN_PROJECT_ARTIFACTID>${project.parent.artifactId}</MVN_PROJECT_ARTIFACTID>
-              <MVN_PROJECT_VERSION>${project.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>
diff --git a/python-discovery-client/pom.xml b/python-discovery-client/pom.xml
index 3aeb4db..d6ffd73 100644
--- a/python-discovery-client/pom.xml
+++ b/python-discovery-client/pom.xml
@@ -122,26 +122,6 @@ 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>${project.parent.groupId}</MVN_PROJECT_GROUPID>
-              <MVN_PROJECT_ARTIFACTID>${project.parent.artifactId}</MVN_PROJECT_ARTIFACTID>
-              <MVN_PROJECT_VERSION>${project.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>
diff --git a/python-dockering/pom.xml b/python-dockering/pom.xml
index b71e77c..3d5a192 100644
--- a/python-dockering/pom.xml
+++ b/python-dockering/pom.xml
@@ -122,26 +122,6 @@ 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>${project.parent.groupId}</MVN_PROJECT_GROUPID>
-              <MVN_PROJECT_ARTIFACTID>${project.parent.artifactId}</MVN_PROJECT_ARTIFACTID>
-              <MVN_PROJECT_VERSION>${project.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>
diff --git a/repackage/pom.xml b/repackage/pom.xml
index 20d24a3..f8457a3 100644
--- a/repackage/pom.xml
+++ b/repackage/pom.xml
@@ -123,26 +123,6 @@ 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>${project.parent.groupId}</MVN_PROJECT_GROUPID>
-              <MVN_PROJECT_ARTIFACTID>${project.parent.artifactId}</MVN_PROJECT_ARTIFACTID>
-              <MVN_PROJECT_VERSION>${project.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>