summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.DS_Storebin0 -> 6148 bytes
-rwxr-xr-xscripts/deploy.sh8
-rw-r--r--vnfs/.DS_Storebin10244 -> 10244 bytes
-rw-r--r--vnfs/VES/pom.xml13
-rw-r--r--vnfs/VESreporting_vFW/pom.xml13
-rw-r--r--vnfs/VESreporting_vLB/pom.xml13
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml15
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/pom.xml12
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml14
-rw-r--r--vnfs/vFW/pg_streams/pom.xml13
-rw-r--r--vnfs/vLB/.DS_Storebin10244 -> 10244 bytes
-rw-r--r--vnfs/vLB/DNSClient/pom.xml16
-rw-r--r--vnfs/vLB/DNSManager/pom.xml16
-rw-r--r--vnfs/vLB/dns_streams/pom.xml12
14 files changed, 125 insertions, 20 deletions
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..4627795c
--- /dev/null
+++ b/.DS_Store
Binary files differ
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index e1c0bbba..9489d565 100755
--- 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 a7497018..d4eb784b 100644
--- a/vnfs/.DS_Store
+++ b/vnfs/.DS_Store
Binary files differ
diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index 983fd884..da8d0ea4 100644
--- 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 2c1b2254..c1fb551f 100644
--- 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 9d3e7bd3..51e93976 100644
--- 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 352d4476..cb3903a9 100644
--- 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 40a792b4..8702d240 100755
--- 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 0d7e4b17..ae473326 100755
--- 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 3511b6b0..9c505ab8 100644
--- 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 9a784d0f..6f9c5d55 100644
--- a/vnfs/vLB/.DS_Store
+++ b/vnfs/vLB/.DS_Store
Binary files differ
diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index 42d987ce..3084f9c3 100644
--- 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 d77468cc..17f3b143 100644
--- 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 8fd807cf..86a18781 100644
--- 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>