Bug 2907 - corrections for upgrade to karaf 3.0.3

[controller.git] / karaf / opendaylight-karaf / pom.xml

diff --git a/karaf/opendaylight-karaf/pom.xml b/karaf/opendaylight-karaf/pom.xml
index e0ea4c0edffb3758a87e5d33b0576fbd7a58b54b..68238bbc120ea7f7b6074c1d1f4b76d6eaa42586 100644 (file)
--- a/karaf/opendaylight-karaf/pom.xml
+++ b/karaf/opendaylight-karaf/pom.xml
@@ -9,9 +9,6 @@
   </parent>
   <artifactId>distribution.opendaylight-karaf</artifactId>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
 
   <dependencies>
     <dependency>
@@ -90,13 +87,6 @@
           <type>xml</type>
           <scope>runtime</scope>
       </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-flow</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-restconf</artifactId>
@@ -105,14 +95,6 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-neutron</artifactId>
-      <version>${networkconfig.neutron.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <!-- Netconf connector features. When this is included, users can test the netconf connector using netconf-testtool -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -120,7 +102,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
   </dependencies>
 
   <build>