From 93206cf9624df06a518a8016b965b9104e687f14 Mon Sep 17 00:00:00 2001
From: Hengye <yehui.wang@est.tech>
Date: Thu, 4 Apr 2019 03:13:35 +0000
Subject: update dependency on drools-applications/tmp

update dependencies from policy/models

Issue-ID: POLICY-1264
Change-Id: Idd7809b11ae9e63ca75d49d78a9e7b52a63e49b9
Signed-off-by: Hengye <yehui.wang@est.tech>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 .../META-INF/maven/archetype-metadata.xml          |  3 +-
 .../src/main/resources/archetype-resources/pom.xml | 37 +++++-----
 .../META-INF/maven/archetype-metadata.xml          |  5 +-
 .../src/main/resources/archetype-resources/pom.xml | 37 +++++-----
 controlloop/templates/template.demo.clc/pom.xml    | 79 +++++++++++-----------
 controlloop/templates/template.demo/pom.xml        | 74 ++++++++++----------
 pom.xml                                            |  2 +
 7 files changed, 123 insertions(+), 114 deletions(-)

diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml
index 2eadf96ba..2c4b2cee2 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -4,6 +4,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.
@@ -50,7 +51,7 @@
 		<defaultValue>vm1.mr.simpledemo.onap.org</defaultValue>
      </requiredProperty>
      <requiredProperty key="dependenciesVersion">
-     	<defaultValue>1.3.4</defaultValue>
+     	<defaultValue>2.0.0-SNAPSHOT</defaultValue>
      </requiredProperty>
   </requiredProperties>
 
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
index 2197a8e39..2fb5d868b 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
@@ -4,6 +4,7 @@
   ONAP
   ================================================================================
   Copyright (C) 2017, 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.
@@ -49,52 +50,52 @@
 
   <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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</version>
     </dependency>
@@ -109,42 +110,42 @@
       <version>${dependenciesVersion}</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>${dependenciesVersion}</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>actor.appc</artifactId>
       <version>${dependenciesVersion}</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>actor.appclcm</artifactId>
       <version>${dependenciesVersion}</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>actor.so</artifactId>
       <version>${dependenciesVersion}</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>actor.sdnr</artifactId>
       <version>${dependenciesVersion}</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>actor.vfc</artifactId>
       <version>${dependenciesVersion}</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>actor.sdnc</artifactId>
       <version>${dependenciesVersion}</version>
     </dependency>    
     <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <groupId>org.onap.policy.models.policy-models-interactions</groupId> 
       <artifactId>policy-yaml</artifactId>
       <version>${dependenciesVersion}</version>
     </dependency>
diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/META-INF/maven/archetype-metadata.xml b/controlloop/templates/archetype-cl-usecases/src/main/resources/META-INF/maven/archetype-metadata.xml
index e27e3e401..7a870a8ba 100644
--- a/controlloop/templates/archetype-cl-usecases/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -3,8 +3,9 @@
   ============LICENSE_START=======================================================
   archetype-closed-loop-demo-rules
   ================================================================================
-  Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019 Huawei Technologies Co., Ltd. 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.
@@ -102,7 +103,7 @@
 		<defaultValue>vm1.mr.simpledemo.openecomp.org</defaultValue>
      </requiredProperty>
      <requiredProperty key="dependenciesVersion">
-     	<defaultValue>1.2.0</defaultValue>
+     	<defaultValue>2.0.0-SNAPSHOT</defaultValue>
      </requiredProperty>
   </requiredProperties>
       
diff --git a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml
index e4629803a..40e65da88 100644
--- a/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml
+++ b/controlloop/templates/archetype-cl-usecases/src/main/resources/archetype-resources/pom.xml
@@ -4,6 +4,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.
@@ -49,52 +50,52 @@
 
   <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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</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>${dependenciesVersion}</version>
     </dependency>
@@ -109,42 +110,42 @@
       <version>${dependenciesVersion}</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>${dependenciesVersion}</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>actor.appc</artifactId>
       <version>${dependenciesVersion}</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>actor.appclcm</artifactId>
       <version>${dependenciesVersion}</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>actor.so</artifactId>
       <version>${dependenciesVersion}</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>actor.sdnr</artifactId>
       <version>${dependenciesVersion}</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>actor.vfc</artifactId>
       <version>${dependenciesVersion}</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>actor.sdnc</artifactId>
       <version>${dependenciesVersion}</version>
     </dependency>    
     <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <groupId>org.onap.policy.models.policy-models-interactions</groupId>      
       <artifactId>policy-yaml</artifactId>
       <version>${dependenciesVersion}</version>
     </dependency>
diff --git a/controlloop/templates/template.demo.clc/pom.xml b/controlloop/templates/template.demo.clc/pom.xml
index 917b72fae..16e7e80f1 100644
--- a/controlloop/templates/template.demo.clc/pom.xml
+++ b/controlloop/templates/template.demo.clc/pom.xml
@@ -3,6 +3,7 @@
   drools-applications Control Loop Drools Templates
   ================================================================================
   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.
@@ -59,51 +60,51 @@
       <scope>test</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>events</artifactId>
-      <version>${project.version}</version>
+      <version>${policy.models.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -119,21 +120,21 @@
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -148,45 +149,45 @@
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -206,9 +207,9 @@
         <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <groupId>org.onap.policy.models.policy-models-interactions</groupId>
       <artifactId>simulators</artifactId>
-      <version>${project.version}</version>
+      <version>${policy.models.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index 7ec0cd561..446117e1f 100644
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -3,6 +3,7 @@
   drools-applications Control Loop Drools Templates
   ================================================================================
   Copyright (C) 2017-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.
@@ -59,51 +60,51 @@
       <scope>test</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>events</artifactId>
-      <version>${project.version}</version>
+      <version>${policy.models.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -113,19 +114,20 @@
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <!-- <groupId>org.onap.policy.models.policy-models-interactions</groupId> -->
       <artifactId>policy-yaml</artifactId>
       <version>${project.version}</version>
       <scope>provided</scope>
@@ -142,45 +144,45 @@
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </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>
       <scope>provided</scope>
     </dependency>    
     <dependency>
@@ -200,9 +202,9 @@
         <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <groupId>org.onap.policy.models.policy-models-interactions</groupId>
       <artifactId>simulators</artifactId>
-      <version>${project.version}</version>
+      <version>${policy.models.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 993ae6130..99974e2fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,6 +3,7 @@
   drools-pdp-apps
   ================================================================================
   Copyright (C) 2017-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.
@@ -59,6 +60,7 @@
 
         <!-- Project common dependency versions -->
         <version.policy.common>1.4.0-SNAPSHOT</version.policy.common>
+        <policy.models.version>2.0.0-SNAPSHOT</policy.models.version>
         <version.policy.drools-pdp>1.4.0-SNAPSHOT</version.policy.drools-pdp>
     </properties>
 
-- 
cgit 1.2.3-korg