From fdd04d3f77f3833c03725bf7dae3f282bf44c048 Mon Sep 17 00:00:00 2001 From: platania Date: Wed, 8 Mar 2017 12:15:27 -0500 Subject: [PATCH] Update POM structure for staging Change-Id: I8c1db25c8518ae85e04eed9d3b38169791cb8e9a Signed-off-by: platania --- boot/aai_vm_init.sh | 2 +- pom.xml | 30 ++++++++++++-- version.properties | 2 +- vnfs/VES/pom.xml | 37 +++++++++++------ vnfs/VESreporting_vFW/pom.xml | 40 +++++++++++++------ vnfs/VESreporting_vLB/pom.xml | 38 ++++++++++++------ .../sample_plugin/parent-pom/.DS_Store | Bin 6148 -> 6148 bytes .../sample_plugin/parent-pom/pom.xml | 9 +++-- .../sample_plugin/sample-distribution/pom.xml | 12 +++--- .../sample_plugin/sample-plugin-api/pom.xml | 10 ++++- .../sample_plugin/sample-plugin-impl/pom.xml | 10 ++++- vnfs/vFW/pg_streams/pom.xml | 37 +++++++++++------ vnfs/vLB/DNSClient/pom.xml | 44 ++++++++++++--------- vnfs/vLB/DNSManager/pom.xml | 44 ++++++++++++--------- vnfs/vLB/dns_streams/pom.xml | 38 ++++++++++++------ 15 files changed, 242 insertions(+), 111 deletions(-) diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh index 5c0773fe..b4e01dd9 100644 --- a/boot/aai_vm_init.sh +++ b/boot/aai_vm_init.sh @@ -24,5 +24,5 @@ docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/ docker pull $NEXUS_DOCKER_REPO/openecomp/model-loader:latest docker rm -f model-loader-service -docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.asdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/openecomp/model-loader:latest +docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.sdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/openecomp/model-loader:latest diff --git a/pom.xml b/pom.xml index ce49d4d0..3ce014a8 100755 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,29 @@ - + + + org.openecomp.demo.vnf demo-aggregator @@ -61,17 +83,17 @@ - + diff --git a/version.properties b/version.properties index 82edb1bb..d2812bbb 100644 --- a/version.properties +++ b/version.properties @@ -9,4 +9,4 @@ base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml index 1dbbce02..12a22e19 100644 --- a/vnfs/VES/pom.xml +++ b/vnfs/VES/pom.xml @@ -1,5 +1,29 @@ - - + + + + + org.openecomp.demo.vnf @@ -56,15 +80,6 @@ - - diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml index a62e48fd..16f0115d 100644 --- a/vnfs/VESreporting_vFW/pom.xml +++ b/vnfs/VESreporting_vFW/pom.xml @@ -1,5 +1,30 @@ - - + + + + + + org.openecomp.demo.vnf demo-aggregator @@ -55,16 +80,7 @@ - - - + \ No newline at end of file diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml index c31c0619..76e79aae 100644 --- a/vnfs/VESreporting_vLB/pom.xml +++ b/vnfs/VESreporting_vLB/pom.xml @@ -1,5 +1,30 @@ - - + + + + + + org.openecomp.demo.vnf demo-aggregator @@ -55,15 +80,6 @@ - - diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/.DS_Store index 5d56db6b27ea3419ec46be91928027c556a8b055..6ee7724ad05ca34c28ee1494467f39fdd3007cc6 100644 GIT binary patch delta 97 zcmZoMXfc=|&e%S&P;8=}0UJX+2u?hxuFc56z#z;}z>v?7%b>?l0VH!Ek_=f4NkCRU nke>n(**GtdeKR|U00(3H#)IFPC-aNwGBRv-6gkX1v4I5ubk!Io delta 77 zcmZoMXfc=|&e%4wP;8=}0h?z|esWUI#Ea^}j0_A6>2%5 diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml index b80f8ef3..5492aeb6 100644 --- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml @@ -14,6 +14,11 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> + + + @@ -58,10 +63,6 @@ done 5.0.0 - - - - 4.0.0 hc-openecomp pom diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml index 4b1fedb9..da25cc7e 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml @@ -1,11 +1,11 @@ - - + + + org.openecomp.demo.vnf 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 c89f3118..6f357321 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml @@ -12,7 +12,15 @@ 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. ---> +--> + + + + + io.fd.honeycomb.common api-parent 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 ab0b03e6..84f48b42 100755 --- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml +++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml @@ -12,7 +12,15 @@ 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. ---> +--> + + + + + io.fd.honeycomb.common impl-parent diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml index 6a8c097a..072a97e5 100644 --- a/vnfs/vFW/pg_streams/pom.xml +++ b/vnfs/vFW/pg_streams/pom.xml @@ -1,5 +1,29 @@ - - + + + + + org.openecomp.demo.vnf @@ -56,15 +80,6 @@ - - diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml index 78f2a4db..ec500699 100644 --- a/vnfs/vLB/DNSClient/pom.xml +++ b/vnfs/vLB/DNSClient/pom.xml @@ -1,4 +1,29 @@ - + + + + + org.openecomp.demo.vnf @@ -41,23 +66,6 @@ - diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml index 81e8cfac..1af3c1d5 100644 --- a/vnfs/vLB/DNSManager/pom.xml +++ b/vnfs/vLB/DNSManager/pom.xml @@ -1,4 +1,29 @@ - + + + + + org.openecomp.demo.vnf @@ -41,23 +66,6 @@ - diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml index 728370d9..5812c5b0 100644 --- a/vnfs/vLB/dns_streams/pom.xml +++ b/vnfs/vLB/dns_streams/pom.xml @@ -1,5 +1,29 @@ - - + + + + + org.openecomp.demo.vnf @@ -56,16 +80,6 @@ - - - -- 2.16.6