Update POM files

Change-Id: I0cccdeefc5397a3f3fee95380b113f12446343f2
Signed-off-by: platania <platania@research.att.com>

diff --git a/.DS_Store b/.DS_Store
new file mode 100644 (file)
index 0000000..4627795
Binary files /dev/null and b/.DS_Store differ

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index e1c0bbb..9489d56 100755 (executable)
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -3,10 +3,10 @@
 ########## Define parameters ##########
 VERSION="1.0.0-SNAPSHOT"
 
-PATH_TO_BOOT="../boot"
-PATH_TO_HEAT="../heat"
-PATH_TO_VFW="../vnfs/vFW/scripts"
-PATH_TO_VLB="../vnfs/vLB/scripts"
+PATH_TO_BOOT="boot"
+PATH_TO_HEAT="heat"
+PATH_TO_VFW="vnfs/vFW/scripts"
+PATH_TO_VLB="vnfs/vLB/scripts"
 
 BOOT_GROUP_ID="org.openecomp.demo.boot"
 HEAT_GROUP_ID="org.openecomp.demo.heat"

diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store
index a749701..d4eb784 100644 (file)
Binary files a/vnfs/.DS_Store and b/vnfs/.DS_Store differ

diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index 983fd88..da8d0ea 100644 (file)
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -50,6 +50,19 @@
   </configuration>
 </plugin>
 
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index 2c1b225..c1fb551 100644 (file)
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -48,6 +48,19 @@
   </configuration>
 </plugin>
 
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <configuration>
+                <skip>true</skip>
+            </configuration>
+            <executions>
+                <execution>
+                    <phase>none</phase>
+                </execution>
+            </executions>
+        </plugin>
+
     </plugins>
   </build>
 

diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 9d3e7bd..51e9397 100644 (file)
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -48,6 +48,19 @@
   </configuration>
 </plugin>
 
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index 352d447..cb3903a 100644 (file)
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -226,6 +226,21 @@ done
                         </execution>
                     </executions>
                 </plugin>
+
+                <!-- Disable exec-maven-plugin -->
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>none</phase>
+                        </execution>
+                    </executions>
+                </plugin>
+
             </plugins>
         </pluginManagement>
     </build>

diff --git a/vnfs/honeycomb_plugin/sample_plugin/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
index 40a792b..8702d24 100755 (executable)
--- a/vnfs/honeycomb_plugin/sample_plugin/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
@@ -53,6 +53,18 @@
           <skip>true</skip>
         </configuration>
       </plugin>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <configuration>
+                <skip>true</skip>
+            </configuration>
+            <executions>
+                <execution>
+                    <phase>none</phase>
+                </execution>
+            </executions>
+        </plugin>
     </plugins>
   </build>
 

diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index 0d7e4b1..ae47332 100755 (executable)
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 
- <!-- <parent>
-    <groupId>io.fd.honeycomb.common</groupId>
-    <artifactId>minimal-distribution-parent</artifactId>
-    <version>1.16.9</version>
-  </parent>
--->
 <parent>
 <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
     <version>1.16.9</version>
 <relativePath>../parent-pom/pom.xml</relativePath>
 </parent>
-<!--
-<parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
-    <artifactId>demo-aggregator</artifactId>
-    <version>1.0.0</version>
-<relativePath>../../../../pom.xml</relativePath>
-  </parent>
--->
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.openecomp.demo.vnf</groupId>

diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index 3511b6b..9c505ab 100644 (file)
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -49,6 +49,19 @@
   </configuration>
 </plugin>
 
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

diff --git a/vnfs/vLB/.DS_Store b/vnfs/vLB/.DS_Store
index 9a784d0..6f9c5d5 100644 (file)
Binary files a/vnfs/vLB/.DS_Store and b/vnfs/vLB/.DS_Store differ

diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index 42d987c..3084f9c 100644 (file)
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -8,7 +8,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.lb</groupId>
+  <groupId>org.openecomp.demo.vnf.vlb</groupId>
   <artifactId>dns-client</artifactId>
   <name>DNS Client</name>
   <packaging>jar</packaging>
@@ -43,6 +43,20 @@
         <skip>false</skip>
       </configuration>
      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index d77468c..17f3b14 100644 (file)
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -8,7 +8,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.lb</groupId>
+  <groupId>org.openecomp.demo.vnf.vlb</groupId>
   <artifactId>dns-manager</artifactId>
   <name>DNS Manager</name>
   <packaging>jar</packaging>
@@ -43,6 +43,20 @@
         <skip>false</skip>
       </configuration>
      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>
 

diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index 8fd807c..86a1878 100644 (file)
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -50,6 +50,18 @@
   </configuration>
 </plugin>
 
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
 
     </plugins>
   </build>