From 77a1397a4d07b70ab9dd35a6ef12f55231fd77d8 Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Thu, 7 Sep 2017 04:06:32 +0000
Subject: Fix pom and mvn script

Issue-Id: DCAEGEN2-60
Change-Id: I18134f2e2b2af7a40789ebec0379c4ee8e58370f
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 relationships/pom.xml | 84 +++++++++++++--------------------------------------
 relationships/tox.ini | 20 ++++++++++++
 2 files changed, 41 insertions(+), 63 deletions(-)
 create mode 100644 relationships/tox.ini

(limited to 'relationships')

diff --git a/relationships/pom.xml b/relationships/pom.xml
index e289ab5..2cfbec5 100644
--- a/relationships/pom.xml
+++ b/relationships/pom.xml
@@ -32,6 +32,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <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 +122,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 +176,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 +189,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 +202,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 +215,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 +228,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 +241,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 +254,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>
diff --git a/relationships/tox.ini b/relationships/tox.ini
new file mode 100644
index 0000000..2e31087
--- /dev/null
+++ b/relationships/tox.ini
@@ -0,0 +1,20 @@
+[tox]
+envlist = py27
+[testenv]
+deps=
+    pytest
+    uuid==1.30
+    cloudify==3.4
+    bottle==0.12.7
+    cloudify-plugins-common==3.4
+    cloudify-rest-client==3.4
+    Jinja2==2.7.2
+    MarkupSafe==0.23
+    networkx==1.8.1
+    pika==0.9.14
+    proxy-tools==0.1.0
+    python-consul==0.6.1
+    requests==2.7.0
+    requests-toolbelt==0.7.0
+    six==1.10.0
+commands=pytest
-- 
cgit 1.2.3-korg