diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-11-25 08:29:23 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-12-10 16:06:34 -0500 |
| commit | 7de29bfea89ff53a446bea07d8f74d1aaa87045b (patch) | |
| tree | 66f3824182cc91001e5540aa8ff545ed559f3a24 | |
| parent | be5662d19f464ab6e0c79c348e893a35ce780aea (diff) | |
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 <dtimoney@att.com>
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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>aai-service</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>aai-service</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ansible-adapter</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ansible-adapter</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adaptor</artifactId> + <artifactId>ansible-adapter</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.adaptors.base</groupId> + <artifactId>http</artifactId> + <version>1.2.0-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-parent</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.base</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors.base</groupId> + <artifactId>http</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sliadaptors-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>mdsal-resource</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>mdsal-resource</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>netbox-client</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>netbox-client</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> @@ -48,17 +47,14 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>${gson.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>${apache.httpcomponents.core.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>${apache.httpcomponents.client.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli</groupId> + <artifactId>sli-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-sli-adaptors</artifactId> + <artifactId>adaptors-root</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>resource-assignment</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>resource-assignment</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>saltstack-adaptor</artifactId> + <artifactId>saltstack-adapter</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>saltstack-adapter</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>saltstack-adapter</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sql-resource</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>adaptors-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>sql-resource</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>core-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>dblib</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>core-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>dblib</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>slicore-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>filters</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>core-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>filters</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -25,5 +24,10 @@ <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli</groupId> + <artifactId>sli-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-sli-core</artifactId> + <artifactId>core-root</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -22,7 +21,7 @@ </organization> <modules> - <module>utils</module> + <module>utils</module> <module>dblib</module> <module>sli</module> <module>filters</module> @@ -58,27 +57,27 @@ </property> </activation> <build> - <plugins> - <plugin> - <groupId>com.blackducksoftware.integration</groupId> - <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> - <inherited>false</inherited> - <configuration> - <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> - </configuration> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> </profile> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>core-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sliPluginUtils</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>core-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sliPluginUtils</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sliapi</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sliapi</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>oparent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sliapi-model</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>core-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>utils</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>core-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>utils</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -31,7 +30,7 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> - </dependency> + </dependency> <!-- Testing Dependencies --> <dependency> @@ -42,7 +41,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>northbound-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>asdcApi</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>northbound-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>daexim-offsite-backup</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>northbound-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> @@ -54,12 +54,12 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>${sdnctl.sli.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>${sdnctl.sli.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>dataChange</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>northbound-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <version>2.1.1-SNAPSHOT</version> + <relativePath /> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -17,15 +17,15 @@ <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> </dependencyManagement> <dependencies> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -23,6 +23,8 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> + <!-- dmaap client requires an older jersey version --> + <jersey.version>2.22.1</jersey.version> </properties> @@ -49,6 +51,7 @@ <dependency> <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> + <version>1.1.12</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -70,10 +73,28 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </dependency> + + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + <version>${jersey.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>${jersey.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-json-jackson</artifactId> + <version>${jersey.version}</version> + </dependency> <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity-engine-core</artifactId> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>slinorthbound-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>slinorthbound-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>slinorthbound-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>slinorthbound-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>slinorthbound-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>slinorthbound-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>lcm</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>northbound-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli</groupId> + <artifactId>sli-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>ccsdk-sli-northbound</artifactId> + <artifactId>northbound-root</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>standalone-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>northbound-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sliplugins-feature-aggregator</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>gr-toolkit</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> - <relativePath/> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli</groupId> + <artifactId>sli-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>ccsdk-sli-plugins</artifactId> + <artifactId>plugins-root</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>properties-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>properties-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>restapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>restapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>restconf-client</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -32,6 +33,10 @@ <artifactId>jersey-media-sse</artifactId> </dependency> <dependency> + <groupId>org.glassfish.jersey.inject</groupId> + <artifactId>jersey-hk2</artifactId> + </dependency> + <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sshapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>sshapi-call-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>template-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>plugins-root</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0</version> + <groupId>org.onap.ccsdk.sli.plugins</groupId> + <artifactId>template-node</artifactId> + <version>1.2.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -43,7 +43,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> + <artifactId>velocity-engine-core</artifactId> </dependency> </dependencies> </project> @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.1.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>ccsdk-sli</artifactId> + <artifactId>sli-root</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> |