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>
diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml
index dce8adf..08d2709 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 a347239..97d09c8 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 e1a60c5..57ff4a9 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 cd7d1e4..3ac8c09 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 b555632..89986dd 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 cb1c495..b308282 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 6198aca..c144c1e 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 b305e90..f24cbb0 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 0bb9ccd..6bc2c52 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 7610f28..2ccda3a 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 a0a5bc7..a1f1ce9 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 660f037..faed6ed 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 c368f22..abbfc45 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>