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-sdc-listener/appc-sdc-listener-bundle/pom.xml                   | 5 -----
 .../openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java  | 2 +-
 .../appc-sdc-listener-features/src/main/resources/features.xml       | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'appc-sdc-listener')

diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
index 22040cb55..f467b61dd 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml
@@ -51,11 +51,6 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
 			<artifactId>json</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<scope>test</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>org.mockito</groupId>
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
index 7f461c043..db4da9fef 100644
--- a/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
+++ b/appc-sdc-listener/appc-sdc-listener-bundle/src/main/java/org/openecomp/appc/sdc/artifacts/helper/ArtifactStorageService.java
@@ -29,7 +29,7 @@ import org.openecomp.appc.exceptions.APPCException;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import org.openecomp.appc.sdc.artifacts.object.SDCReference;
-import org.openecomp.sdnc.sli.resource.dblib.DbLibService;
+import org.onap.ccsdk.sli.core.dblib.DbLibService;
 import org.openecomp.appc.sdc.artifacts.object.SDCArtifact;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
diff --git a/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml b/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
index 409d31d53..76a068ed7 100644
--- a/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
+++ b/appc-sdc-listener/appc-sdc-listener-features/src/main/resources/features.xml
@@ -33,7 +33,7 @@
 
     <feature name='appc-sdc-listener' description="sdc listener" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature>
+        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
         <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
         <bundle>mvn:org.openecomp.appc/appc-sdc-listener-bundle/${project.version}</bundle>
     </feature>
-- 
cgit 1.2.3-korg