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-outbound | |
| 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-outbound')
3 files changed, 16 insertions, 5 deletions
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>
|