From 7de29bfea89ff53a446bea07d8f74d1aaa87045b Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 25 Nov 2020 08:29:23 -0500 Subject: Limit use of odlparent poms Updated pom.xmls to use standard maven project structure (i.e. parent of pom is pom in directory above), and updated top level pom to use org.ccsdk.parent:oparent as parent - EXCEPT in cases where module has true OpenDaylight dependencies and therefore needs to use ODL parent pom. Change-Id: I50429f28225152251ac2086235c14bb00f09c05c Issue-ID: CCSDK-3001 Signed-off-by: Dan Timoney --- adaptors/aai-service/installer/pom.xml | 7 ++- adaptors/aai-service/pom.xml | 7 ++- adaptors/aai-service/provider/pom.xml | 7 ++- .../ansible-adapter/ansible-adapter-bundle/pom.xml | 7 ++- .../ansible-adapter-installer/pom.xml | 7 ++- adaptors/ansible-adapter/pom.xml | 9 ++-- adaptors/artifacts/pom.xml | 6 +-- adaptors/base/http/installer/pom.xml | 6 +-- adaptors/base/http/pom.xml | 7 ++- adaptors/base/http/provider/pom.xml | 7 ++- adaptors/base/pom.xml | 7 ++- adaptors/features/ccsdk-aai-service/pom.xml | 7 ++- adaptors/features/ccsdk-ansible-adapter/pom.xml | 7 ++- adaptors/features/ccsdk-base-http/pom.xml | 7 ++- adaptors/features/ccsdk-mdsal-resource/pom.xml | 7 ++- .../features/ccsdk-messagerouter-consumer/pom.xml | 6 +-- .../features/ccsdk-messagerouter-publisher/pom.xml | 6 +-- adaptors/features/ccsdk-netbox-client/pom.xml | 7 ++- .../features/ccsdk-resource-assignment/pom.xml | 7 ++- adaptors/features/ccsdk-saltstack-adapter/pom.xml | 7 ++- adaptors/features/ccsdk-sli-adaptors-all/pom.xml | 7 ++- adaptors/features/ccsdk-sql-resource/pom.xml | 7 ++- adaptors/features/features-sli-adaptors/pom.xml | 2 +- adaptors/features/installer/pom.xml | 7 ++- adaptors/features/pom.xml | 4 +- adaptors/mdsal-resource/installer/pom.xml | 7 ++- adaptors/mdsal-resource/pom.xml | 7 ++- adaptors/mdsal-resource/provider/pom.xml | 7 ++- adaptors/message-router/pom.xml | 7 ++- adaptors/netbox-client/installer/pom.xml | 7 ++- adaptors/netbox-client/pom.xml | 7 ++- adaptors/netbox-client/provider/pom.xml | 10 ++-- adaptors/pom.xml | 8 ++-- adaptors/resource-assignment/installer/pom.xml | 7 ++- adaptors/resource-assignment/pom.xml | 7 ++- adaptors/resource-assignment/provider/pom.xml | 7 ++- adaptors/saltstack-adapter/pom.xml | 9 ++-- .../saltstack-adapter-installer/pom.xml | 7 ++- .../saltstack-adapter-provider/pom.xml | 7 ++- adaptors/sql-resource/installer/pom.xml | 7 ++- adaptors/sql-resource/pom.xml | 7 ++- adaptors/sql-resource/provider/pom.xml | 7 ++- core/artifacts/pom.xml | 7 ++- core/dblib/installer/pom.xml | 7 ++- core/dblib/pom.xml | 7 ++- core/dblib/provider/pom.xml | 7 ++- core/features/ccsdk-dblib/pom.xml | 7 ++- core/features/ccsdk-filters/pom.xml | 7 ++- core/features/ccsdk-sli-core-all/pom.xml | 7 ++- core/features/ccsdk-sli/pom.xml | 7 ++- core/features/ccsdk-sliPluginUtils/pom.xml | 7 ++- core/features/ccsdk-sliapi/pom.xml | 7 ++- core/features/ccsdk-slicore-utils/pom.xml | 7 ++- core/features/features-sli-core/pom.xml | 2 +- core/features/installer/pom.xml | 7 ++- core/features/pom.xml | 5 +- core/filters/installer/pom.xml | 7 ++- core/filters/pom.xml | 7 ++- core/filters/provider/pom.xml | 12 +++-- core/pom.xml | 53 +++++++++++----------- core/sli/common/pom.xml | 7 ++- core/sli/installer/pom.xml | 7 ++- core/sli/model/pom.xml | 2 +- core/sli/pom.xml | 7 ++- core/sli/provider-base/pom.xml | 7 ++- core/sli/provider/pom.xml | 2 +- core/sliPluginUtils/installer/pom.xml | 7 ++- core/sliPluginUtils/pom.xml | 7 ++- core/sliPluginUtils/provider/pom.xml | 7 ++- core/sliapi/installer/pom.xml | 7 ++- core/sliapi/model/pom.xml | 7 ++- core/sliapi/model/swagger/pom.xml | 6 +-- core/sliapi/model/yang/pom.xml | 2 +- core/sliapi/pom.xml | 7 ++- core/sliapi/provider/pom.xml | 2 +- core/utils/installer/pom.xml | 7 ++- core/utils/pom.xml | 7 ++- core/utils/provider/pom.xml | 10 ++-- northbound/artifacts/pom.xml | 6 +-- northbound/asdcApi/installer/pom.xml | 7 ++- northbound/asdcApi/model/pom.xml | 2 +- northbound/asdcApi/pom.xml | 7 ++- northbound/asdcApi/provider/pom.xml | 2 +- northbound/daexim-offsite-backup/installer/pom.xml | 7 ++- northbound/daexim-offsite-backup/model/pom.xml | 2 +- northbound/daexim-offsite-backup/pom.xml | 7 ++- northbound/daexim-offsite-backup/provider/pom.xml | 6 +-- northbound/dataChange/installer/pom.xml | 7 ++- northbound/dataChange/model/pom.xml | 2 +- northbound/dataChange/pom.xml | 7 ++- northbound/dataChange/provider/pom.xml | 22 ++++----- northbound/dmaap-listener/pom.xml | 25 +++++++++- .../dmaapclient/SdncDmaapConsumerImpl.java | 6 +-- northbound/features/ccsdk-asdcApi/pom.xml | 7 ++- .../features/ccsdk-daexim-offsite-backup/pom.xml | 7 ++- northbound/features/ccsdk-dataChange/pom.xml | 7 ++- northbound/features/ccsdk-lcm/pom.xml | 7 ++- .../features/ccsdk-sli-northbound-all/pom.xml | 7 ++- .../features/features-sli-northbound/pom.xml | 2 +- northbound/features/installer/pom.xml | 7 ++- northbound/features/pom.xml | 4 +- northbound/lcm/installer/pom.xml | 7 ++- northbound/lcm/model/pom.xml | 2 +- northbound/lcm/pom.xml | 7 ++- northbound/lcm/provider/pom.xml | 2 +- northbound/pom.xml | 8 ++-- northbound/ueb-listener/pom.xml | 6 +-- plugins/artifacts/pom.xml | 6 +-- plugins/features/ccsdk-gr-toolkit/pom.xml | 7 ++- plugins/features/ccsdk-properties-node/pom.xml | 7 ++- plugins/features/ccsdk-restapi-call-node/pom.xml | 7 ++- plugins/features/ccsdk-restconf-client/pom.xml | 7 ++- plugins/features/ccsdk-sli-plugins-all/pom.xml | 7 ++- plugins/features/ccsdk-sshapi-call-node/pom.xml | 7 ++- plugins/features/ccsdk-template-node/pom.xml | 7 ++- plugins/features/features-sli-plugins/pom.xml | 2 +- plugins/features/installer/pom.xml | 7 ++- plugins/features/pom.xml | 4 +- plugins/grToolkit/installer/pom.xml | 7 ++- plugins/grToolkit/model/pom.xml | 2 +- plugins/grToolkit/pom.xml | 7 ++- plugins/grToolkit/provider/pom.xml | 2 +- plugins/pom.xml | 8 ++-- plugins/properties-node/installer/pom.xml | 6 +-- plugins/properties-node/pom.xml | 6 +-- plugins/properties-node/provider/pom.xml | 6 +-- plugins/restapi-call-node/installer/pom.xml | 6 +-- plugins/restapi-call-node/pom.xml | 6 +-- plugins/restapi-call-node/provider/pom.xml | 6 +-- plugins/restconf-client/installer/pom.xml | 6 +-- plugins/restconf-client/pom.xml | 6 +-- plugins/restconf-client/provider/pom.xml | 7 ++- plugins/sshapi-call-node/installer/pom.xml | 6 +-- plugins/sshapi-call-node/pom.xml | 6 +-- plugins/sshapi-call-node/provider/pom.xml | 6 +-- plugins/template-node/installer/pom.xml | 6 +-- plugins/template-node/pom.xml | 6 +-- plugins/template-node/provider/pom.xml | 8 ++-- pom.xml | 4 +- 139 files changed, 446 insertions(+), 508 deletions(-) diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 2611c7b05..9ec26b39b 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + aai-service + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index a06c97291..638de3f67 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index 6aee4a21b..e2c281af6 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + aai-service + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml index d27c417e8..382533826 100644 --- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -17,10 +17,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + ansible-adapter + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml index eb6726c54..8a555dd11 100644 --- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml @@ -27,10 +27,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + ansible-adapter + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml index a46493dca..934cc0b24 100644 --- a/adaptors/ansible-adapter/pom.xml +++ b/adaptors/ansible-adapter/pom.xml @@ -27,14 +27,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors - ansible-adaptor + ansible-adapter 1.2.0-SNAPSHOT pom diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index e55c8093b..df33d7d4e 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - parent - 2.1.0 + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index bed3252f4..0322a9f75 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.adaptors.base + http + 1.2.0-SNAPSHOT diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index d33eeed9c..f092b44d8 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + base-parent + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.base diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 5f21a8a8d..c4b1e73fa 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors.base + http + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index 6f5cb2103..daa11e3d7 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index 9f99a7169..dce8adfa3 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-ansible-adapter/pom.xml b/adaptors/features/ccsdk-ansible-adapter/pom.xml index f68826cf0..a34723902 100644 --- a/adaptors/features/ccsdk-ansible-adapter/pom.xml +++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 67ac058a1..e1a60c55d 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index f3ee919ac..cd7d1e48f 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index 1eaa15617..b55563244 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index 43fa9b264..cb1c495f5 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index 8dadba91f..6198acad4 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -19,10 +19,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index 024deeaae..b305e90af 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-saltstack-adapter/pom.xml b/adaptors/features/ccsdk-saltstack-adapter/pom.xml index 153bb9b89..0bb9ccd15 100644 --- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 6e80ed96b..7610f284b 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml index 50cddba0d..a0a5bc719 100644 --- a/adaptors/features/ccsdk-sql-resource/pom.xml +++ b/adaptors/features/ccsdk-sql-resource/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml index ddb0efac9..6cddd4b68 100644 --- a/adaptors/features/features-sli-adaptors/pom.xml +++ b/adaptors/features/features-sli-adaptors/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index 385bc6e1c..660f037fa 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index d8cda4541..c368f22bb 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -4,8 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + single-feature-parent + 2.1.1-SNAPSHOT diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index 2fa1a0905..9aa35a742 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + mdsal-resource + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index 1969ab1c9..fd3d8d62d 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index 5cd1384d9..801768924 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + mdsal-resource + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 74d77db6e..7aeda3ec6 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index 1d434a05a..bbc6d617a 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -19,10 +19,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + netbox-client + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index 0f2019762..577912904 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -19,10 +19,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index bbad98a2f..0e84797cb 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -19,10 +19,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + netbox-client + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors @@ -48,17 +47,14 @@ com.google.code.gson gson - ${gson.version} org.apache.httpcomponents httpcore - ${apache.httpcomponents.core.version} org.apache.httpcomponents httpclient - ${apache.httpcomponents.client.version} org.slf4j diff --git a/adaptors/pom.xml b/adaptors/pom.xml index 379c4e1b5..a61d2cda9 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -3,13 +3,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli + sli-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors - ccsdk-sli-adaptors + adaptors-root 1.2.0-SNAPSHOT pom diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index 37abc05e1..7a7e39da5 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + resource-assignment + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index c06bcdd8d..9a3ad352e 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index 7c3af582f..084766d2f 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + resource-assignment + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/saltstack-adapter/pom.xml b/adaptors/saltstack-adapter/pom.xml index e94262efd..43c95712d 100644 --- a/adaptors/saltstack-adapter/pom.xml +++ b/adaptors/saltstack-adapter/pom.xml @@ -27,14 +27,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors - saltstack-adaptor + saltstack-adapter 1.2.0-SNAPSHOT pom diff --git a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml index 895fec3c9..810c51b80 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -27,10 +27,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + saltstack-adapter + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml index fc697d42d..7088e2b82 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -16,10 +16,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + saltstack-adapter + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index 44497a054..aa38a74d1 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sql-resource + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index e448e8402..58792422e 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.adaptors + adaptors-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index 0d89bdfd8..26ccd6573 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 - + org.onap.ccsdk.sli.adaptors + sql-resource + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 7a4252148..25990a35a 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index b97d11cfd..40f6bfbca 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + dblib + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index efe43e1ae..81edb0ffa 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index 224f53aff..d4f26b504 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + dblib + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 705309995..469b94484 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index 0a3f9afa3..bce946f80 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 984484e8c..5fd7cbc5c 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 5521d624b..70d712b6a 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index 04e76b445..b27d49c08 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index 3a026e2c9..bb5218103 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index bbba2b0d1..25e5a184e 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index e0502fe3f..96c56dece 100644 --- a/core/features/features-sli-core/pom.xml +++ b/core/features/features-sli-core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 53acc2686..41e09ca49 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/pom.xml b/core/features/pom.xml index 9018b1707..8fab8d638 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -4,9 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + single-feature-parent + 2.1.1-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index 56a8692bc..c94c18834 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + filters + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 9549ccd16..42d40fc1a 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index 657e50022..6b2dabe29 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + filters + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core @@ -25,5 +24,10 @@ javax.servlet javax.servlet-api + + junit + junit + test + diff --git a/core/pom.xml b/core/pom.xml index d53f5a8bc..d74d84b8a 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,14 +3,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli + sli-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core - ccsdk-sli-core + core-root 1.2.0-SNAPSHOT pom @@ -22,7 +21,7 @@ - utils + utils dblib sli filters @@ -58,27 +57,27 @@ - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index 748488bb2..62b7e550f 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sli + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index 02b5c1ddc..2a9a8da5e 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sli + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index fbdb982f4..acff5263f 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/sli/pom.xml b/core/sli/pom.xml index 74873649a..3cb835b26 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index 671c0610f..5eac2c760 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sli + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index 7ad437d47..1fde267e8 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index f6f4d5588..11aa73c85 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sliPluginUtils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 4974d0003..971daed62 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 393d982e4..63deccadd 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sliPluginUtils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index 5e11a3609..c442b052c 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sliapi + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index 20075e1e0..5c4425218 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sliapi + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index eaa6d6039..dccfbc0a6 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - oparent - 2.1.0-SNAPSHOT + org.onap.ccsdk.sli.core + sliapi-model + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index 3a443e0e9..8e92af9da 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 8a8602ae5..789789624 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index 447c6ef0f..b9d1c9a67 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index 80e4072f8..17bbbcf54 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + utils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/utils/pom.xml b/core/utils/pom.xml index a204f8175..d2fe753af 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 8d3a785f4..02bf84d0c 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + utils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core @@ -31,7 +30,7 @@ org.osgi org.osgi.core provided - + @@ -42,7 +41,6 @@ junit junit - ${junit.version} test diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index fc3496ebd..4cfa8c924 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - parent - 2.1.0 + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index e5d5f2ce2..f8d3eae14 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + asdcApi + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index a31cd3079..6796e71b5 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 9dfe29782..8bd482873 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index a308ff5a1..19e5660f7 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 7689471b4..bff0096d6 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + daexim-offsite-backup + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index 17ca5b233..ff9a12dfc 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 05d84514a..e6a0a8db6 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index 265f2071c..a600cdbaa 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT @@ -54,12 +54,12 @@ org.onap.ccsdk.sli.core sli-common - ${sdnctl.sli.version} + ${project.version} org.onap.ccsdk.sli.core sli-provider - ${sdnctl.sli.version} + ${project.version} com.google.code.findbugs diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 74c131b55..3a30086f6 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + dataChange + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 1e8202670..59effb0d2 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index d8642bcd3..b642ad185 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index 5c4d259d3..b1369895b 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -5,8 +5,8 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 - + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.northbound @@ -17,15 +17,15 @@ ccsdk-sli-northbound :: dataChange :: ${project.artifactId} - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${project.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${project.version} + pom + import + + diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index fcc069607..fb0724989 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent standalone-parent - 2.1.0 + 2.1.1-SNAPSHOT org.onap.ccsdk.sli.northbound @@ -23,6 +23,8 @@ yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} ${project.version}-${build.number} + + 2.22.1 @@ -49,6 +51,7 @@ org.onap.dmaap.messagerouter.dmaapclient dmaapClient + 1.1.12 org.slf4j @@ -70,10 +73,28 @@ com.fasterxml.jackson.core jackson-annotations + + + org.glassfish.jersey.core + jersey-common + ${jersey.version} + + + + org.glassfish.jersey.core + jersey-client + ${jersey.version} + + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} + org.apache.velocity velocity-engine-core - + junit junit diff --git a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java index ee8bb4d6e..60925120c 100644 --- a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java +++ b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java @@ -27,9 +27,9 @@ import java.io.FileInputStream; import java.util.Properties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.att.nsa.mr.client.MRClientFactory; -import com.att.nsa.mr.client.MRConsumer; -import com.att.nsa.mr.client.response.MRConsumerResponse; +import org.onap.dmaap.mr.client.MRClientFactory; +import org.onap.dmaap.mr.client.MRConsumer; +import org.onap.dmaap.mr.client.response.MRConsumerResponse; public abstract class SdncDmaapConsumerImpl implements SdncDmaapConsumer { diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 799d499c7..c33a2ce8a 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 932c55aa2..31f6010df 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index 4d6aec730..0f6850768 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index aef5e161a..cde3cc8f5 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 75675e3bb..6302aacf4 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 6afb797d0..77b6e2f62 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index be23e6011..f175832a1 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 69825084f..7f59f5824 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -4,8 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + single-feature-parent + 2.1.1-SNAPSHOT diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 3601a3188..9b38006ae 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + lcm + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index c86b9caff..6f2c1f2ed 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index b0898e4bd..3e9e6555c 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 0414f8f2f..5c32d4501 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/pom.xml b/northbound/pom.xml index a67afc542..475ad22f2 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -3,13 +3,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli + sli-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound - ccsdk-sli-northbound + northbound-root 1.2.0-SNAPSHOT pom diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index cd9429704..cf6048f94 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - standalone-parent - 2.1.0 + org.onap.ccsdk.sli.northbound + northbound-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index c57b93800..2ce23f61d 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - parent - 2.1.0 + org.onap.ccsdk.sli.plugins + plugins-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index 5767bccc9..2f99aa6e5 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index a1e30a949..26632286e 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index 6566af7b8..03bb475b6 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index 1ebfa6d83..c3d742294 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index 7533aa808..316a72b14 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index 1ac638b54..bd0f16b57 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml index 4deb5362c..45daca5a6 100644 --- a/plugins/features/ccsdk-template-node/pom.xml +++ b/plugins/features/ccsdk-template-node/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml index 848828b3c..a9fba195a 100644 --- a/plugins/features/features-sli-plugins/pom.xml +++ b/plugins/features/features-sli-plugins/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index 0ef6a107e..ce5f1ed58 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index a7c8ffa69..6e0f2227e 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -4,8 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + single-feature-parent + 2.1.1-SNAPSHOT diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index b7a48e80f..2dbabd930 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.plugins + gr-toolkit + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index 1b3ce6802..50c75ac3d 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 8e264c476..7bb5e0485 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.plugins + plugins-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index 4a3654e09..3bdecd54f 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/plugins/pom.xml b/plugins/pom.xml index 11027f22a..79a508b45 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli + sli-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins - ccsdk-sli-plugins + plugins-root 1.2.0-SNAPSHOT pom diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index a2f1a8522..8ffa0198c 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + properties-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index ae9b4d37b..c0600d31c 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + plugins-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index 30b00f762..ea2dddd16 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 + org.onap.ccsdk.sli.plugins + properties-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index 51f3a3d2f..fa3d93a6d 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + restapi-call-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index faac0884a..05ada5f3b 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + plugins-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 2e9152060..86e282361 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 + org.onap.ccsdk.sli.plugins + restapi-call-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 5b9ff7555..9a85acb74 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + restconf-client + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index d3f833fd4..3b376562a 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + plugins-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index 0baac7d44..66d05de10 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -5,7 +5,8 @@ org.onap.ccsdk.parent binding-parent - 2.1.0 + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.plugins @@ -31,6 +32,10 @@ org.glassfish.jersey.media jersey-media-sse + + org.glassfish.jersey.inject + jersey-hk2 + javax.ws.rs javax.ws.rs-api diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index a91212acd..d4b613ba2 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/installer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + sshapi-call-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index d55046f3e..e3e714d9c 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + plugins-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index 0717bd119..d48b4a97c 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 + org.onap.ccsdk.sli.plugins + sshapi-call-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index d3dc569df..42d295bd3 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + template-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 2dbbe5e70..cb0f48321 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + org.onap.ccsdk.sli.plugins + plugins-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index 883ab7cbb..930afef7d 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0 + org.onap.ccsdk.sli.plugins + template-node + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.plugins @@ -43,7 +43,7 @@ org.apache.velocity - velocity + velocity-engine-core diff --git a/pom.xml b/pom.xml index 4f335c8ec..29ac15444 100755 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent oparent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT org.onap.ccsdk.sli - ccsdk-sli + sli-root 1.2.0-SNAPSHOT pom -- cgit 1.2.3-korg