From 71984d1bffa966c366d47464a3acf4b440c9c7c9 Mon Sep 17 00:00:00 2001 From: platania Date: Fri, 17 Feb 2017 16:23:59 -0500 Subject: [PATCH] POM reorganization Change-Id: I38076a941f6038aa8d5e67e2133c48231193430b Signed-off-by: platania --- scripts/deploy.sh | 6 +- scripts/deploy_boot.sh | 11 -- scripts/deploy_heat.sh | 11 -- scripts/deploy_vfw_scripts.sh | 11 -- scripts/deploy_vlb_scripts.sh | 11 -- 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 +- 26 files changed, 46 insertions(+), 395 deletions(-) delete mode 100755 scripts/deploy_boot.sh delete mode 100755 scripts/deploy_heat.sh delete mode 100755 scripts/deploy_vfw_scripts.sh delete mode 100755 scripts/deploy_vlb_scripts.sh delete mode 100644 vnfs/honeycomb_plugin/sample_plugin/settings.xml delete mode 100755 vnfs/pom.xml delete mode 100644 vnfs/settings.xml 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 b1f0b356c45061a29797ba4bf9d9f8abf6d33315..a74970186cb5e72501ce84c96cbbce25e62eef5d 100644 GIT binary patch delta 277 zcmZn(XbIR*Ex`C=a-!%ePVwq$BQqTZL&M1ig33&Xj!a%CBF}hqGLL}DZzmo&knnDOZ5w^CB96C2nz Uvn%{!nam;@gID!rhy%J90gc*Rpa1{> delta 275 zcmZn(XbIR*Ex`D5@_WfuToTpQ#s(HT3dSar1;vz^4j-MYAS};#Y%-64%H$b>>mjPR zfvQX`4RjO?EsZ7{2r40zIS98BQnF8EJ|QLVL{v6ciD@w*)Pdb(VrGJB+g!;&0!lVN amy%-L%&zc@W%56fc!Xl?u7}v$#s~l{A6)kU 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 f20da4b2ef53494c5167856b4e26ac5043ee63ad..a33a0741995cddb669173917aee1c7eaa9a1ac6f 100644 GIT binary patch delta 46 zcmZoMXffDe%Eb6%vKiAVPVwq$BQqTZL&M3hn3S0g9huC}EYEm!vp(|;md$J&|M&r8 Cb`LE8 delta 47 zcmZoMXffDe%Eb6{vKiAVE{W=DV*?8v1!I%RFPW5?4j-M&$1KlyY_lHo4VKO99Dn%% Da3~LG diff --git a/vnfs/honeycomb_plugin/sample_plugin/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/.DS_Store index c7a6a7ae3144e4729664e3b4e81fd87f152c24b4..0c92e6f3d369865be00576384d8fda279b883896 100644 GIT binary patch delta 261 zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMA$hk3KH$NliWF7%!#vhXn1Xgj1 zS63UE=_nW)PM#sG%yj6;HrfHXkTj0_A0AbN6v M%rb=Uh;q_I0D~%F 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 0a075752c4eb0904143e6c556c543f06a2a73773..7ada677ebdc29f8913e3984d40fb5d57a3f56785 100644 GIT binary patch delta 54 zcmV-60LlM^K!iZBFAxFvlQ0mf2^V{NGBzwAF)@?m5F-M@#FGgT9|6UZ6Bx5W5yl3y M1{n7Qv;GtZ1M<-l2LJ#7 delta 43 zcmZp1XmQw}FEBYzcpZnafrXBOv5CQC6%qHzOv0j@9R!cDZDyDF#AjHu~2NHo+1YW5HK<@2yAv_KE|>+fcX{EW_AvK4xj>{$am(+{342+ UKzW7)kiy9(Jj$D6L{=~Z044qo@Bjb+ delta 389 zcmZoMXfc=|#>B)qF;Q%yo}wrd0|Nsi1A_nqLn=c_Qh9MfQcix-#>C}}^&lBGh7yKE zh9ZV^WLcp2&!mE!%;FLQgPV*@%q*;I>>Qk2+#o0*$Q2u$kzXEMl2}q&?37p(4d!L0 zq$WYx0f{9UFm_0Oeh!?Sm=u0ie<8a2+L+}4sH%$Aa6|k&ODi4M3EH~m--> - + 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 5866ceef40472a17990aa7924d762230f52b39bd..9a784d0f5b12d1c2dc21384fc9c9a340edfc9a4c 100644 GIT binary patch delta 153 zcmZn(XbIS0D8Tq*vXAg8F7fJWBQqTZLqmhfj3P=*hmK4>D<;o)bTW^C)Mi&fHYNhf eTt!^*tJvHk+RU|?Md2^YrYcspTFP6y%g-s^U77GH3)G`48M3o;C 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 + -- 2.16.6