From a612cdd3fbed35c4d5b454c6f0329fa6ecec22e1 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 5 Mar 2020 11:51:01 -0500 Subject: Roll master to Guilin Roll versions of master for early Guilin development Change-Id: Id725abd9ecb3c67b2687e15286cb2f2bcd50be1a Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- aai-service/installer/pom.xml | 4 +- aai-service/pom.xml | 4 +- aai-service/provider/pom.xml | 21 +++-- ansible-adapter/ansible-adapter-bundle/pom.xml | 14 ++- ansible-adapter/ansible-adapter-installer/pom.xml | 12 ++- ansible-adapter/pom.xml | 86 +++++++++--------- artifacts/pom.xml | 15 ++-- base/http/installer/pom.xml | 4 +- base/http/pom.xml | 4 +- base/http/provider/pom.xml | 4 +- base/pom.xml | 11 ++- features/ccsdk-aai-service/pom.xml | 5 +- features/ccsdk-ansible-adapter/pom.xml | 6 +- features/ccsdk-base-http/pom.xml | 4 +- features/ccsdk-mdsal-resource/pom.xml | 5 +- features/ccsdk-messagerouter-consumer/pom.xml | 8 +- features/ccsdk-messagerouter-publisher/pom.xml | 8 +- features/ccsdk-netbox-client/pom.xml | 10 +-- features/ccsdk-resource-assignment/pom.xml | 5 +- features/ccsdk-saltstack-adapter/pom.xml | 7 +- features/ccsdk-sli-adaptors-all/pom.xml | 4 +- features/ccsdk-sql-resource/pom.xml | 5 +- features/features-sli-adaptors/pom.xml | 4 +- features/installer/pom.xml | 4 +- features/pom.xml | 4 +- mdsal-resource/installer/pom.xml | 4 +- mdsal-resource/pom.xml | 6 +- mdsal-resource/provider/pom.xml | 18 ++-- message-router/consumer/api/pom.xml | 2 +- message-router/consumer/installer/pom.xml | 4 +- message-router/consumer/pom.xml | 2 +- message-router/consumer/provider/pom.xml | 2 +- message-router/pom.xml | 6 +- message-router/publisher/api/pom.xml | 2 +- message-router/publisher/installer/pom.xml | 4 +- message-router/publisher/pom.xml | 2 +- message-router/publisher/provider/pom.xml | 2 +- message-router/publisher/sample.client/pom.xml | 2 +- netbox-client/installer/pom.xml | 4 +- netbox-client/pom.xml | 4 +- netbox-client/provider/pom.xml | 22 +++-- pom.xml | 85 ++++++++---------- resource-assignment/installer/pom.xml | 4 +- resource-assignment/pom.xml | 6 +- resource-assignment/provider/pom.xml | 20 ++--- saltstack-adapter/pom.xml | 100 +++++++++++---------- .../saltstack-adapter-installer/pom.xml | 14 ++- .../saltstack-adapter-provider/pom.xml | 20 ++--- sql-resource/installer/pom.xml | 4 +- sql-resource/pom.xml | 5 +- sql-resource/provider/pom.xml | 17 ++-- version.properties | 6 +- 52 files changed, 301 insertions(+), 324 deletions(-) diff --git a/aai-service/installer/pom.xml b/aai-service/installer/pom.xml index baf41865f..6a0d99097 100755 --- a/aai-service/installer/pom.xml +++ b/aai-service/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/pom.xml b/aai-service/pom.xml index c5167d507..e96f57540 100755 --- a/aai-service/pom.xml +++ b/aai-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml index 082fcaab5..0f564e858 100755 --- a/aai-service/provider/pom.xml +++ b/aai-service/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} @@ -20,19 +20,18 @@ ${project.version} ${project.version} - + - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import - junit @@ -53,7 +52,7 @@ org.onap.logging-analytics logging-filter-base - provided + provided org.osgi @@ -109,7 +108,7 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.14.0 + 0.14.0 gen-xjc diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml index cad248b06..e0ac33813 100644 --- a/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -14,19 +14,20 @@ a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> 4.0.0 + org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adapter-bundle - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle - ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} + ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} ${project.version} @@ -44,7 +45,6 @@ - com.att.eelf @@ -91,13 +91,13 @@ org.onap.ccsdk.sli.core sli-common - provided + provided org.onap.ccsdk.sli.core sli-provider - provided + provided @@ -128,6 +128,4 @@ - - diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml index 2e09acc9e..22295c283 100644 --- a/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/ansible-adapter/ansible-adapter-installer/pom.xml @@ -24,23 +24,28 @@ --> 4.0.0 + org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT + org.onap.ccsdk.sli.adaptors ansible-adapter-installer - 0.7.1-SNAPSHOT - ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} + 1.0.0-SNAPSHOT pom + + ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} + ccsdk-ansible-adapter ${application.name} mvn:org.onap.ccsdk.sli.adaptors/${features.boot}/${project.version}/xml/features false + @@ -51,6 +56,7 @@ + diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml index 6cea61f87..e1b6482a0 100644 --- a/ansible-adapter/pom.xml +++ b/ansible-adapter/pom.xml @@ -22,21 +22,61 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> - + 4.0.0 + org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adaptor - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT + pom + ccsdk-sli-adaptors :: ansible-adapter Abstractions to interact with Ansible server via REST - pom + + + ansible-adapter-bundle + ansible-adapter-installer + + + + + + + org.onap.appc + ansible-adapter-features + ${project.version} + xml + features + + + + org.onap.appc + ansible-adapter-provider + ${project.version} + + + + + + + + + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + + + @@ -147,42 +187,4 @@ - - - - - - org.onap.appc - ansible-adapter-features - features - xml - ${project.version} - - - - org.onap.appc - ansible-adapter-provider - ${project.version} - - - - - - - - - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - - - ansible-adapter-bundle - ansible-adapter-installer - diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 966417619..53a8fbe10 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -2,9 +2,15 @@ 4.0.0 + + org.onap.ccsdk.parent + parent + 2.0.0-SNAPSHOT + + org.onap.ccsdk.sli.adaptors sli-adaptors-artifacts - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: sli-adaptors-artifacts @@ -14,12 +20,6 @@ ONAP - - org.onap.ccsdk.parent - parent - 1.5.2 - - @@ -143,5 +143,4 @@ - diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml index a8397faf3..4940c55c9 100644 --- a/base/http/installer/pom.xml +++ b/base/http/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: base-http :: ${project.artifactId} diff --git a/base/http/pom.xml b/base/http/pom.xml index fda2c83f9..e72441db5 100644 --- a/base/http/pom.xml +++ b/base/http/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.base http - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index b7002e521..6aab259b4 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle diff --git a/base/pom.xml b/base/pom.xml index 120bbc35e..364fd7878 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -1,21 +1,20 @@ - + + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.sli.adaptors base-parent - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT + pom http - diff --git a/features/ccsdk-aai-service/pom.xml b/features/ccsdk-aai-service/pom.xml index 983f22461..f91e58502 100644 --- a/features/ccsdk-aai-service/pom.xml +++ b/features/ccsdk-aai-service/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-aai-service - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} - ${project.version} ${project.version} diff --git a/features/ccsdk-ansible-adapter/pom.xml b/features/ccsdk-ansible-adapter/pom.xml index ee66e2a70..32ec5058f 100644 --- a/features/ccsdk-ansible-adapter/pom.xml +++ b/features/ccsdk-ansible-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-ansible-adapter - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId} @@ -29,7 +29,7 @@ ${ccsdk.sli.core.version} xml features - provided + provided diff --git a/features/ccsdk-base-http/pom.xml b/features/ccsdk-base-http/pom.xml index 002c14c21..a38fa4c73 100644 --- a/features/ccsdk-base-http/pom.xml +++ b/features/ccsdk-base-http/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-base-http - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: base-http :: ${project.artifactId} diff --git a/features/ccsdk-mdsal-resource/pom.xml b/features/ccsdk-mdsal-resource/pom.xml index 8af9fa9b6..e3ef74a05 100644 --- a/features/ccsdk-mdsal-resource/pom.xml +++ b/features/ccsdk-mdsal-resource/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-mdsal-resource - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} - ${project.version} ${project.version} diff --git a/features/ccsdk-messagerouter-consumer/pom.xml b/features/ccsdk-messagerouter-consumer/pom.xml index 8e2766bc5..47fc35316 100755 --- a/features/ccsdk-messagerouter-consumer/pom.xml +++ b/features/ccsdk-messagerouter-consumer/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter ccsdk-messagerouter-consumer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature - + ${project.groupId} @@ -25,6 +25,4 @@ ${project.version} - - diff --git a/features/ccsdk-messagerouter-publisher/pom.xml b/features/ccsdk-messagerouter-publisher/pom.xml index 1b3b702cb..ef3f13649 100755 --- a/features/ccsdk-messagerouter-publisher/pom.xml +++ b/features/ccsdk-messagerouter-publisher/pom.xml @@ -5,14 +5,14 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter ccsdk-messagerouter-publisher - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature - + ${project.groupId} @@ -25,6 +25,4 @@ ${project.version} - - diff --git a/features/ccsdk-netbox-client/pom.xml b/features/ccsdk-netbox-client/pom.xml index 29f90b3c4..28e672350 100644 --- a/features/ccsdk-netbox-client/pom.xml +++ b/features/ccsdk-netbox-client/pom.xml @@ -20,24 +20,22 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-netbox-client - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} - ${project.version} ${project.version} - @@ -46,7 +44,7 @@ ${ccsdk.sli.core.version} xml features - provided + provided @@ -55,7 +53,7 @@ ${ccsdk.sli.core.version} xml features - provided + provided diff --git a/features/ccsdk-resource-assignment/pom.xml b/features/ccsdk-resource-assignment/pom.xml index 0048a7e18..1672c6c21 100644 --- a/features/ccsdk-resource-assignment/pom.xml +++ b/features/ccsdk-resource-assignment/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-resource-assignment - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} - ${project.version} ${project.version} diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml index 1c4014096..ffc43e152 100644 --- a/features/ccsdk-saltstack-adapter/pom.xml +++ b/features/ccsdk-saltstack-adapter/pom.xml @@ -1,17 +1,17 @@ - + 4.0.0 org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-saltstack-adapter - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId} @@ -35,5 +35,4 @@ ${project.version} - diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml index bce028866..53664b4ed 100644 --- a/features/ccsdk-sli-adaptors-all/pom.xml +++ b/features/ccsdk-sli-adaptors-all/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-sli-adaptors-all - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/features/ccsdk-sql-resource/pom.xml b/features/ccsdk-sql-resource/pom.xml index 2dfa36f72..8b553c0ce 100644 --- a/features/ccsdk-sql-resource/pom.xml +++ b/features/ccsdk-sql-resource/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-sql-resource - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} - ${project.version} ${project.version} diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml index 5f2fbc578..4c9c862b8 100644 --- a/features/features-sli-adaptors/pom.xml +++ b/features/features-sli-adaptors/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-sli-adaptors - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 23205e69a..036cc9a5d 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sliadaptors-features-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index 2c93658cb..2c4d8098c 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sliadaptors-feature-aggregator - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: features diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml index dce634d05..d78bec957 100755 --- a/mdsal-resource/installer/pom.xml +++ b/mdsal-resource/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml index de34cd2e8..36ea6e83e 100755 --- a/mdsal-resource/pom.xml +++ b/mdsal-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource @@ -21,6 +21,4 @@ provider installer - - diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml index 32f0a66f1..3da2dc241 100755 --- a/mdsal-resource/provider/pom.xml +++ b/mdsal-resource/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} @@ -22,19 +22,18 @@ ${project.version} ${project.version} - + - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import - @@ -80,5 +79,4 @@ test - diff --git a/message-router/consumer/api/pom.xml b/message-router/consumer/api/pom.xml index 117e60093..70dd0408e 100755 --- a/message-router/consumer/api/pom.xml +++ b/message-router/consumer/api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter consumer.aggregate - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT consumer.api diff --git a/message-router/consumer/installer/pom.xml b/message-router/consumer/installer/pom.xml index 345b50fe7..465550386 100755 --- a/message-router/consumer/installer/pom.xml +++ b/message-router/consumer/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.sli.adaptors.messagerouter consumer.aggregate - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter consumer.installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/message-router/consumer/pom.xml b/message-router/consumer/pom.xml index 5b67ca4b0..56586eae8 100755 --- a/message-router/consumer/pom.xml +++ b/message-router/consumer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter messagerouter-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT consumer.aggregate diff --git a/message-router/consumer/provider/pom.xml b/message-router/consumer/provider/pom.xml index f3ccafa74..1e69ad150 100755 --- a/message-router/consumer/provider/pom.xml +++ b/message-router/consumer/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter consumer.aggregate - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT consumer.provider diff --git a/message-router/pom.xml b/message-router/pom.xml index 09d47afc4..5fe29e144 100755 --- a/message-router/pom.xml +++ b/message-router/pom.xml @@ -2,16 +2,16 @@ 4.0.0 - + org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter messagerouter-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/message-router/publisher/api/pom.xml b/message-router/publisher/api/pom.xml index c4831f482..0532ed77e 100755 --- a/message-router/publisher/api/pom.xml +++ b/message-router/publisher/api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT publisher.api diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml index 792e3c05b..b700fa878 100644 --- a/message-router/publisher/installer/pom.xml +++ b/message-router/publisher/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter publisher.installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml index 487591fe5..0e069c6ac 100755 --- a/message-router/publisher/pom.xml +++ b/message-router/publisher/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter messagerouter-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT publisher.aggregate diff --git a/message-router/publisher/provider/pom.xml b/message-router/publisher/provider/pom.xml index 456307764..c1fbf274d 100755 --- a/message-router/publisher/provider/pom.xml +++ b/message-router/publisher/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT publisher.provider diff --git a/message-router/publisher/sample.client/pom.xml b/message-router/publisher/sample.client/pom.xml index 47692aad7..bcdd14d54 100755 --- a/message-router/publisher/sample.client/pom.xml +++ b/message-router/publisher/sample.client/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT sample.client diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml index 93e005673..e2be415ca 100755 --- a/netbox-client/installer/pom.xml +++ b/netbox-client/installer/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/netbox-client/pom.xml b/netbox-client/pom.xml index 6051f2ce9..da901ae9c 100644 --- a/netbox-client/pom.xml +++ b/netbox-client/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml index cef1f05da..19080bcda 100644 --- a/netbox-client/provider/pom.xml +++ b/netbox-client/provider/pom.xml @@ -15,19 +15,19 @@ limitations under the License. --> + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle - 4.0.0 ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} @@ -39,15 +39,14 @@ - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import - @@ -77,7 +76,7 @@ org.onap.ccsdk.sli.core sliPluginUtils-provider - ${ccsdk.sli.core.version} + ${ccsdk.sli.core.version} provided @@ -102,7 +101,7 @@ com.github.tomakehurst wiremock - 2.23.2 + 2.23.2 test @@ -135,5 +134,4 @@ - diff --git a/pom.xml b/pom.xml index 2bf3026b4..101c6779e 100755 --- a/pom.xml +++ b/pom.xml @@ -1,27 +1,38 @@ - + + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT - 4.0.0 - pom org.onap.ccsdk.sli.adaptors ccsdk-sli-adaptors + 1.0.0-SNAPSHOT + pom ccsdk-sli-adaptors - https://wiki.onap.org The CCSDK core components contains the SLI, dblib and root pom + https://wiki.onap.org + + ONAP + - - - JIRA - https://jira.onap.org/ - - + + aai-service + ansible-adapter + saltstack-adapter + netbox-client + mdsal-resource + resource-assignment + sql-resource + base + message-router + features + artifacts + scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors @@ -29,12 +40,14 @@ ${onap.git.protocol}://${onap.git.host}/ccsdk/sli/adaptors ccsdk-adaptors-${project.version} - + + JIRA + https://jira.onap.org/ + Jenkins https://jenkins.onap.org/ - sdnc-javadoc @@ -44,6 +57,19 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + false + + + + + blackduck @@ -125,37 +151,4 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - - - - - - - aai-service - ansible-adapter - saltstack-adapter - netbox-client - mdsal-resource - resource-assignment - sql-resource - base - message-router - features - artifacts - - - ONAP - - 0.7.1-SNAPSHOT - - diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml index 2dce577c6..ebfc5e518 100755 --- a/resource-assignment/installer/pom.xml +++ b/resource-assignment/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml index e1eff0029..3c3fab354 100755 --- a/resource-assignment/pom.xml +++ b/resource-assignment/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment @@ -21,6 +21,4 @@ provider installer - - diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml index 862370886..cc6043a70 100755 --- a/resource-assignment/provider/pom.xml +++ b/resource-assignment/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} @@ -22,20 +22,18 @@ ${project.version} ${project.version} - + - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import - - junit @@ -91,6 +89,4 @@ spring-jdbc - - diff --git a/saltstack-adapter/pom.xml b/saltstack-adapter/pom.xml index 62e1720ac..da1b6095c 100644 --- a/saltstack-adapter/pom.xml +++ b/saltstack-adapter/pom.xml @@ -22,22 +22,69 @@ ============LICENSE_END========================================================= --> - + 4.0.0 + org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adaptor - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT + pom + ccsdk-sli-adaptors :: saltstack-adapter Abstractions to interact with Saltstack server via REST - pom + + + saltstack-adapter-provider + saltstack-adapter-installer + + + + + + + org.onap.appc + saltstack-adapter-features + ${project.version} + xml + features + + + + org.onap.appc + saltstack-adapter-provider + ${project.version} + + + + junit + junit + 4.11 + test + + + + + + + + + + + + JCenter + JCenter Repository + http://jcenter.bintray.com + + + @@ -148,49 +195,4 @@ - - - - - - org.onap.appc - saltstack-adapter-features - features - xml - ${project.version} - - - - org.onap.appc - saltstack-adapter-provider - ${project.version} - - - - junit - junit - 4.11 - test - - - - - - - - - - - - JCenter - JCenter Repository - http://jcenter.bintray.com - - - - - - saltstack-adapter-provider - saltstack-adapter-installer - diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml index 334aafad2..a0f37d18f 100644 --- a/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -22,20 +22,24 @@ ============LICENSE_END========================================================= --> - + 4.0.0 + org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT + org.onap.ccsdk.sli.adaptors saltstack-adapter-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT + pom + ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} - pom + ccsdk-saltstack-adapter ${application.name} @@ -44,6 +48,7 @@ false + @@ -53,6 +58,7 @@ + diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml index ffaf8033a..eb7788d94 100644 --- a/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -11,19 +11,21 @@ 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. ============LICENSE_END========================================================= --> - + 4.0.0 + org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adapter-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle + ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} @@ -35,15 +37,14 @@ - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import - com.att.eelf @@ -116,5 +117,4 @@ - diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml index 94cc33ae4..e518767b6 100755 --- a/sql-resource/installer/pom.xml +++ b/sql-resource/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml index 58a72ab49..3fcf5e4e6 100755 --- a/sql-resource/pom.xml +++ b/sql-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource @@ -21,5 +21,4 @@ provider installer - diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml index 7be4fc110..90e0224bb 100755 --- a/sql-resource/provider/pom.xml +++ b/sql-resource/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} @@ -26,15 +26,14 @@ - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import - junit @@ -82,6 +81,4 @@ provided - - diff --git a/version.properties b/version.properties index c11ada9fe..feea7088f 100644 --- a/version.properties +++ b/version.properties @@ -3,9 +3,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -release_name=0 -sprint_number=7 -feature_revision=1 +release_name=1 +sprint_number=0 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg