From 71984d1bffa966c366d47464a3acf4b440c9c7c9 Mon Sep 17 00:00:00 2001 From: platania Date: Fri, 17 Feb 2017 16:23:59 -0500 Subject: POM reorganization Change-Id: I38076a941f6038aa8d5e67e2133c48231193430b Signed-off-by: platania --- vnfs/.DS_Store | Bin 10244 -> 10244 bytes vnfs/VES/pom.xml | 10 +- vnfs/VESreporting_vFW/pom.xml | 8 +- vnfs/VESreporting_vLB/pom.xml | 9 +- vnfs/honeycomb_plugin/.DS_Store | Bin 6148 -> 6148 bytes vnfs/honeycomb_plugin/sample_plugin/.DS_Store | Bin 10244 -> 8196 bytes .../sample_plugin/parent-pom/pom.xml | 5 +- vnfs/honeycomb_plugin/sample_plugin/pom.xml | 3 +- .../sample_plugin/sample-distribution/pom.xml | 3 +- .../sample_plugin/sample-plugin-api/pom.xml | 1 - .../sample_plugin/sample-plugin-impl/pom.xml | 1 - vnfs/honeycomb_plugin/sample_plugin/settings.xml | 105 ------------------- vnfs/pom.xml | 74 ------------- vnfs/settings.xml | 114 --------------------- vnfs/vFW/.DS_Store | Bin 8196 -> 8196 bytes vnfs/vFW/pg_streams/.DS_Store | Bin 6148 -> 6148 bytes vnfs/vFW/pg_streams/pom.xml | 9 +- vnfs/vLB/.DS_Store | Bin 10244 -> 10244 bytes vnfs/vLB/DNSClient/pom.xml | 20 ++-- vnfs/vLB/DNSManager/pom.xml | 20 ++-- vnfs/vLB/dns_streams/pom.xml | 9 +- 21 files changed, 41 insertions(+), 350 deletions(-) delete mode 100644 vnfs/honeycomb_plugin/sample_plugin/settings.xml delete mode 100755 vnfs/pom.xml delete mode 100644 vnfs/settings.xml (limited to 'vnfs') diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store index b1f0b356..a7497018 100644 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 0d535f6a..983fd884 100644 --- a/vnfs/VES/pom.xml +++ b/vnfs/VES/pom.xml @@ -1,17 +1,17 @@ - + + org.openecomp.demo.vnf demo-aggregator - 1.0.0 -../pom.xml + 1.0.0-SNAPSHOT + ../../pom.xml 4.0.0 org.openecomp.demo.vnf.ves ves - - 1.0.0 + 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 @@ org.openecomp.demo.vnf demo-aggregator - 1.0.0 -../pom.xml + 1.0.0-SNAPSHOT + ../../pom.xml + 4.0.0 org.openecomp.demo.vnf.ves ves_vfw_reporting - - 1.0.0 + 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 @@ - + org.openecomp.demo.vnf demo-aggregator - 1.0.0 -../pom.xml + 1.0.0-SNAPSHOT + ../../pom.xml 4.0.0 org.openecomp.demo.vnf.ves ves_vlb_reporting - - 1.0.0 + diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store index f20da4b2..a33a0741 100644 Binary files a/vnfs/honeycomb_plugin/.DS_Store and b/vnfs/honeycomb_plugin/.DS_Store differ diff --git a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store index c7a6a7ae..0c92e6f3 100644 Binary files a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store and b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store 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 @@ org.openecomp.demo.vnf demo-aggregator - 1.0.0 - ../../../pom.xml + 1.0.0-SNAPSHOT + ../../../../pom.xml @@ -241,4 +241,5 @@ done --> + 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 @@ org.openecomp.demo.vnf sample-plugin-aggregator - 1.0.0 + 1.0.0-SNAPSHOT sample-plugin-aggregator pom 4.0.0 @@ -55,4 +55,5 @@ + 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 @@ org.openecomp.demo.vnf demo-aggregator 1.0.0 -../../../pom.xml +../../../../pom.xml --> 4.0.0 org.openecomp.demo.vnf sample-distribution - 1.0.0 io.fd.honeycomb.vpp.integration.distro.Main 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 @@ 4.0.0 org.openecomp.demo.vnf sample-plugin-api - 1.0.0 bundle 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 @@ 4.0.0 org.openecomp.demo.vnf sample-plugin-impl - 1.0.0 bundle 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 @@ - - - - - - - fd.io-release - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/groups/public/ - - true - never - - - false - - - - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/repositories/public/ - - true - never - - - false - - - - - - - fd.io-snapshots - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-shapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - fd.io-release - fd.io-snapshots - opendaylight-snapshots - - \ 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 @@ - - - - - org.openecomp.demo.vnf - demo-aggregator - 1.0.0 - demo-aggregator - pom - 4.0.0 - - 3.1.1 - - - - honeycomb_plugin/sample_plugin - vFW/pg_streams - vLB/dns_streams - VES - VESreporting_vLB - VESreporting_vFW - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - - - - ecomp-releases - Demo Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - Demo Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - - 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 @@ - - - - - - - fd.io-release - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/groups/public/ - - true - never - - - false - - - - - - fd.io-mirror - fd.io-mirror - https://nexus.fd.io/content/repositories/public/ - - true - never - - - false - - - - - - - fd.io-snapshots - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - fd.io-snapshot - fd.io-snapshot - https://nexus.fd.io/content/repositories/fd.io.snapshot/ - - false - - - true - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-shapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - fd.io-release - fd.io-snapshots - opendaylight-snapshots - - - - - nexus - - - - - - diff --git a/vnfs/vFW/.DS_Store b/vnfs/vFW/.DS_Store index 0a075752..7ada677e 100644 Binary files a/vnfs/vFW/.DS_Store and b/vnfs/vFW/.DS_Store differ diff --git a/vnfs/vFW/pg_streams/.DS_Store b/vnfs/vFW/pg_streams/.DS_Store index 7e99a062..5008ddfc 100644 Binary files a/vnfs/vFW/pg_streams/.DS_Store and b/vnfs/vFW/pg_streams/.DS_Store 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 @@ - + org.openecomp.demo.vnf demo-aggregator - 1.0.0 -../../pom.xml + 1.0.0-SNAPSHOT + ../../../pom.xml 4.0.0 org.openecomp.demo.vnf.vfw vfw_pg_streams - - 1.0.0 + diff --git a/vnfs/vLB/.DS_Store b/vnfs/vLB/.DS_Store index 5866ceef..9a784d0f 100644 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 f056d0c5..42d987ce 100644 --- a/vnfs/vLB/DNSClient/pom.xml +++ b/vnfs/vLB/DNSClient/pom.xml @@ -1,11 +1,17 @@ + + org.openecomp.demo.vnf + demo-aggregator + 1.0.0-SNAPSHOT + ../../../pom.xml + + 4.0.0 org.openecomp.demo.vnf.lb dns-client DNS Client jar - 1.0.0 @@ -40,16 +46,4 @@ - - - ecomp-releases - Demo Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - Demo Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - 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 @@ + + org.openecomp.demo.vnf + demo-aggregator + 1.0.0-SNAPSHOT + ../../../pom.xml + + 4.0.0 org.openecomp.demo.vnf.lb dns-manager DNS Manager jar - 1.0.0 @@ -40,16 +46,4 @@ - - - ecomp-releases - Demo Release Repository - ${nexusproxy}/content/repositories/releases/ - - - ecomp-snapshots - Demo Snapshot Repository - ${nexusproxy}/content/repositories/snapshots/ - - 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 @@ - + org.openecomp.demo.vnf demo-aggregator - 1.0.0 -../../pom.xml + 1.0.0-SNAPSHOT + ../../../pom.xml 4.0.0 org.openecomp.demo.vnf.vlb vlb_dns_streams - - 1.0.0 + -- cgit 1.2.3-korg