From 4e69f3358d31173a222b275e2a82da692846aa1a Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 29 Jan 2021 12:46:06 -0500
Subject: Revert "update common and data-provider"

This reverts commit a3e70a1a48d13193d9f28a2d91089d5b253d3e91.
Change was incomplete - many modules still reference version
2.1.0 (Sodium-based) of CCSDK parent poms, causing version
conflicts in odlsli docker.

Issue-ID: CCSDK-3076
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I447371239a1bfe102b705e7ecbd964f368780657
---
 sdnr/wt/featureaggregator/feature/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'sdnr/wt/featureaggregator/feature')

diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml
index c2149ad37..232cb6f07 100644
--- a/sdnr/wt/featureaggregator/feature/pom.xml
+++ b/sdnr/wt/featureaggregator/feature/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
@@ -83,7 +83,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-	<!--        <dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-devicemanager-oran-feature</artifactId>
             <version>${project.version}</version>
@@ -117,7 +117,7 @@
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-	</dependency> -->
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-mountpoint-registrar-feature</artifactId>
-- 
cgit 1.2.3-korg