From: Robert Varga <rovarga@cisco.com>
Date: Fri, 27 Nov 2015 10:56:55 +0000 (+0100)
Subject: Use odlparent netty feature
X-Git-Tag: release/beryllium~127
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=201f41d7e02dbc0c6b4fc4319f2e428178b0be2a

Use odlparent netty feature

Instead of enumerating the jars, use odlparent-prorovided feature.

Change-Id: I03b20316d9bbb22bcde05414510678afc323fdef
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/features/config/pom.xml b/features/config/pom.xml
index dd6bbfbb30..db29eaec4d 100644
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -24,6 +24,13 @@
 
   <dependencyManagement>
     <dependencies>
+       <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-artifacts</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
@@ -52,6 +59,12 @@
   <dependencies>
 
     <!-- Required features repositories -->
+    <dependency>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>features-odlparent</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>features-yangtools</artifactId>
diff --git a/features/config/src/main/features/features.xml b/features/config/src/main/features/features.xml
index e23d5f5df5..960e5c8e50 100644
--- a/features/config/src/main/features/features.xml
+++ b/features/config/src/main/features/features.xml
@@ -5,6 +5,7 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
   <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
 
   <feature name='odl-config-all' version='${project.version}' description="OpenDaylight :: Config :: All">
       <feature version='${project.version}'>odl-config-api</feature>
@@ -20,12 +21,8 @@
 
   <feature name='odl-config-netty-config-api' version='${project.version}' description="OpenDaylight :: Config :: Netty Config API">
     <feature version='${project.version}'>odl-config-api</feature>
+    <feature version='[4.0.30,4.1.0)'>odl-netty</feature>
     <bundle>mvn:org.opendaylight.controller/netty-config-api/{{VERSION}}</bundle>
-    <bundle>mvn:io.netty/netty-transport/{{VERSION}}</bundle>
-    <bundle>mvn:io.netty/netty-common/{{VERSION}}</bundle>
-    <bundle>mvn:io.netty/netty-buffer/{{VERSION}}</bundle>
-    <bundle>mvn:io.netty/netty-codec/{{VERSION}}</bundle>
-    <bundle>mvn:io.netty/netty-handler/{{VERSION}}</bundle>
   </feature>
 
   <feature name='odl-config-core' version='${project.version}' description="OpenDaylight :: Config :: Core">