Revert "Upgrade Netty 4.0.37.Final -> 4.1.1.Final"

This reverts commit 34a2b5c5d7d09af6dad600f97332e05c65526022. Merged accidentally.

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

diff --git a/features-odlparent/src/main/features/features.xml b/features-odlparent/src/main/features/features.xml
index 2daeae7ff7624ecbc2e6752a5a10a06040bfda21..a6b2647991135a24fb7989ab0601102699512044 100644 (file)
--- a/features-odlparent/src/main/features/features.xml
+++ b/features-odlparent/src/main/features/features.xml
@@ -4,24 +4,12 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <!-- See also the links defined for our Maven site in the root POM (maven-javadoc-plugin) -->
     <feature name="odl-netty" description="OpenDaylight :: Netty" version="4.0.37.Final">
-        <bundle>mvn:io.netty/netty-buffer/4.0.37.Final</bundle>
-        <bundle>mvn:io.netty/netty-common/4.0.37.Final</bundle>
-        <bundle>mvn:io.netty/netty-transport/4.0.37.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec/4.0.37.Final</bundle>
-        <bundle>mvn:io.netty/netty-codec-http/4.0.37.Final</bundle>
-        <bundle>mvn:io.netty/netty-handler/4.0.37.Final</bundle>
-        <!-- Here we need to include all available native epoll implementations; we can't limit ourselves to the build
-        platform and we can't require the build platform to have an implementation (e.g. OS X) -->
-        <bundle>mvn:io.netty/netty-transport-native-epoll/4.0.37.Final/jar/linux-x86_64</bundle>
-    </feature>
-    <feature name="odl-netty" description="OpenDaylight :: Netty" version="4.1.1.Final">
         <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-codec-http/{{VERSION}}</bundle>
         <bundle>mvn:io.netty/netty-handler/{{VERSION}}</bundle>
-        <bundle>mvn:io.netty/netty-resolver/{{VERSION}}</bundle>
         <!-- Here we need to include all available native epoll implementations; we can't limit ourselves to the build
         platform and we can't require the build platform to have an implementation (e.g. OS X) -->
         <bundle>mvn:io.netty/netty-transport-native-epoll/{{VERSION}}/jar/linux-x86_64</bundle>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index d028264a8aa6ec7b7b70df680f0ee99341df9ae0..ed3104b55dc7bb267a9ac2ecbb373a4f6594aa90 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -580,42 +580,37 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-all</artifactId>
         <!-- If these are updated, the version in features.xml needs to be changed too -->
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-buffer</artifactId>
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec</artifactId>
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-codec-http</artifactId>
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-common</artifactId>
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-handler</artifactId>
-        <version>4.1.1.Final</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-resolver</artifactId>
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport</artifactId>
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <!-- Here we need to define all available native epoll implementations; we can't limit ourselves to the build
       platform and we can't require the build platform to have an implementation (e.g. OS X) -->
@@ -623,7 +618,7 @@
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
         <classifier>linux-x86_64</classifier>
-        <version>4.1.1.Final</version>
+        <version>4.0.37.Final</version>
       </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>