summaryrefslogtreecommitdiffstats
path: root/adaptors/features
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-11-25 08:29:23 -0500
committerDan Timoney <dtimoney@att.com>2020-12-10 16:06:34 -0500
commit7de29bfea89ff53a446bea07d8f74d1aaa87045b (patch)
tree66f3824182cc91001e5540aa8ff545ed559f3a24 /adaptors/features
parentbe5662d19f464ab6e0c79c348e893a35ce780aea (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>
Diffstat (limited to 'adaptors/features')
-rw-r--r--adaptors/features/ccsdk-aai-service/pom.xml7
-rw-r--r--adaptors/features/ccsdk-ansible-adapter/pom.xml7
-rw-r--r--adaptors/features/ccsdk-base-http/pom.xml7
-rw-r--r--adaptors/features/ccsdk-mdsal-resource/pom.xml7
-rwxr-xr-xadaptors/features/ccsdk-messagerouter-consumer/pom.xml6
-rwxr-xr-xadaptors/features/ccsdk-messagerouter-publisher/pom.xml6
-rw-r--r--adaptors/features/ccsdk-netbox-client/pom.xml7
-rw-r--r--adaptors/features/ccsdk-resource-assignment/pom.xml7
-rw-r--r--adaptors/features/ccsdk-saltstack-adapter/pom.xml7
-rw-r--r--adaptors/features/ccsdk-sli-adaptors-all/pom.xml7
-rw-r--r--adaptors/features/ccsdk-sql-resource/pom.xml7
-rw-r--r--adaptors/features/features-sli-adaptors/pom.xml2
-rwxr-xr-xadaptors/features/installer/pom.xml7
-rwxr-xr-xadaptors/features/pom.xml4
14 files changed, 39 insertions, 49 deletions
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>