Use odlparent's netty feature

Instead of pulling n specific version of netty, pull in the feature from
odlparent.

Change-Id: Id954fa4179a93e9c9d3056e5b4252350bb6aab27
Signed-off-by: Robert Varga <rovarga@cisco.com>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/pom.xml b/features/pom.xml
index b6e92a39e91ec9220fa52749f73e58a323b018b3..4cc091becf7968e5b13788f14eac59487aeecb0e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -32,6 +32,15 @@
         <type>pom</type>
       </dependency>
 
+      <!-- This project -->
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+
       <!-- MD-SAL -->
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
@@ -97,6 +106,12 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>features-odlparent</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 
     <!-- bundle dependencies -->
     <dependency>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 689c19278260db8eb7294ba5c40ee24825983257..111100a603bf2d28bea5a9ac134ccea114f5ff20 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -8,6 +8,7 @@
     <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
     <feature name='odl-openflowjava-all' description="OpenDaylight :: Openflow Java :: All">
         <feature version='${project.version}'>odl-openflowjava-protocol</feature>
     </feature>
@@ -16,11 +17,7 @@
         <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
         <feature version='${config.version}'>odl-config-api</feature>
         <feature version='${controller.mdsal.version}'>odl-mdsal-common</feature>
-        <bundle>mvn:io.netty/netty-buffer/{{VERSION}}</bundle>
-        <bundle>mvn:io.netty/netty-common/{{VERSION}}</bundle>
-        <bundle>mvn:io.netty/netty-transport/{{VERSION}}</bundle>
-        <bundle>mvn:io.netty/netty-codec/{{VERSION}}</bundle>
-        <bundle>mvn:io.netty/netty-handler/{{VERSION}}</bundle>
+        <feature version='[4.0.30,4.1.0)'>odl-netty</feature>
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-impl/{{VERSION}}</bundle>