flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject git commit: FLUME-1723. AsyncHBase and Avro bring in different versions of Netty.
Date Sun, 18 Nov 2012 02:04:37 GMT
Updated Branches:
  refs/heads/flume-1.4 d3866bdd7 -> ecf10426f


FLUME-1723. AsyncHBase and Avro bring in different versions of Netty.

(Mike Percy via Hari Shreedharan)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/ecf10426
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/ecf10426
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/ecf10426

Branch: refs/heads/flume-1.4
Commit: ecf10426fc3a8eb7268254a9990bb5143536bfad
Parents: d3866bd
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Sat Nov 17 18:02:36 2012 -0800
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Sat Nov 17 18:03:55 2012 -0800

----------------------------------------------------------------------
 flume-ng-core/pom.xml                      |    5 +++
 flume-ng-sdk/pom.xml                       |    5 +++
 flume-ng-sinks/flume-ng-hbase-sink/pom.xml |    7 ++++
 pom.xml                                    |   36 ++++++++++++++++-------
 4 files changed, 42 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/ecf10426/flume-ng-core/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-core/pom.xml b/flume-ng-core/pom.xml
index a03d59d..321bb79 100644
--- a/flume-ng-core/pom.xml
+++ b/flume-ng-core/pom.xml
@@ -164,6 +164,11 @@ limitations under the License.
     </dependency>
 
     <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/flume/blob/ecf10426/flume-ng-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sdk/pom.xml b/flume-ng-sdk/pom.xml
index 1deab7e..ab066d5 100644
--- a/flume-ng-sdk/pom.xml
+++ b/flume-ng-sdk/pom.xml
@@ -100,5 +100,10 @@ limitations under the License.
       <artifactId>avro-ipc</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/flume/blob/ecf10426/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
----------------------------------------------------------------------
diff --git a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
index badb496..25422e1 100644
--- a/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
+++ b/flume-ng-sinks/flume-ng-hbase-sink/pom.xml
@@ -68,10 +68,17 @@
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>org.hbase</groupId>
       <artifactId>asynchbase</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>

http://git-wip-us.apache.org/repos/asf/flume/blob/ecf10426/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a7c3ed2..80419bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -676,6 +676,10 @@ limitations under the License.
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>servlet-api</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -927,17 +931,27 @@ limitations under the License.
         <version>2.0.4</version>
       </dependency>
 
-     <dependency>
-      <groupId>org.hbase</groupId>
-      <artifactId>asynchbase</artifactId>
-      <version>1.2.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>log4j-over-slf4j</artifactId>
-        </exclusion>
-      </exclusions>
-     </dependency>
+      <dependency>
+        <groupId>org.hbase</groupId>
+        <artifactId>asynchbase</artifactId>
+        <version>1.2.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty</artifactId>
+        <version>3.4.0.Final</version>
+      </dependency>
 
     </dependencies>
   </dependencyManagement>


Mime
View raw message