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-common | |
| 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-common')
4 files changed, 5 insertions, 9 deletions
diff --git a/appc-common/pom.xml b/appc-common/pom.xml index 9565cb84e..7ba1c2a57 100644 --- a/appc-common/pom.xml +++ b/appc-common/pom.xml @@ -84,7 +84,7 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> - <groupId>org.openecomp.sdnc.core</groupId> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-provider</artifactId> </dependency> <dependency> @@ -92,11 +92,6 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <scope>test</scope> - </dependency> </dependencies> @@ -135,6 +130,7 @@ <plugin> <groupId>com.att.eelf</groupId> <artifactId>eelf-maven-plugin</artifactId> + <version>1.0.0</version> <executions> <execution> <id>validation</id> diff --git a/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java b/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java index d2c017576..092dbedb3 100644 --- a/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java +++ b/appc-common/src/main/java/org/openecomp/appc/metadata/impl/MetadataServiceImpl.java @@ -26,7 +26,7 @@ package org.openecomp.appc.metadata.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DbLibService; import javax.sql.rowset.CachedRowSet; diff --git a/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 2fbb1739a..36e510ce2 100644 --- a/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-common/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -30,7 +30,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> - <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.openecomp.sdnc.sli.resource.dblib.DbLibService" /> + <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" /> <bean id="MetadataServiceImplBean" class="org.openecomp.appc.metadata.impl.MetadataServiceImpl" scope="singleton"> <property name="dbLibService" ref="dbLibServiceRef" /> diff --git a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java index 8507165ff..aa9e4533e 100644 --- a/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java +++ b/appc-common/src/test/java/org/openecomp/appc/metadata/TestMetadataService.java @@ -24,7 +24,7 @@ package org.openecomp.appc.metadata; -import org.openecomp.sdnc.sli.resource.dblib.DbLibService; +import org.onap.ccsdk.sli.core.dblib.DbLibService; import com.sun.rowset.CachedRowSetImpl; import org.mockito.Mockito; import org.openecomp.appc.metadata.impl.MetadataServiceImpl; |