diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-01-26 13:15:47 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2021-01-26 13:54:11 -0500 |
| commit | 5de81966f5574ae83e85aa7d5aa8865ea5deef24 (patch) | |
| tree | 06539b81ae2f3bbeddd3f7f30199cdd200a8480c | |
| parent | 7de29bfea89ff53a446bea07d8f74d1aaa87045b (diff) | |
Revert "Limit use of odlparent poms"
This reverts commit 7de29bfea89ff53a446bea07d8f74d1aaa87045b,
due to issues encountered in the odlsli container in ccsdk/distribution.
Issue-ID: CCSDK-3001
Issue-ID: CCSDK-3099
Change-Id: I79252b74693895f483eb390c575bb244195fe7ed
Signed-off-by: Dan Timoney <dtimoney@att.com>
123 files changed, 483 insertions, 421 deletions
diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 9ec26b39b..190dd079d 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>aai-service</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index 638de3f67..b06bdfc97 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 e2c281af6..11d04b1fe 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>aai-service</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 382533826..f525b8abb 100644 --- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -17,9 +17,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adapter</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 8a555dd11..0815039f8 100644 --- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml @@ -27,9 +27,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adapter</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml index 934cc0b24..e08cb36a1 100644 --- a/adaptors/ansible-adapter/pom.xml +++ b/adaptors/ansible-adapter/pom.xml @@ -27,13 +27,14 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adapter</artifactId> + <artifactId>ansible-adaptor</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index df33d7d4e..df7c27a23 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.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>parent</artifactId> + <version>2.1.1-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 0322a9f75..fb8d9fba6 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.sli.adaptors.base</groupId> - <artifactId>http</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index f092b44d8..3dfefc512 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 c4b1e73fa..db808d1c5 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors.base</groupId> - <artifactId>http</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index daa11e3d7..8a1c1e7a5 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 dce8adfa3..08d27094e 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 a34723902..97d09c8e9 100644 --- a/adaptors/features/ccsdk-ansible-adapter/pom.xml +++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 e1a60c55d..57ff4a9a9 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 cd7d1e48f..3ac8c094c 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 b55563244..89986ddc6 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.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-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 cb1c495f5..b308282fb 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.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-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 6198acad4..c144c1e52 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -19,9 +19,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 b305e90af..f24cbb053 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 0bb9ccd15..6bc2c529a 100644 --- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 7610f284b..2ccda3a61 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 a0a5bc719..a1f1ce967 100644 --- a/adaptors/features/ccsdk-sql-resource/pom.xml +++ b/adaptors/features/ccsdk-sql-resource/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index 660f037fa..faed6edad 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index c368f22bb..abbfc45b6 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> + <artifactId>odlparent-lite</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 9aa35a742..dab93e48e 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>mdsal-resource</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index fd3d8d62d..19c282c82 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 801768924..ad6cf834c 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>mdsal-resource</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 7aeda3ec6..b004c7bbf 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 bbc6d617a..470a61a1e 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -19,9 +19,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>netbox-client</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index 577912904..4b9fc7ffa 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -19,9 +19,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 0e84797cb..483e80868 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -19,9 +19,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>netbox-client</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> @@ -47,14 +48,17 @@ <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 a61d2cda9..b2c30ca3d 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>sli-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> + <artifactId>ccsdk-sli-adaptors</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 7a7e39da5..845921251 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>resource-assignment</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index 9a3ad352e..bace22382 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 084766d2f..3054e9a2a 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>resource-assignment</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/saltstack-adapter/pom.xml b/adaptors/saltstack-adapter/pom.xml index 43c95712d..402be7742 100644 --- a/adaptors/saltstack-adapter/pom.xml +++ b/adaptors/saltstack-adapter/pom.xml @@ -27,13 +27,14 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>saltstack-adapter</artifactId> + <artifactId>saltstack-adaptor</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 810c51b80..5d5872224 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -27,9 +27,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>saltstack-adapter</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 7088e2b82..f6a56a32b 100644 --- a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -16,9 +16,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>saltstack-adapter</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 aa38a74d1..f4895e395 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sql-resource</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index 58792422e..b792f610b 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>adaptors-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 26ccd6573..e86ec6beb 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sql-resource</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 25990a35a..e8577257e 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 40f6bfbca..ea0b537e7 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>dblib</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index 81edb0ffa..b3ea4fd79 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index d4f26b504..d976e551b 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>dblib</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 469b94484..f1164017a 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 bce946f80..3be459e99 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 5fd7cbc5c..11d0dca31 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 70d712b6a..c6fcfc808 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 b27d49c08..a4c9b7014 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 bb5218103..25ea6c1d0 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 25e5a184e..7a4966d40 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 41e09ca49..51b8fcd97 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/features/pom.xml b/core/features/pom.xml index 8fab8d638..9a93bda37 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -4,8 +4,9 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> + <artifactId>odlparent-lite</artifactId> <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index c94c18834..a550293d6 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>filters</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 42d40fc1a..e2cc34e59 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index 6b2dabe29..3dd4f5bb8 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>filters</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -24,10 +25,5 @@ <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 d74d84b8a..a80158872 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,13 +3,14 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>sli-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> + <artifactId>ccsdk-sli-core</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -21,7 +22,7 @@ </organization> <modules> - <module>utils</module> + <module>utils</module> <module>dblib</module> <module>sli</module> <module>filters</module> @@ -57,27 +58,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 62b7e550f..34db3104c 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index 2a9a8da5e..4ef1a548d 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sli/pom.xml b/core/sli/pom.xml index 3cb835b26..bf0d52fce 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 5eac2c760..fac9a7796 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index 11aa73c85..63dd074ba 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliPluginUtils</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 971daed62..b02e5c5ab 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 63deccadd..7312003bb 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliPluginUtils</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index c442b052c..8a3b501d7 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliapi</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index 5c4425218..de1a46fa2 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliapi</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 dccfbc0a6..1b8d1a0cb 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.sli.core</groupId> - <artifactId>sliapi-model</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>oparent</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 789789624..2c5d83370 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index 17bbbcf54..8df51194c 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>utils</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/utils/pom.xml b/core/utils/pom.xml index d2fe753af..a770da6b5 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>core-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 02bf84d0c..e3a805f82 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>utils</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> @@ -30,7 +31,7 @@ <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> <scope>provided</scope> - </dependency> + </dependency> <!-- Testing Dependencies --> <dependency> @@ -41,6 +42,7 @@ <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 4cfa8c924..59edd9f93 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.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>parent</artifactId> + <version>2.1.1-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 f8d3eae14..2c56b4abe 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>asdcApi</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 8bd482873..b12248893 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index bff0096d6..0d49dc8d3 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>daexim-offsite-backup</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index e6a0a8db6..64289dd92 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 a600cdbaa..c7b7d1c86 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -54,12 +54,12 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <version>${project.version}</version> + <version>${ccsdk.sli.core.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>${project.version}</version> + <version>${ccsdk.sli.core.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 3a30086f6..066a840b7 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>dataChange</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index b642ad185..2bede417e 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index b1369895b..10f6f001a 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -6,7 +6,7 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.1.1-SNAPSHOT</version> - <relativePath /> + <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 fb0724989..702ad369e 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -23,8 +23,6 @@ <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> @@ -51,7 +49,6 @@ <dependency> <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId> <artifactId>dmaapClient</artifactId> - <version>1.1.12</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -73,28 +70,10 @@ <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 60925120c..ee8bb4d6e 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 org.onap.dmaap.mr.client.MRClientFactory; -import org.onap.dmaap.mr.client.MRConsumer; -import org.onap.dmaap.mr.client.response.MRConsumerResponse; +import com.att.nsa.mr.client.MRClientFactory; +import com.att.nsa.mr.client.MRConsumer; +import com.att.nsa.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 c33a2ce8a..eef81ba51 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 31f6010df..5bcb1822f 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 0f6850768..4a62b1d2e 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 cde3cc8f5..3c24a7922 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 6302aacf4..4fd04b113 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index f175832a1..1b7783b2a 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 7f59f5824..4de0fe76a 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> + <artifactId>odlparent-lite</artifactId> <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 9b38006ae..d566ba8ed 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>lcm</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index 3e9e6555c..4bbd301e9 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/pom.xml b/northbound/pom.xml index 475ad22f2..5491f7043 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>sli-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> + <artifactId>ccsdk-sli-northbound</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 cf6048f94..e253830c8 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.sli.northbound</groupId> - <artifactId>northbound-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>standalone-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index 2ce23f61d..bfe4130c3 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.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>parent</artifactId> + <version>2.1.1-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 2f99aa6e5..9dbb80ebf 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 26632286e..3caffcd42 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 03bb475b6..217071c08 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 c3d742294..bf4994b33 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 316a72b14..d94d0e506 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 bd0f16b57..aa0af70f8 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </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 45daca5a6..631812825 100644 --- a/plugins/features/ccsdk-template-node/pom.xml +++ b/plugins/features/ccsdk-template-node/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index ce5f1ed58..162a51545 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-feature-aggregator</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index 6e0f2227e..d6ea3c538 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> + <artifactId>odlparent-lite</artifactId> <version>2.1.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index 2dbabd930..9bad87c78 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>gr-toolkit</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 7bb5e0485..a1908945c 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -3,9 +3,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/pom.xml b/plugins/pom.xml index 79a508b45..f8245f29c 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>sli-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> + <artifactId>ccsdk-sli-plugins</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 8ffa0198c..5807e0d5f 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.sli.plugins</groupId> - <artifactId>properties-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 c0600d31c..1aa8da24b 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.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 ea2dddd16..a8e4e4db1 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.sli.plugins</groupId> - <artifactId>properties-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-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 fa3d93a6d..f9be5146d 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.sli.plugins</groupId> - <artifactId>restapi-call-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 05ada5f3b..9d6918979 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.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 86e282361..a2ee45161 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.sli.plugins</groupId> - <artifactId>restapi-call-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-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 9a85acb74..a0285405b 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.sli.plugins</groupId> - <artifactId>restconf-client</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 3b376562a..132c62dad 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.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 66d05de10..dbe16754f 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -6,7 +6,6 @@ <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.1.1-SNAPSHOT</version> - <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -33,10 +32,6 @@ <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 d4b613ba2..a5c71a72e 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.sli.plugins</groupId> - <artifactId>sshapi-call-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 e3e714d9c..c3bc7ecaa 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.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 d48b4a97c..5dee60395 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.sli.plugins</groupId> - <artifactId>sshapi-call-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-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 42d295bd3..6c2fdd798 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.sli.plugins</groupId> - <artifactId>template-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 cb0f48321..55e233e8b 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.sli.plugins</groupId> - <artifactId>plugins-root</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1-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 930afef7d..7ae8e6d4d 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.sli.plugins</groupId> - <artifactId>template-node</artifactId> - <version>1.2.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -43,7 +43,7 @@ </dependency> <dependency> <groupId>org.apache.velocity</groupId> - <artifactId>velocity-engine-core</artifactId> + <artifactId>velocity</artifactId> </dependency> </dependencies> </project> @@ -10,7 +10,7 @@ </parent> <groupId>org.onap.ccsdk.sli</groupId> - <artifactId>sli-root</artifactId> + <artifactId>ccsdk-sli</artifactId> <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> |