Use dependency management for cds proto-definition artifact

Refer to: https://gerrit.onap.org/r/#/c/policy/parent/+/98733/

Issue-ID: POLICY-2254
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Ia7fe2f294187f5c108781c8798890045445ab825

diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index a020e5e..bebc992 100644 (file)
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -144,10 +144,6 @@
       <version>${policy.models.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.cds.components</groupId>
-      <artifactId>proto-definition</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/controlloop/pom.xml b/controlloop/pom.xml
index dff61c1..734d79d 100644 (file)
--- a/controlloop/pom.xml
+++ b/controlloop/pom.xml
@@ -21,36 +21,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
-
   <parent>
     <groupId>org.onap.policy.drools-applications</groupId>
     <artifactId>drools-applications</artifactId>
     <version>1.6.0-SNAPSHOT</version>
   </parent>
-
-    <groupId>org.onap.policy.drools-applications.controlloop</groupId>
-    <artifactId>controlloop</artifactId>
-
-  <properties>
-    <ccsdk.version>0.4.4</ccsdk.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.onap.ccsdk.cds.components</groupId>
-        <artifactId>proto-definition</artifactId>
-        <version>${ccsdk.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-
+  <groupId>org.onap.policy.drools-applications.controlloop</groupId>
+  <artifactId>controlloop</artifactId>
   <modules>
     <module>common</module>
     <module>templates</module>
     <module>packages</module>
   </modules>
-
-
 </project>

diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index 47d815c..56f04bf 100644 (file)
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -194,10 +194,6 @@
       <version>${policy.models.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.onap.ccsdk.cds.components</groupId>
-      <artifactId>proto-definition</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
       <artifactId>cds</artifactId>

diff --git a/pom.xml b/pom.xml
index 4be31e7..1c47eb4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -259,6 +259,11 @@
             <artifactId>logback-classic</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- Common Controller SDK -->
+        <dependency>
+            <groupId>org.onap.ccsdk.cds.components</groupId>
+            <artifactId>proto-definition</artifactId>
+        </dependency>
     </dependencies>