summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplatania <platania@research.att.com>2017-02-17 16:23:59 -0500
committerplatania <platania@research.att.com>2017-02-17 16:25:03 -0500
commit71984d1bffa966c366d47464a3acf4b440c9c7c9 (patch)
tree1b30b6e686a320fc9dacf818e5d0410206b0384d
parenta7417591cd3a600bbbb4fbbc6e30c376ea9b6218 (diff)
POM reorganization
Change-Id: I38076a941f6038aa8d5e67e2133c48231193430b Signed-off-by: platania <platania@research.att.com>
-rwxr-xr-xscripts/deploy.sh6
-rwxr-xr-xscripts/deploy_boot.sh11
-rwxr-xr-xscripts/deploy_heat.sh11
-rwxr-xr-xscripts/deploy_vfw_scripts.sh11
-rwxr-xr-xscripts/deploy_vlb_scripts.sh11
-rw-r--r--vnfs/.DS_Storebin10244 -> 10244 bytes
-rw-r--r--vnfs/VES/pom.xml10
-rw-r--r--vnfs/VESreporting_vFW/pom.xml8
-rw-r--r--vnfs/VESreporting_vLB/pom.xml9
-rw-r--r--vnfs/honeycomb_plugin/.DS_Storebin6148 -> 6148 bytes
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/.DS_Storebin10244 -> 8196 bytes
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml5
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/pom.xml3
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml3
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml1
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml1
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/settings.xml105
-rwxr-xr-xvnfs/pom.xml74
-rw-r--r--vnfs/settings.xml114
-rw-r--r--vnfs/vFW/.DS_Storebin8196 -> 8196 bytes
-rw-r--r--vnfs/vFW/pg_streams/.DS_Storebin6148 -> 6148 bytes
-rw-r--r--vnfs/vFW/pg_streams/pom.xml9
-rw-r--r--vnfs/vLB/.DS_Storebin10244 -> 10244 bytes
-rw-r--r--vnfs/vLB/DNSClient/pom.xml20
-rw-r--r--vnfs/vLB/DNSManager/pom.xml20
-rw-r--r--vnfs/vLB/dns_streams/pom.xml9
26 files changed, 46 insertions, 395 deletions
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 3cfe1945..e1c0bbba 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,7 +1,7 @@
#!/bin/bash
########## Define parameters ##########
-VERSION="1.0.0"
+VERSION="1.0.0-SNAPSHOT"
PATH_TO_BOOT="../boot"
PATH_TO_HEAT="../heat"
@@ -34,3 +34,7 @@ ls | xargs -I{} curl -k --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$VFW_
cd $PATH_TO_VLB
ls | xargs -I{} curl -k --netrc-file '${NETRC}' --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
####################################################
+
+########## Clean up ##########
+rm ${NETRC}
+##############################
diff --git a/scripts/deploy_boot.sh b/scripts/deploy_boot.sh
deleted file mode 100755
index fb256559..00000000
--- a/scripts/deploy_boot.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-source repo_config.txt
-
-SOURCE_DIR=../boot
-GROUP_ID=org.openecomp.demo.boot
-VERSION=1.0.0
-
-cd $SOURCE_DIR
-ls | xargs -I{} curl -v -u $REPO_USERNAME:$REPO_PASSWORD --upload-file {} $REPO_URL/$GROUP_ID/$VERSION/{}
-
diff --git a/scripts/deploy_heat.sh b/scripts/deploy_heat.sh
deleted file mode 100755
index 74a16201..00000000
--- a/scripts/deploy_heat.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-source repo_config.txt
-
-SOURCE_DIR=../heat
-GROUP_ID=org.openecomp.demo.heat
-VERSION=1.0.0
-
-cd $SOURCE_DIR
-ls | xargs -I{} curl -v -u $REPO_USERNAME:$REPO_PASSWORD --upload-file {} $REPO_URL/$GROUP_ID/$VERSION/{}
-
diff --git a/scripts/deploy_vfw_scripts.sh b/scripts/deploy_vfw_scripts.sh
deleted file mode 100755
index 49e7b019..00000000
--- a/scripts/deploy_vfw_scripts.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-source repo_config.txt
-
-SOURCE_DIR=../vnfs/vFW/scripts
-GROUP_ID=org.openecomp.demo.vnf.vfw
-VERSION=1.0.0
-
-cd $SOURCE_DIR
-ls | xargs -I{} curl -v -u $REPO_USERNAME:$REPO_PASSWORD --upload-file {} $REPO_URL/$GROUP_ID/$VERSION/{}
-
diff --git a/scripts/deploy_vlb_scripts.sh b/scripts/deploy_vlb_scripts.sh
deleted file mode 100755
index 88c431f6..00000000
--- a/scripts/deploy_vlb_scripts.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-source repo_config.txt
-
-SOURCE_DIR=../vnfs/vLB/scripts
-GROUP_ID=org.openecomp.demo.vnf.vlb
-VERSION=1.0.0
-
-cd $SOURCE_DIR
-ls | xargs -I{} curl -v -u $REPO_USERNAME:$REPO_PASSWORD --upload-file {} $REPO_URL/$GROUP_ID/$VERSION/{}
-
diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store
index b1f0b356..a7497018 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 0d535f6a..983fd884 100644
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -1,17 +1,17 @@
<!--<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">-->
<project>
-<parent>
+
+ <parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
-<relativePath>../pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf.ves</groupId>
<artifactId>ves</artifactId>
- <!-- <name>vfw_pg_streams</name>-->
- <version>1.0.0</version>
+
<build>
<plugins>
diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index f6eaef38..2c1b2254 100644
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -3,14 +3,14 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
-<relativePath>../pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf.ves</groupId>
<artifactId>ves_vfw_reporting</artifactId>
- <!-- <name>vfw_pg_streams</name>-->
- <version>1.0.0</version>
+
<build>
<plugins>
diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 04783951..9d3e7bd3 100644
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -1,17 +1,16 @@
<!--<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">-->
<project>
-<parent>
+ <parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
-<relativePath>../pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf.ves</groupId>
<artifactId>ves_vlb_reporting</artifactId>
- <!-- <name>vfw_pg_streams</name>-->
- <version>1.0.0</version>
+
<build>
<plugins>
diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store
index f20da4b2..a33a0741 100644
--- a/vnfs/honeycomb_plugin/.DS_Store
+++ b/vnfs/honeycomb_plugin/.DS_Store
Binary files differ
diff --git a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
index c7a6a7ae..0c92e6f3 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
+++ b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store
Binary files differ
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index 16cd604e..352d4476 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -21,8 +21,8 @@
<parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
- <relativePath>../../../pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../../pom.xml</relativePath>
</parent>
<properties>
@@ -241,4 +241,5 @@ done
</snapshotRepository>
</distributionManagement>
-->
+
</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
index 2da40d38..40a792b4 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-plugin-aggregator</artifactId>
- <version>1.0.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>sample-plugin-aggregator</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
@@ -55,4 +55,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index 0d8ddd77..0d7e4b17 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -18,14 +18,13 @@
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
<version>1.0.0</version>
-<relativePath>../../../pom.xml</relativePath>
+<relativePath>../../../../pom.xml</relativePath>
</parent>
-->
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-distribution</artifactId>
- <version>1.0.0</version>
<properties>
<main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
index 74506eb9..fc981026 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
@@ -23,7 +23,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-plugin-api</artifactId>
- <version>1.0.0</version>
<packaging>bundle</packaging>
<dependencyManagement>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
index 59f3c1f0..49ec1494 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
@@ -23,7 +23,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>sample-plugin-impl</artifactId>
- <version>1.0.0</version>
<packaging>bundle</packaging>
<properties>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/settings.xml b/vnfs/honeycomb_plugin/sample_plugin/settings.xml
deleted file mode 100644
index 28acd41a..00000000
--- a/vnfs/honeycomb_plugin/sample_plugin/settings.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <profiles>
- <profile>
- <id>fd.io-release</id>
- <repositories>
- <repository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>fd.io-snapshots</id>
- <repositories>
- <repository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
- <id>opendaylight-snapshots</id>
- <repositories>
- <repository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-shapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>fd.io-release</activeProfile>
- <activeProfile>fd.io-snapshots</activeProfile>
- <activeProfile>opendaylight-snapshots</activeProfile>
- </activeProfiles>
-</settings> \ No newline at end of file
diff --git a/vnfs/pom.xml b/vnfs/pom.xml
deleted file mode 100755
index df9f3243..00000000
--- a/vnfs/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Cisco and/or its affiliates.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---><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>org.opendaylight.odlparent</groupId>
- <artifactId>odlparent</artifactId>
- <version>1.6.2-Beryllium-SR2</version>
- </parent>
--->
- <groupId>org.openecomp.demo.vnf</groupId>
- <artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
- <name>demo-aggregator</name>
- <packaging>pom</packaging>
- <modelVersion>4.0.0</modelVersion>
- <prerequisites>
- <maven>3.1.1</maven>
- </prerequisites>
-
- <modules>
- <module>honeycomb_plugin/sample_plugin</module>
- <module>vFW/pg_streams</module>
- <module>vLB/dns_streams</module>
- <module>VES</module>
- <module>VESreporting_vLB</module>
- <module>VESreporting_vFW</module>
- </modules>
-
- <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <repository>
- <id>ecomp-releases</id>
- <name>Demo Release Repository</name>
- <url>${nexusproxy}/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>Demo Snapshot Repository</name>
- <url>${nexusproxy}/content/repositories/snapshots/</url>
- </snapshotRepository>
-
-</project>
diff --git a/vnfs/settings.xml b/vnfs/settings.xml
deleted file mode 100644
index 4787fbcc..00000000
--- a/vnfs/settings.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <profiles>
- <profile>
- <id>fd.io-release</id>
- <repositories>
- <repository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-mirror</id>
- <name>fd.io-mirror</name>
- <url>https://nexus.fd.io/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>fd.io-snapshots</id>
- <repositories>
- <repository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>fd.io-snapshot</id>
- <name>fd.io-snapshot</name>
- <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- <profile>
- <id>opendaylight-snapshots</id>
- <repositories>
- <repository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-shapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>fd.io-release</activeProfile>
- <activeProfile>fd.io-snapshots</activeProfile>
- <activeProfile>opendaylight-snapshots</activeProfile>
- </activeProfiles>
-
-<servers>
- <server>
- <id>nexus</id>
- <username></username>
- <password></password>
- </server>
- </servers>
-
-</settings>
diff --git a/vnfs/vFW/.DS_Store b/vnfs/vFW/.DS_Store
index 0a075752..7ada677e 100644
--- a/vnfs/vFW/.DS_Store
+++ b/vnfs/vFW/.DS_Store
Binary files differ
diff --git a/vnfs/vFW/pg_streams/.DS_Store b/vnfs/vFW/pg_streams/.DS_Store
index 7e99a062..5008ddfc 100644
--- a/vnfs/vFW/pg_streams/.DS_Store
+++ b/vnfs/vFW/pg_streams/.DS_Store
Binary files differ
diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index 41358e73..3511b6b0 100644
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -1,18 +1,17 @@
<!--<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">-->
<project>
-<parent>
+ <parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
-<relativePath>../../pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf.vfw</groupId>
<artifactId>vfw_pg_streams</artifactId>
- <!-- <name>vfw_pg_streams</name>-->
- <version>1.0.0</version>
+
<build>
<plugins>
diff --git a/vnfs/vLB/.DS_Store b/vnfs/vLB/.DS_Store
index 5866ceef..9a784d0f 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 f056d0c5..42d987ce 100644
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -1,11 +1,17 @@
<project>
+ <parent>
+ <groupId>org.openecomp.demo.vnf</groupId>
+ <artifactId>demo-aggregator</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf.lb</groupId>
<artifactId>dns-client</artifactId>
<name>DNS Client</name>
<packaging>jar</packaging>
- <version>1.0.0</version>
<build>
<plugins>
@@ -40,16 +46,4 @@
</plugins>
</build>
- <distributionManagement>
- <repository>
- <id>ecomp-releases</id>
- <name>Demo Release Repository</name>
- <url>${nexusproxy}/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>Demo Snapshot Repository</name>
- <url>${nexusproxy}/content/repositories/snapshots/</url>
- </snapshotRepository>
-
</project>
diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index acfa3d9c..d77468cc 100644
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -1,11 +1,17 @@
<project>
+ <parent>
+ <groupId>org.openecomp.demo.vnf</groupId>
+ <artifactId>demo-aggregator</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf.lb</groupId>
<artifactId>dns-manager</artifactId>
<name>DNS Manager</name>
<packaging>jar</packaging>
- <version>1.0.0</version>
<build>
<plugins>
@@ -40,16 +46,4 @@
</plugins>
</build>
- <distributionManagement>
- <repository>
- <id>ecomp-releases</id>
- <name>Demo Release Repository</name>
- <url>${nexusproxy}/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>ecomp-snapshots</id>
- <name>Demo Snapshot Repository</name>
- <url>${nexusproxy}/content/repositories/snapshots/</url>
- </snapshotRepository>
-
</project>
diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index a0f33ff0..8fd807cf 100644
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -1,18 +1,17 @@
<!--<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">-->
<project>
-<parent>
+ <parent>
<groupId>org.openecomp.demo.vnf</groupId>
<artifactId>demo-aggregator</artifactId>
- <version>1.0.0</version>
-<relativePath>../../pom.xml</relativePath>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.openecomp.demo.vnf.vlb</groupId>
<artifactId>vlb_dns_streams</artifactId>
- <!-- <name>vfw_pg_streams</name>-->
- <version>1.0.0</version>
+
<build>
<plugins>