update dependency to policy/models

Update the dependency of model-impl from drools-applications
to policy/models.

Issue-ID: POLICY-1264
Change-Id: I07fcb29501499a97689d2d27c845bf8e411e7825
Signed-off-by: shaoqiu <tim.huang@est.tech>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

2 files changed, 43 insertions, 41 deletions

diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml
index e4c2d3504..40e37beff 100644
--- a/controlloop/common/feature-controlloop-management/pom.xml
+++ b/controlloop/common/feature-controlloop-management/pom.xml
@@ -3,6 +3,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2019 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -96,54 +97,54 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>events</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>appc</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>appclcm</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>sdnc</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>sdnr</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>vfc</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>so</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>aai</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>sdc</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>trafficgenerator</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
@@ -156,9 +157,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
             <artifactId>actorServiceProvider</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -167,9 +168,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
             <artifactId>actor.appc</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -178,9 +179,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
             <artifactId>actor.appclcm</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -189,9 +190,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
             <artifactId>actor.sdnr</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -200,9 +201,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
             <artifactId>actor.so</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -211,9 +212,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
             <artifactId>actor.vfc</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -222,9 +223,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
             <artifactId>actor.sdnc</artifactId>
-            <version>${project.version}</version>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -233,9 +234,9 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
-            <artifactId>policy-yaml</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.onap.policy.models.policy-models-interactions</groupId>
+            <artifactId>model-yaml</artifactId>
+            <version>${policy.models.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
diff --git a/controlloop/common/feature-controlloop-management/src/test/resources/op.pom b/controlloop/common/feature-controlloop-management/src/test/resources/op.pom
index 133387217..4285acda6 100644
--- a/controlloop/common/feature-controlloop-management/src/test/resources/op.pom
+++ b/controlloop/common/feature-controlloop-management/src/test/resources/op.pom
@@ -4,6 +4,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2019 Nordix Foundation.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -25,9 +26,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+        <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
         <artifactId>model-impl</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.drools.apps.test</groupId>
@@ -36,9 +37,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+            <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
             <artifactId>events</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>