From c06db6e74139422b874ce0365842624ecde81f8d Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sd378r@intl.att.com>
Date: Fri, 22 Sep 2017 16:52:51 +0200
Subject: [PATCH] Remove the Policy Dep Snapshot

The policy dependencies have been changed to refer to
non snapshot packages. Some java packages have been updated too.


Change-Id: Id70a0247b859368c642a73fa59bbda93bf9904ae
Issue-ID: CLAMP-55
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
---
 pom.xml                                            | 66 ++++++++++++++--------
 .../clds/client/req/OperationalPolicyReq.java      |  6 +-
 .../clds/client/req/OperationalPolicyReqTest.java  |  4 +-
 3 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8d0b0535..d1b17b75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,25 +391,45 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.onap.policy.engine</groupId>
-			<artifactId>ControlloopPolicy</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>apache-log4j-extras</artifactId>
-					<groupId>log4j</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+
+    <dependency>
+      <groupId>org.onap.policy.drools-applications</groupId>
+      <artifactId>policy-yaml</artifactId>
+      <version>1.1.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>apache-log4j-extras</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+		<dependency>
+      <groupId>org.onap.policy.drools-applications</groupId>
+      <artifactId>sdc</artifactId>
+      <version>1.1.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>log4j</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <artifactId>apache-log4j-extras</artifactId>
+          <groupId>log4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -443,9 +463,9 @@
 
 		<!-- Remove the MYSQL connector and replace it by Mariadb -->
 		<dependency>
-			 <groupId>org.mariadb.jdbc</groupId>
-			 <artifactId>mariadb-java-client</artifactId>
-			 <version>2.1.1</version>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>2.1.1</version>
 		</dependency>
 	</dependencies>
 
@@ -660,7 +680,7 @@
 							</buildArgs>
 						</configuration>
 					</execution>
-					
+
 					<execution>
 						<id>tag-image-latest-timestamp</id>
 						<phase>package</phase>
diff --git a/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java b/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java
index 4db09c3b..1d345e9c 100644
--- a/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java
+++ b/src/main/java/org/onap/clamp/clds/client/req/OperationalPolicyReq.java
@@ -46,9 +46,9 @@ import org.onap.clamp.clds.model.prop.PolicyItem;
 import org.onap.clamp.clds.model.prop.Tca;
 import org.onap.clamp.clds.model.refprop.RefProp;
 import org.onap.policy.api.AttributeType;
-import org.onap.policy.asdc.Resource;
-import org.onap.policy.asdc.ResourceType;
-import org.onap.policy.asdc.Service;
+import org.onap.policy.sdc.Resource;
+import org.onap.policy.sdc.ResourceType;
+import org.onap.policy.sdc.Service;
 import org.onap.policy.controlloop.policy.OperationsAccumulateParams;
 import org.onap.policy.controlloop.policy.Policy;
 import org.onap.policy.controlloop.policy.PolicyResult;
diff --git a/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java b/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java
index cf1fc98e..d4584436 100644
--- a/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java
+++ b/src/test/java/org/onap/clamp/clds/client/req/OperationalPolicyReqTest.java
@@ -31,8 +31,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
-import org.onap.policy.asdc.Resource;
-import org.onap.policy.asdc.ResourceType;
+import org.onap.policy.sdc.Resource;
+import org.onap.policy.sdc.ResourceType;
 import org.onap.policy.controlloop.policy.PolicyResult;
 
 public class OperationalPolicyReqTest {
-- 
2.16.6