From: Timoney, Dan (dt5972) Date: Thu, 3 Jan 2019 21:24:22 +0000 (-0500) Subject: Changes for Fluorine X-Git-Tag: 0.4.1~32 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f200a729ebedc2d292251e4f8a1b20b2e1668b7d;p=ccsdk%2Fsli%2Fadaptors.git Changes for Fluorine Update sli/adaptors to compile against ODL Fluorine Change-Id: I9ec4c89301678e9398dc2c43db4cffff03953806 Issue-ID: CCSDK-870 Signed-off-by: Timoney, Dan (dt5972) --- diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml index 70172416..a633b247 100644 --- a/aai-service/features/ccsdk-aai-service/pom.xml +++ b/aai-service/features/ccsdk-aai-service/pom.xml @@ -5,45 +5,28 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-aai-service - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} + ${project.version} - - - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.onap.ccsdk.sli.core ccsdk-sli + ${ccsdk.sli.core.version} xml features diff --git a/aai-service/features/features-aai-service/pom.xml b/aai-service/features/features-aai-service/pom.xml index a7db1a4c..3e4748a9 100755 --- a/aai-service/features/features-aai-service/pom.xml +++ b/aai-service/features/features-aai-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-aai-service - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/features/pom.xml b/aai-service/features/pom.xml index 129aea51..1c34eb4a 100755 --- a/aai-service/features/pom.xml +++ b/aai-service/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/installer/pom.xml b/aai-service/installer/pom.xml index 3cfbf41b..c480fb38 100755 --- a/aai-service/installer/pom.xml +++ b/aai-service/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/pom.xml b/aai-service/pom.xml index d5805b75..b28dea66 100755 --- a/aai-service/pom.xml +++ b/aai-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml index cd4d30bd..cbf161d6 100755 --- a/aai-service/provider/pom.xml +++ b/aai-service/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-provider - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} @@ -21,6 +21,18 @@ UTF-8 ${project.version} + + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml index 0033d2de..5ae79b34 100644 --- a/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -12,21 +12,40 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.2.0 - + 1.2.1-SNAPSHOT + org.onap.ccsdk.sli.adaptors ansible-adapter-bundle - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} + + + ${project.version} + + + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + + com.att.eelf diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml index 5e2b41f9..daceea7e 100644 --- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml +++ b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-ansible-adapter - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId} @@ -20,29 +20,12 @@ ${project.version} - - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.onap.ccsdk.sli.core ccsdk-sli + ${ccsdk.sli.core.version} xml features diff --git a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml index d59a943f..f742f14e 100755 --- a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml +++ b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-ansible-adapter - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} diff --git a/ansible-adapter/ansible-adapter-features/pom.xml b/ansible-adapter/ansible-adapter-features/pom.xml index 8841b956..2fd0e8dc 100644 --- a/ansible-adapter/ansible-adapter-features/pom.xml +++ b/ansible-adapter/ansible-adapter-features/pom.xml @@ -16,12 +16,12 @@ odlparent-lite org.onap.ccsdk.parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adapter-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} pom diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml index f9d4d058..f1cc2a47 100644 --- a/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/ansible-adapter/ansible-adapter-installer/pom.xml @@ -27,12 +27,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adapter-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} pom diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml index 4b0db6bb..083fbb98 100644 --- a/ansible-adapter/pom.xml +++ b/ansible-adapter/pom.xml @@ -27,13 +27,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adaptor - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT ccsdk-sli-adaptors :: ansible-adapter Abstractions to interact with Ansible server via REST pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 819f43c5..5660ff3d 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.sli.adaptors sli-adaptors-artifacts - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: sli-adaptors-artifacts @@ -17,7 +17,7 @@ org.onap.ccsdk.parent parent - 1.2.0 + 1.2.1-SNAPSHOT diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml index 48907270..77ccb4c8 100644 --- a/features/ccsdk-sli-adaptors-all/pom.xml +++ b/features/ccsdk-sli-adaptors-all/pom.xml @@ -5,43 +5,22 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-sli-adaptors-all - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: features :: ${project.artifactId} + ${project.version} - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - aai-service-provider - ${project.version} - - - + diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml index 0d2724f1..23905b83 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.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-sli-adaptors - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 3578e622..1e3ea210 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors sliadaptors-features-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index cd720a6a..52cda122 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors sliadaptors-feature-aggregator - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: features diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml index 7f1e9cae..c9bf1a31 100644 --- a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml +++ b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml @@ -5,44 +5,28 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-mdsal-resource - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + ${project.version} - - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.onap.ccsdk.sli.core ccsdk-sli + ${ccsdk.sli.core.version} xml features diff --git a/mdsal-resource/features/features-mdsal-resource/pom.xml b/mdsal-resource/features/features-mdsal-resource/pom.xml index 5d5c396c..72db3050 100755 --- a/mdsal-resource/features/features-mdsal-resource/pom.xml +++ b/mdsal-resource/features/features-mdsal-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-mdsal-resource - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/features/pom.xml b/mdsal-resource/features/pom.xml index 45d62b57..7e23f963 100755 --- a/mdsal-resource/features/pom.xml +++ b/mdsal-resource/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml index 60f51901..d4e4f67d 100755 --- a/mdsal-resource/installer/pom.xml +++ b/mdsal-resource/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml index 694b90cb..700e475d 100755 --- a/mdsal-resource/pom.xml +++ b/mdsal-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml index aa8e499e..dc73c601 100755 --- a/mdsal-resource/provider/pom.xml +++ b/mdsal-resource/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-provider - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} @@ -21,6 +21,18 @@ UTF-8 ${project.version} + + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml index e470d995..36122720 100644 --- a/netbox-client/features/ccsdk-netbox-client/pom.xml +++ b/netbox-client/features/ccsdk-netbox-client/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-netbox-client - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} @@ -47,6 +47,7 @@ org.onap.ccsdk.sli.core ccsdk-sli + ${ccsdk.sli.core.version} xml features diff --git a/netbox-client/features/features-netbox-client/pom.xml b/netbox-client/features/features-netbox-client/pom.xml index ead872f1..2f5144b5 100755 --- a/netbox-client/features/features-netbox-client/pom.xml +++ b/netbox-client/features/features-netbox-client/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-netbox-client - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/netbox-client/features/pom.xml b/netbox-client/features/pom.xml index 646be91c..ef3e436a 100755 --- a/netbox-client/features/pom.xml +++ b/netbox-client/features/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml index 7578d506..221e418d 100755 --- a/netbox-client/installer/pom.xml +++ b/netbox-client/installer/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/netbox-client/pom.xml b/netbox-client/pom.xml index 453f8d54..1dd15ed9 100644 --- a/netbox-client/pom.xml +++ b/netbox-client/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml index ec56f6df..3af22edb 100644 --- a/netbox-client/provider/pom.xml +++ b/netbox-client/provider/pom.xml @@ -19,13 +19,13 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-provider - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle 4.0.0 @@ -35,6 +35,18 @@ ${project.version} + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + + @@ -99,7 +111,11 @@ 1.2.3 test - + + org.osgi + org.osgi.core + test + diff --git a/pom.xml b/pom.xml index 71058960..2d1ea156 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT 4.0.0 @@ -120,7 +120,7 @@ ONAP - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml index a0fc97d0..afe0ca4a 100644 --- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml +++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-resource-assignment - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} @@ -21,24 +21,6 @@ ${project.version} - - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml index 857bff8d..5438d59b 100755 --- a/resource-assignment/features/features-resource-assignment/pom.xml +++ b/resource-assignment/features/features-resource-assignment/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-resource-assignment - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml index 1944715c..074f1eba 100755 --- a/resource-assignment/features/pom.xml +++ b/resource-assignment/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml index 23bb04fe..16c62d57 100755 --- a/resource-assignment/installer/pom.xml +++ b/resource-assignment/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml index 8bacbfe7..35b5b880 100755 --- a/resource-assignment/pom.xml +++ b/resource-assignment/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml index 5bdb9105..e5177995 100755 --- a/resource-assignment/provider/pom.xml +++ b/resource-assignment/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-provider - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} @@ -21,6 +21,19 @@ UTF-8 ${project.version} + + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + + diff --git a/saltstack-adapter/pom.xml b/saltstack-adapter/pom.xml index f38f506d..1947a176 100644 --- a/saltstack-adapter/pom.xml +++ b/saltstack-adapter/pom.xml @@ -27,13 +27,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adaptor - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT ccsdk-sli-adaptors :: saltstack-adapter Abstractions to interact with Saltstack server via REST diff --git a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml index 7f16e2b6..09ed8db0 100644 --- a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml +++ b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml @@ -1,54 +1,40 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.2.0 - - + + org.onap.ccsdk.parent + single-feature-parent + 1.2.1-SNAPSHOT + + - org.onap.ccsdk.sli.adaptors - ccsdk-saltstack-adapter - 0.4.0-SNAPSHOT - feature + org.onap.ccsdk.sli.adaptors + ccsdk-saltstack-adapter + 0.4.1-SNAPSHOT + feature - ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId} + ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId} + + + ${project.version} + + + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + ${project.groupId} + saltstack-adapter-provider + ${project.version} + + - - ${project.version} - - - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - - diff --git a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml index c42b54e9..9c4693ee 100755 --- a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml +++ b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-saltstack-adapter - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} diff --git a/saltstack-adapter/saltstack-adapter-features/pom.xml b/saltstack-adapter/saltstack-adapter-features/pom.xml index f6f707bf..674dc14f 100644 --- a/saltstack-adapter/saltstack-adapter-features/pom.xml +++ b/saltstack-adapter/saltstack-adapter-features/pom.xml @@ -15,12 +15,12 @@ odlparent-lite org.onap.ccsdk.parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adapter-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml index 868b6176..da2f620a 100644 --- a/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -27,12 +27,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adapter-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} pom diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml index e6603014..5fee5cdc 100644 --- a/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -16,17 +16,33 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adapter-provider - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} + + ${project.version} + + + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + + com.att.eelf diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml index 2a74960c..cc72027d 100644 --- a/sql-resource/features/ccsdk-sql-resource/pom.xml +++ b/sql-resource/features/ccsdk-sql-resource/pom.xml @@ -5,44 +5,28 @@ org.onap.ccsdk.parent single-feature-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-sql-resource - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} + ${project.version} - - - - org.opendaylight.controller - mdsal-artifacts - ${odl.mdsal.version} - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${odl.mdsal.model.version} - pom - import - - - org.onap.ccsdk.sli.core ccsdk-sli + ${ccsdk.sli.core.version} xml features provided diff --git a/sql-resource/features/features-sql-resource/pom.xml b/sql-resource/features/features-sql-resource/pom.xml index d9e29846..8c23b28d 100755 --- a/sql-resource/features/features-sql-resource/pom.xml +++ b/sql-resource/features/features-sql-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors features-sql-resource - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT feature ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/features/pom.xml b/sql-resource/features/pom.xml index 856e53e9..12e27615 100755 --- a/sql-resource/features/pom.xml +++ b/sql-resource/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-features - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml index ba999141..d1d9dda1 100755 --- a/sql-resource/installer/pom.xml +++ b/sql-resource/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-installer - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml index cb900232..5146a92f 100755 --- a/sql-resource/pom.xml +++ b/sql-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml index 7285867e..23b4414b 100755 --- a/sql-resource/provider/pom.xml +++ b/sql-resource/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.2.0 + 1.2.1-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-provider - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT bundle ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} @@ -22,6 +22,18 @@ ${project.version} + + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + + + junit @@ -63,7 +75,11 @@ dblib-provider provided - + + org.osgi + org.osgi.core + provided + diff --git a/version.properties b/version.properties index e1b84eea..2a56aeda 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=0 sprint_number=4 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision}