From 105f952f5de0d276e5b7c69057fbe16f369e3dc7 Mon Sep 17 00:00:00 2001
From: dantran <dantran@gmail.com>
Date: Mon, 12 Nov 2012 01:45:45 -0800
Subject: [PATCH] Clean up maven-bungle-plugin warnings

---
 buffer/pom.xml         |  3 +--
 codec-http/pom.xml     |  7 +------
 codec/pom.xml          | 11 +----------
 common/pom.xml         |  8 +-------
 handler/pom.xml        |  4 ----
 metrics-yammer/pom.xml |  2 --
 transport/pom.xml      | 13 ++++---------
 7 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/buffer/pom.xml b/buffer/pom.xml
index f94b6fb5d3..8087b10ce1 100644
--- a/buffer/pom.xml
+++ b/buffer/pom.xml
@@ -46,12 +46,11 @@
         <configuration>
           <instructions>
             <Import-Package>
-              !io.netty.buffer.*,
               sun.misc;resolution:=optional,              
               *
             </Import-Package>
             <Export-Package>
-              io.netty.bufer
+              io.netty.buffer
             </Export-Package>
           </instructions>
         </configuration>
diff --git a/codec-http/pom.xml b/codec-http/pom.xml
index 4ebb689c50..d92e9e1eaa 100644
--- a/codec-http/pom.xml
+++ b/codec-http/pom.xml
@@ -51,17 +51,12 @@
         <configuration>
           <instructions>
             <Import-Package>
-              !io.netty.handler.codec.http,
-              !io.netty.handler.codec.http.multipart,
-              !io.netty.handler.codec.http.websocket,
-              !io.netty.handler.codec.rtsp,
-              !io.netty.handler.codec.spdy,
               *
             </Import-Package>
             <Export-Package>
               io.netty.handler.codec.http,
               io.netty.handler.codec.http.multipart,
-              io.netty.handler.codec.http.websocket,
+              io.netty.handler.codec.http.websocketx,
               io.netty.handler.codec.rtsp,
               io.netty.handler.codec.spdy
             </Export-Package>
diff --git a/codec/pom.xml b/codec/pom.xml
index 4d3e2815d8..3aaa408daa 100644
--- a/codec/pom.xml
+++ b/codec/pom.xml
@@ -68,15 +68,6 @@
         <configuration>
           <instructions>
             <Import-Package>
-              !io.netty.handler.codec,
-              !io.netty.handler.codec.base64,
-              !io.netty.handler.codec.bytes,
-              !io.netty.handler.codec.compression,
-              !io.netty.handler.codec.marshalling,
-              !io.netty.handler.codec.protobuf,
-              !io.netty.handler.codec.sctp
-              !io.netty.handler.codec.serialization,
-              !io.netty.handler.codec.string,
               *
             </Import-Package>
             <Export-Package>
@@ -86,7 +77,7 @@
               io.netty.handler.codec.compression,
               io.netty.handler.codec.marshalling,
               io.netty.handler.codec.protobuf,
-              io.netty.handler.codec.sctp
+              io.netty.handler.codec.sctp,
               io.netty.handler.codec.serialization,
               io.netty.handler.codec.string
             </Export-Package>
diff --git a/common/pom.xml b/common/pom.xml
index c19b1db752..4a229f69f6 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -79,12 +79,6 @@
         <configuration>
           <instructions>
             <Import-Package>
-              !io.netty.logging,
-              !io.netty.monitor,
-              !io.netty.monitor.spi
-              !io.netty.util,
-              !io.netty.util.internal,
-              !io.netty.util.internal.zlib,   
               sun.misc;resolution:=optional,           
               *
             </Import-Package>
@@ -94,7 +88,7 @@
               io.netty.monitor.spi,
               io.netty.util,
               io.netty.util.internal,
-              io.netty.util.internal.zlib              
+              io.netty.util.internal.jzlib              
             </Export-Package>
           </instructions>
         </configuration>
diff --git a/handler/pom.xml b/handler/pom.xml
index 09f2bc158b..e52c410410 100644
--- a/handler/pom.xml
+++ b/handler/pom.xml
@@ -51,10 +51,6 @@
         <configuration>
           <instructions>
             <Import-Package>
-              !io.netty.handler.logging,
-              !io.netty.handler.ssl,
-              !io.netty.handler.stream,
-              !io.netty.handler.timeout,
               *
             </Import-Package>
             <Export-Package>
diff --git a/metrics-yammer/pom.xml b/metrics-yammer/pom.xml
index 698f8fbe2f..ac083e50ab 100644
--- a/metrics-yammer/pom.xml
+++ b/metrics-yammer/pom.xml
@@ -51,8 +51,6 @@
         <configuration>
           <instructions>
             <Import-Package>
-              !io.netty.monitor.yammer,
-              !io.netty.monitor.yammer.spi,
               *
             </Import-Package>
             <Export-Package>
diff --git a/transport/pom.xml b/transport/pom.xml
index b0d37eaad3..5cd9b7b139 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -46,15 +46,7 @@
         <configuration>
           <instructions>
             <Import-Package>
-              !io.netty.bootstrap,
-              !io.netty.channel,
-              !io.netty.channel.embedded,
-              !io.netty.channel.group,
-              !io.netty.channel.local,
-              !io.netty.channel.socket,
-              !io.netty.channel.socket.aio,
-              !io.netty.channel.socket.nio,
-              !io.netty.channel.socket.oio,
+              com.sun.nio.sctp;resolution:=optional,
               sun.misc;resolution:=optional,
               *
             </Import-Package>
@@ -69,6 +61,9 @@
               io.netty.channel.socket.nio,
               io.netty.channel.socket.oio
             </Export-Package>
+            <Private-Package>
+              !com.sun.nio.sctp
+            </Private-Package>
           </instructions>
         </configuration>
       </plugin>