From ce8c916f1aea3b2f789e1532c2ccbcec4fbd40c2 Mon Sep 17 00:00:00 2001
From: Fabian Lange <lange.fabian@gmail.com>
Date: Thu, 30 Apr 2015 20:10:44 +0200
Subject: [PATCH] Upgrade twitter hpack dependency

Motivation:
Right now the used hpack dependency does not contain a valid osgi manifest.

Modifications:
Upgrade hpack from 0.10.1 to 0.11.0.

Result:
hpack dependency works in osgi containers without wrapping.
---
 pom.xml                                                      | 5 ++---
 .../src/test/java/io/netty/osgitests/OsgiBundleTest.java     | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c9e08c6b3f..f1a889207a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -586,7 +586,7 @@
       <dependency>
         <groupId>com.twitter</groupId>
         <artifactId>hpack</artifactId>
-        <version>0.10.1</version>
+        <version>0.11.0</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.npn</groupId>
@@ -971,7 +971,7 @@
             <!-- SSLSession implementation -->
             <ignore>javax.net.ssl.SSLEngine</ignore>
             <ignore>javax.net.ssl.X509ExtendedTrustManager</ignore>
-            
+
             <ignore>java.util.concurrent.ConcurrentLinkedDeque</ignore>
           </ignores>
         </configuration>
@@ -1466,4 +1466,3 @@
     </pluginManagement>
   </build>
 </project>
-
diff --git a/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java b/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
index 311274f831..5e8218aec8 100644
--- a/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
+++ b/testsuite-osgi/src/test/java/io/netty/osgitests/OsgiBundleTest.java
@@ -90,7 +90,7 @@ public class OsgiBundleTest {
         options.addAll(Arrays.asList(junitBundles()));
 
         options.add(mavenBundle("com.barchart.udt", "barchart-udt-bundle").versionAsInProject());
-        options.add(wrappedBundle(mavenBundle("com.twitter", "hpack").versionAsInProject()));
+        options.add(mavenBundle("com.twitter", "hpack").versionAsInProject());
         options.add(wrappedBundle(mavenBundle("org.rxtx", "rxtx").versionAsInProject()));
 
         for (String name : BUNDLES) {
@@ -106,4 +106,3 @@ public class OsgiBundleTest {
         assertFalse("At least one bundle needs to be tested", BUNDLES.isEmpty());
     }
 }
-