diff options
6 files changed, 22 insertions, 15 deletions
diff --git a/appc-inbound/appc-design-services/features/src/main/resources/features.xml b/appc-inbound/appc-design-services/features/src/main/resources/features.xml index 7fb150504..c13ed2f06 100644 --- a/appc-inbound/appc-design-services/features/src/main/resources/features.xml +++ b/appc-inbound/appc-design-services/features/src/main/resources/features.xml @@ -27,23 +27,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - <repository>mvn:org.opendaylight.yangtools/features-yangtools/${odl.yangtools.version}/xml/features</repository> - <repository>mvn:org.opendaylight.controller/features-mdsal/${odl.controller.mdsal.features.version}/xml/features</repository> - <feature name='appc-design-services' description="Application Controller Design Services" version='${project.version}'> - <feature version='${odl.mdsal.model.version}'>odl-mdsal-models</feature> + <feature>odl-mdsal-models</feature> <bundle>mvn:org.onap.appc/appc-design-services-model/${project.version}</bundle> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version='${odl.mdsal.version}'>odl-mdsal-broker</feature> + <feature>odl-mdsal-broker</feature> <feature>ccsdk-sli</feature> <bundle>mvn:org.onap.appc/appc-design-services-provider/${project.version}</bundle> <bundle>mvn:org.onap.appc/appc-network-inventory-client-provider/${project.version}</bundle> - <bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle> - - <feature version='${odl.mdsal.version}'>odl-restconf</feature> + <feature>odl-restconf</feature> </feature> diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml index b72f29048..6a6b3b72d 100755 --- a/appc-inbound/appc-design-services/provider/pom.xml +++ b/appc-inbound/appc-design-services/provider/pom.xml @@ -41,6 +41,7 @@ <instructions> <Export-Package>org.onap.appc.design.services</Export-Package> <Import-Package>org.onap.appc.instar,*;resolution:=optional</Import-Package> + <Embed-Dependency>jackson-dataformat-yaml</Embed-Dependency> <DynamicImport-Package>*</DynamicImport-Package> <Embed-Transitive>true</Embed-Transitive> </instructions> @@ -143,7 +144,7 @@ <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> - <version>2.3.0</version> + <version>2.3.2</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml index 8a4586ea3..bfc156014 100644 --- a/appc-inbound/appc-interfaces-service/bundle/pom.xml +++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml @@ -127,7 +127,7 @@ <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-yaml</artifactId> - <version>2.3.0</version> + <version>2.3.2</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml index c80568e70..276a275a2 100644 --- a/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml +++ b/appc-outbound/appc-network-inventory-client/features/src/main/resources/features.xml @@ -23,17 +23,17 @@ --> -<features name="app-cntrl-network-inventory-client-${project.version}" +<features name="appc-network-inventory-client-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>--> - <feature name='app-cntrl-network-inventory' description="Application Controller Instar Client" + <feature name='appc-network-inventory-client' description="Application Controller Instar Client" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature >odl-mdsal-broker</feature> - <feature version= "${sdnctl.sli.version}">ccsdk-sli</feature> + <feature>odl-mdsal-broker</feature> + <feature>ccsdk-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle> diff --git a/appc-outbound/appc-network-inventory-client/installer/pom.xml b/appc-outbound/appc-network-inventory-client/installer/pom.xml index 7d1c2c042..9e5179006 100755 --- a/appc-outbound/appc-network-inventory-client/installer/pom.xml +++ b/appc-outbound/appc-network-inventory-client/installer/pom.xml @@ -34,7 +34,7 @@ <properties> <application.name>appc-network-inventory-client</application.name> <features.boot>appc-network-inventory-client</features.boot> - <features.repositories>mvn:org.onap.appc/appc-network-inventory-features/${project.version}/xml/features</features.repositories> + <features.repositories>mvn:org.onap.appc/appc-network-inventory-client-features/${project.version}/xml/features</features.repositories> <include.transitive.dependencies>false</include.transitive.dependencies> </properties> diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml index a4b9f07ae..000b73e21 100755 --- a/appc-outbound/appc-network-inventory-client/provider/pom.xml +++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml @@ -94,6 +94,16 @@ <groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -108,6 +118,7 @@ <Bundle-Activator>org.onap.appc.instar.InstarClientActivator</Bundle-Activator>
<Export-Package>org.onap.appc.instar</Export-Package>
<Import-Package>*</Import-Package>
+ <Embed-Dependency>jackson-dataformat-yaml,snakeyaml</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
|