Also fixed a minor issues that caused the failures before.
Change-Id: I178f36f2ff53bbdd4d47864a3a153acab91b0a41
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
<relativePath>../../opendaylight/commons/opendaylight</relativePath>
</parent>
<artifactId>features-nsf</artifactId>
- <packaging>pom</packaging>
+ <version>${nsf.version}</version>
+ <packaging>jar</packaging>
<name>OpenDaylight :: Features :: Network Service Functions</name>
<description>Feature for Network Service Functions</description>
<properties>
<features.file>features.xml</features.file>
</properties>
+ <dependencies>
+ <!-- test to validate features.xml -->
+ <dependency>
+ <groupId>org.opendaylight.yangtools</groupId>
+ <artifactId>features-test</artifactId>
+ </dependency>
+ <!-- dependency for opendaylight-karaf-empty for use by testing -->
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>opendaylight-karaf-empty</artifactId>
+ <version>1.4.2-SNAPSHOT</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
<build>
<resources>
<resource>
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
+ <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
+ <karaf.distro.version>${commons.opendaylight.version}</karaf.distro.version>
+ </systemPropertyVariables>
+ <dependenciesToScan>
+ <dependency>org.opendaylight.yangtools:features-test</dependency>
+ </dependenciesToScan>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<features name="nsf-${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.controller/features-base/${commons.opendaylight.version}/xml/features</repository>
+ <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
<feature name="odl-nsf-all" description="OpenDaylight :: NSF :: All Network Service Functions" version="${project.version}">
<feature version="${sal.version}">odl-adsal-all</feature>
<feature version="${project.version}">odl-nsf-managers</feature>
</feature>
<feature name="odl-nsf-managers" description="OpenDaylight :: AD-SAL :: Network Service Functions" version="${project.version}">
- <feature version="${project.version}">base-all</feature>
+ <feature version="${commons.opendaylight.version}">base-all</feature>
<feature version="${sal.version}">odl-adsal-all</feature>
<bundle>mvn:org.opendaylight.controller/usermanager/${usermanager.version}</bundle>
<bundle>mvn:org.opendaylight.controller/usermanager.implementation/${usermanager.version}</bundle>
</feature>
<feature name="odl-adsal-northbound" description="OpenDaylight :: AD-SAL :: Northbound APIs" version="${project.version}">
- <feature version="${project.version}">base-all</feature>
+ <feature version="${commons.opendaylight.version}">base-all</feature>
<feature version="${project.version}">odl-nsf-managers</feature>
- <bundle start-level="35">mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
+ <bundle>mvn:org.ow2.asm/asm-all/${asm.version}</bundle>
<!--
TODO : Resolve these in a follow-up commit
<bundle>mvn:org.opendaylight.controller/httpservice-bridge/${httpservice-bridge.northbound.version}</bundle>
<usermanager.implementation.version>0.4.2-SNAPSHOT</usermanager.implementation.version>
<usermanager.northbound.version>0.0.2-SNAPSHOT</usermanager.northbound.version>
<usermanager.version>0.4.2-SNAPSHOT</usermanager.version>
+ <nsf.version>0.4.2-SNAPSHOT</nsf.version>
<web.version>0.4.2-SNAPSHOT</web.version>
<xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
<yang-ext.version>2013.09.07.4-SNAPSHOT</yang-ext.version>
<type>xml</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>features-nsf</artifactId>
+ <version>${nsf.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-mdsal</artifactId>
down with testing... ie, no broken feature repos
-->
- <!-- MD-SAL Related Features -->
+ <!-- AD-SAL Related Features -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-base</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>features-nsf</artifactId>
+ <classifier>features</classifier>
+ <type>xml</type>
+ </dependency>
+ <!-- MD-SAL Related Features -->
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>features-mdsal</artifactId>
<module>opendaylight/forwardingrulesmanager/implementation</module>
<module>opendaylight/hosttracker/api</module>
<module>opendaylight/hosttracker/implementation</module>
+ <module>opendaylight/hosttracker/shell</module>
<module>opendaylight/hosttracker_new/api</module>
<module>opendaylight/hosttracker_new/implementation</module>
<module>opendaylight/containermanager/api</module>