diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-09-04 21:37:25 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-09-07 00:45:01 -0700 |
| commit | 76706005ee07da01fc3e00ed44ada720e29855b1 (patch) | |
| tree | 8327ef6892b0f7ba21034bfb467c8c664a3a14e4 /appc-sdc-listener | |
| parent | 3e0d86059e4926a0a5197f75f201284075811d98 (diff) | |
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]
Diffstat (limited to 'appc-sdc-listener')
3 files changed, 2 insertions, 7 deletions
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> |