diff options
Diffstat (limited to 'appc-provider')
4 files changed, 8 insertions, 8 deletions
diff --git a/appc-provider/appc-provider-bundle/pom.xml b/appc-provider/appc-provider-bundle/pom.xml index 775e8d07d..53c883527 100644 --- a/appc-provider/appc-provider-bundle/pom.xml +++ b/appc-provider/appc-provider-bundle/pom.xml @@ -54,7 +54,7 @@ *;resolution:=optional </Import-Package> <Embed-Dependency> - appc-common;scope=compile|runtime;inline=false + appc-common,org.apache.http;scope=compile|runtime;inline=false </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> @@ -80,7 +80,7 @@ </additionalConfiguration> </generator> <generator> - <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> + <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> <outputBaseDir>${salGeneratorPath}</outputBaseDir> </generator> </codeGenerators> @@ -206,11 +206,11 @@ <artifactId>sal-common-util</artifactId> </dependency> <dependency> - <groupId>org.openecomp.sdnc.core</groupId> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> </dependency> <dependency> - <groupId>org.openecomp.sdnc.core</groupId> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> </dependency> <dependency> diff --git a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java index 22cf1cbf4..6c43c388a 100644 --- a/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java +++ b/appc-provider/appc-provider-bundle/src/main/java/org/openecomp/appc/provider/AppcProviderClient.java @@ -28,8 +28,8 @@ import org.openecomp.appc.util.StringHelper; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.sdnc.sli.SvcLogicException; -import org.openecomp.sdnc.sli.provider.SvcLogicService; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-provider/appc-provider-features/src/main/resources/features.xml b/appc-provider/appc-provider-features/src/main/resources/features.xml index d0a011ca2..06e3616c0 100644 --- a/appc-provider/appc-provider-features/src/main/resources/features.xml +++ b/appc-provider/appc-provider-features/src/main/resources/features.xml @@ -31,7 +31,7 @@ <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-provider' description="application controller" version='${project.version}'> - <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> + <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> <bundle>mvn:org.openecomp.appc/appc-provider-model/${project.version}</bundle> <bundle>mvn:org.openecomp.appc/appc-provider-bundle/${project.version}</bundle> <configfile finalname="etc/opendaylight/karaf/200-appc-provider.xml">mvn:org.openecomp.appc/appc-provider-bundle/${project.version}/xml/config</configfile> diff --git a/appc-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml index 23685725e..46aba8314 100644 --- a/appc-provider/appc-provider-model/pom.xml +++ b/appc-provider/appc-provider-model/pom.xml @@ -44,7 +44,7 @@ <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir> <codeGenerators> <generator> - <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> + <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass> <outputBaseDir>${salGeneratorPath}</outputBaseDir> </generator> </codeGenerators> |