summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
15b8d88)
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
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">
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 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 -->
<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>
<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>
<instructions>
<Export-Package>org.onap.appc.design.services</Export-Package>
<Import-Package>org.onap.appc.instar,*;resolution:=optional</Import-Package>
<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>
<DynamicImport-Package>*</DynamicImport-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<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>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<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>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
-<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>-->
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 -->
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>
<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
<bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle>
<properties>
<application.name>appc-network-inventory-client</application.name>
<features.boot>appc-network-inventory-client</features.boot>
<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>
<include.transitive.dependencies>false</include.transitive.dependencies>
</properties>
<groupId>org.json</groupId>\r
<artifactId>json</artifactId>\r
</dependency>\r
<groupId>org.json</groupId>\r
<artifactId>json</artifactId>\r
</dependency>\r
+ <dependency>\r
+ <groupId>com.fasterxml.jackson.dataformat</groupId>\r
+ <artifactId>jackson-dataformat-yaml</artifactId>\r
+ <version>2.3.2</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.yaml</groupId>\r
+ <artifactId>snakeyaml</artifactId>\r
+ <version>${snakeyaml.version}</version>\r
+ </dependency>\r
</dependencies>\r
\r
<build>\r
</dependencies>\r
\r
<build>\r
<Bundle-Activator>org.onap.appc.instar.InstarClientActivator</Bundle-Activator>\r
<Export-Package>org.onap.appc.instar</Export-Package>\r
<Import-Package>*</Import-Package>\r
<Bundle-Activator>org.onap.appc.instar.InstarClientActivator</Bundle-Activator>\r
<Export-Package>org.onap.appc.instar</Export-Package>\r
<Import-Package>*</Import-Package>\r
+ <Embed-Dependency>jackson-dataformat-yaml,snakeyaml</Embed-Dependency>\r
<DynamicImport-Package>*</DynamicImport-Package>\r
</instructions>\r
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>\r
<DynamicImport-Package>*</DynamicImport-Package>\r
</instructions>\r
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>\r