diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-05-01 13:35:59 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-05-01 13:44:09 -0700 |
| commit | 3e8e2d843d5c3f78bc140fd5308d0b2974f1f3ae (patch) | |
| tree | f4a5c606712e30b1c2c81f0a4eebd2d6d1efcd86 /appc-inbound | |
| parent | 15b8d88846ddedbead08b327d5733d1008de9062 (diff) | |
Fixes for the two features that were not installed
These features relied on exports that didn't exist.
Also versions had to be removed from feature files.
Change-Id: I1860ae6c46354061943223ac6a201518871d3608
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-871
Diffstat (limited to 'appc-inbound')
3 files changed, 6 insertions, 10 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> |