Merge changes from topic 'northbound-refactor'

[neutron.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index c49edc194f383beaae9212896a74caf7b8413b56..057198dbe4de355f44f635a1812b4bc85fe51804 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,19 +9,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>neutron-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.6.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <karaf.localFeature>odl-neutron-service</karaf.localFeature>
+    <karaf.localFeature>odl-neutron-dummyprovider-test</karaf.localFeature>
+    <checkstyle.location>${project.parent.basedir}/src/main/resources</checkstyle.location>
   </properties>
   <dependencies>
     <dependency>
@@ -34,7 +35,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>features-neutron</artifactId>
+      <artifactId>features-neutron-test</artifactId>
       <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>