From: Dan Timoney <dtimoney@att.com>
Date: Tue, 27 Feb 2018 00:37:10 +0000 (-0500)
Subject: Control versions from parent
X-Git-Tag: v1.0.1~11
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3c5275a2e67f40824b0ae62fc1bab15af2414a34;p=ccsdk%2Fparent.git

Control versions from parent

Add versions to dependencyManagement section of parent poms so
that version tags can be removed from project pom.xmls.

Change-Id: I44826a7dca90d1a6e7816f7c988bf9d1f8795c40
Issue-ID: CCSDK-174
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index a0b69663..84aea68b 100755
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -571,6 +571,21 @@
                 <artifactId>testng</artifactId>
                 <version>6.11</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
         </dependencies>
 
     </dependencyManagement>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 3ebc367f..d444be52 100755
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -440,28 +440,55 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-common</artifactId>
-                <version>${sdnctl.sli.version}</version>
+                <version>${ccsdk.sli.core.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-provider</artifactId>
-                <version>${sdnctl.sli.version}</version>
+                <version>${ccsdk.sli.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sli</artifactId>
+                <version>${ccsdk.sli.core.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
-
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
                 <version>${sdnctl.aai.service.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>6.11</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
         </dependencies>
 
     </dependencyManagement>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 66a49f9f..96c5251f 100755
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -454,28 +454,55 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-common</artifactId>
-                <version>${sdnctl.sli.version}</version>
+                <version>${ccsdk.sli.core.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sli-provider</artifactId>
-                <version>${sdnctl.sli.version}</version>
+                <version>${ccsdk.sli.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>ccsdk-sli</artifactId>
+                <version>${ccsdk.sli.core.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
-
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
                 <version>${sdnctl.aai.service.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.onap.sdnc.core</groupId>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>6.11</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-test</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-beans</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-context</artifactId>
+                <version>${spring.version}</version>
+            </dependency>
         </dependencies>
 
     </dependencyManagement>