Merge "NeutronSecurityRuleInterface: remove nonsense code"

[neutron.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index c49edc194f383beaae9212896a74caf7b8413b56..16dbc77bf855b2358dc12a1929a40f97e98b7d6c 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.7.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.7.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,11 +35,24 @@ 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>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <!-- DO NOT deploy the karaf artifact -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>