diff options
Diffstat (limited to 'appc-adapters')
8 files changed, 9 insertions, 9 deletions
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml index a4ebe1d18..49d733aa7 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/src/main/resources/features.xml @@ -32,7 +32,7 @@ <feature name='appc-ansible-adapter' description="appc-ansible-adapter" version='${project.version}'> <feature >odl-mdsal-broker</feature> <feature>ccsdk-sli</feature> - <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle> + <bundle dependency="true">mvn:org.onap.appc/appc-common-bundle/${project.version}</bundle> <bundle>mvn:org.onap.appc/appc-ansible-adapter-bundle/${project.version}</bundle> </feature> diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index bc9846674..417c70db8 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -245,7 +245,7 @@ org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.security.* </Import-Package> <Embed-Dependency> - *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis + *;scope=compile|runtime;artifactId=!sli-common|!appc-common-bundle|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml index 7d372cb24..bd92c7096 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml @@ -147,7 +147,7 @@ <Export-Package>org.onap.appc.adapter.message.*</Export-Package> <!--<Export-Serice>org.onap.appc.adapter.message.EventSender</Export-Serice>--> <Import-Package>org.onap.appc.metricservice.*,com.att.nsa.*,org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,!org.osgi.service.event.*,org.osgi.service.*,org.osgi.util.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.*,javax.naming.*,javax.crypto.*, com.sun.jersey.spi.container.servlet,org.eclipse.jetty.servlets</Import-Package> - <!--<Embed-Dependency>appc-common</Embed-Dependency>--> + <!--<Embed-Dependency>appc-common-bundle</Embed-Dependency>--> <Embed-Dependency>*;scope=compile|runtime;artifactId=!appc-metric-bundle|sli-common|sli-provider|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|pax-*</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Bundle-Blueprint>OSGI-INF/blueprint/blueprint.xml</Bundle-Blueprint> diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml index 09bfe6b45..4c0849a17 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml @@ -36,7 +36,7 @@ <dependencies> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-common</artifactId> + <artifactId>appc-common-bundle</artifactId> <version>${project.version}</version> </dependency> diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml index 4ae53d1a5..067f17cd2 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/src/main/resources/features.xml @@ -33,7 +33,7 @@ <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> <feature >odl-mdsal-broker</feature> <!-- <bundle>mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version}</bundle> --> - <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle> + <bundle dependency="true">mvn:org.onap.appc/appc-common-bundle/${project.version}</bundle> <bundle start-level="75">mvn:org.onap.ccsdk.sli.core/dblib-provider/${sdnctl.dblib.version}</bundle> <bundle start-level="83" start="true">mvn:org.onap.appc/appc-netconf-adapter-bundle/${project.version}</bundle> </feature> diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml index 08590d7d8..465a4d724 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml @@ -129,7 +129,7 @@ limitations under the License. <excludedArtifactId>httpcore</excludedArtifactId> <excludedArtifactId>httpclient</excludedArtifactId> <excludedArtifactId>org.eclipse.osgi</excludedArtifactId> - <excludedArtifactId>appc-common</excludedArtifactId> + <excludedArtifactId>appc-common-bundle</excludedArtifactId> </excludedArtifactIds> </configuration> diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml index 8361f466b..0e0ce5104 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml @@ -56,7 +56,7 @@ </dependency> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-common</artifactId> + <artifactId>appc-common-bundle</artifactId> <version>${project.version}</version> <scope>compile</scope> </dependency> @@ -207,7 +207,7 @@ <Import-Package>org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.*,javax.security.auth.* </Import-Package> <Embed-Dependency> - *;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|xml-apis + *;scope=compile|runtime;artifactId=!sli-common|!appc-common-bundle|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|xml-apis </Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> </instructions> diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml index de1e8137a..1797b118d 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/src/main/resources/features.xml @@ -28,7 +28,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <feature name='appc-ssh-adapter' description="appc-ssh-adapter" version='${project.version}'> <!-- <feature version='${sdnctl.dblib.version}'>ccsdk-dblib</feature> --> - <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle> + <bundle dependency="true">mvn:org.onap.appc/appc-common-bundle/${project.version}</bundle> <bundle>mvn:org.onap.appc/appc-ssh-adapter-api/${project.version}</bundle> <bundle>mvn:org.onap.appc/appc-ssh-adapter-sshd/${project.version}</bundle> </feature> |