From 76706005ee07da01fc3e00ed44ada720e29855b1 Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Mon, 4 Sep 2017 21:37:25 -0700
Subject: Change to CCSDK and ODL Carbon

Change-Id: I49a0f436e366ff4a1b99705fb6bb5e7ba82e6ecc
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-Id: [APPC-91]
Issue-Id: [APPC-158]
---
 appc-config/appc-encryption-tool/provider/pom.xml                   | 5 +++--
 .../org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java    | 4 ++--
 .../appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java        | 6 +++---
 .../appc/encryptiontool/wrapper/WrapperEncryptionTool.java          | 2 +-
 .../java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java  | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'appc-config/appc-encryption-tool/provider')

diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml
index 6c48ada8b..0daa10a5c 100644
--- a/appc-config/appc-encryption-tool/provider/pom.xml
+++ b/appc-config/appc-encryption-tool/provider/pom.xml
@@ -21,12 +21,13 @@
             <version>${equinox.osgi.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.sdnc.core</groupId>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.openecomp.sdnc.adaptors</groupId>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-provider</artifactId>
+	    <version>${openecomp.sdnc.sql-resource.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
index 4f7630478..0174d477a 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
@@ -31,8 +31,8 @@ import javax.sql.rowset.CachedRowSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.openecomp.sdnc.sli.resource.dblib.DBResourceManager;
-import org.openecomp.sdnc.sli.resource.dblib.DbLibService;
+import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
+import org.onap.ccsdk.sli.core.dblib.DbLibService;
 
 public class DbServiceUtil
 {
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java
index 3dde4e5c0..7a187d166 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/EncryptionToolDGWrapper.java
@@ -27,9 +27,9 @@ import org.apache.commons.lang.StringUtils;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.openecomp.sdnc.sli.SvcLogicContext;
-import org.openecomp.sdnc.sli.SvcLogicException;
-import org.openecomp.sdnc.sli.SvcLogicJavaPlugin;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 
 public class EncryptionToolDGWrapper implements SvcLogicJavaPlugin {
 
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
index aa86149aa..a0472e6aa 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/WrapperEncryptionTool.java
@@ -31,7 +31,7 @@ import javax.sql.rowset.CachedRowSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.commons.configuration.PropertiesConfiguration;
-import org.openecomp.sdnc.sli.resource.dblib.DBResourceManager;
+import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
 
 public class WrapperEncryptionTool {
 
diff --git a/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java b/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java
index 36024ee96..640c989e3 100644
--- a/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java
+++ b/appc-config/appc-encryption-tool/provider/src/test/java/org/openecomp/appc/encryptiontool/TestEncryptionTool.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 import org.openecomp.appc.encryptiontool.wrapper.DbServiceUtil;
 import org.openecomp.appc.encryptiontool.wrapper.EncryptionToolDGWrapper;
 import org.openecomp.appc.encryptiontool.wrapper.WrapperEncryptionTool;
-import org.openecomp.sdnc.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestEncryptionTool {
 
-- 
cgit 1.2.3-korg