POM changes to activaate docker profile

Change-Id: Iecd1267c14bdc2cd433f6e1fa42030273ebaeb1e
Issue-ID: MULTICLOUD-704
Signed-off-by: Sudhakar Reddy <Sudhakar.Reddy@amdocs.com>

diff --git a/azure/pom.xml b/azure/pom.xml
index 4fd5ce6..e7ab780 100644 (file)
--- a/azure/pom.xml
+++ b/azure/pom.xml
@@ -30,9 +30,68 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
+        <sonar.sources>.</sonar.sources>
+        <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
+        <sonar.python.coverage.reportPath>azure/coverage.xml</sonar.python.coverage.reportPath>
+        <sonar.language>py</sonar.language>
+        <sonar.pluginName>Python</sonar.pluginName>
+        <sonar.inclusions>**/*.py</sonar.inclusions>
+        <sonar.exclusions>**/tests/*,setup.py,**/azure/aria/**</sonar.exclusions>
     </properties>
     <build>
+        <pluginManagement>
         <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <version>1.2.1</version>
+              <configuration>
+                <executable>${project.basedir}/sonar.sh</executable>
+                <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>
+                </environmentVariables>
+              </configuration>
+            </plugin>
+        </plugins>
+      </pluginManagement>
+        <plugins>
+            <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.2.1</version>
+            <executions>
+              <execution>
+                <id>clean phase script</id>
+                <phase>clean</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <arguments>
+                    <argument>__</argument>
+                    <argument>clean</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+              <execution>
+                <id>test script</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <arguments>
+                    <argument>__</argument>
+                    <argument>test</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+        </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>

diff --git a/sonar.sh b/azure/sonar.sh
similarity index 99%
rename from sonar.sh
rename to azure/sonar.sh
index eee6415..9ed0168 100755 (executable)
--- a/sonar.sh
+++ b/azure/sonar.sh
@@ -45,10 +45,8 @@ echo "MVN_PROJECT_VERSION is             [$MVN_PROJECT_VERSION]"
 run_tox_test()
 {
   set -x
-  cd azure
   CURDIR=$(pwd)
   TOXINIS=$(find . -name "tox.ini")
-  cd ..
   for TOXINI in "${TOXINIS[@]}"; do
     DIR=$(echo "$TOXINI" | rev | cut -f2- -d'/' | rev)
     cd "${CURDIR}/${DIR}"

diff --git a/pom.xml b/pom.xml
index 2f43546..33ed62a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,74 +25,7 @@
     <packaging>pom</packaging>
     <name>multicloud-azure</name>
     <description>multicloud azure</description>
-    <properties>
-        <encoding>UTF-8</encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <nexusproxy>https://nexus.onap.org</nexusproxy>
-
-        <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
-        <sonar.sources>.</sonar.sources>
-        <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-        <sonar.python.coverage.reportPath>azure/coverage.xml</sonar.python.coverage.reportPath>
-        <sonar.language>py</sonar.language>
-        <sonar.pluginName>Python</sonar.pluginName>
-        <sonar.inclusions>**/*.py</sonar.inclusions>
-        <sonar.exclusions>**/tests/*,setup.py,**/azure/aria/**</sonar.exclusions>
-    </properties>
-    <build>
-      <pluginManagement>
-        <plugins>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>exec-maven-plugin</artifactId>
-              <version>1.2.1</version>
-              <configuration>
-                <executable>${session.executionRootDirectory}/sonar.sh</executable>
-                <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>
-                </environmentVariables>
-              </configuration>
-            </plugin>
-        </plugins>
-      </pluginManagement>
-        <plugins>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.2.1</version>
-            <executions>
-              <execution>
-                <id>clean phase script</id>
-                <phase>clean</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <arguments>
-                    <argument>__</argument>
-                    <argument>clean</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-              <execution>
-                <id>test script</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <arguments>
-                    <argument>__</argument>
-                    <argument>test</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-        </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>azure</module>
+    </modules>
 </project>