tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject tajo git commit: TAJO-1750: Upgrade hadoop dependency to 2.7.1.
Date Wed, 12 Aug 2015 08:52:56 GMT
Repository: tajo
Updated Branches:
  refs/heads/master 7d0608377 -> 5982cf1ff


TAJO-1750: Upgrade hadoop dependency to 2.7.1.

Closes #684


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

Branch: refs/heads/master
Commit: 5982cf1ff31fedc4ad889ffd7e209907f0514dde
Parents: 7d06083
Author: Jinho Kim <jhkim@apache.org>
Authored: Wed Aug 12 17:52:18 2015 +0900
Committer: Jinho Kim <jhkim@apache.org>
Committed: Wed Aug 12 17:52:18 2015 +0900

----------------------------------------------------------------------
 CHANGES                                | 2 ++
 tajo-project/pom.xml                   | 2 +-
 tajo-storage/tajo-storage-hdfs/pom.xml | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/5982cf1f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7abf9dd..f572ebc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -407,6 +407,8 @@ Release 0.11.0 - unreleased
   
   TASKS
 
+    TAJO-1750: Upgrade hadoop dependency to 2.7.1. (jinho)
+
     TAJO-1590: Moving to JDK 7. (jinho)
 
     TAJO-1300: Merge the index branch into the master branch. (jihoon)

http://git-wip-us.apache.org/repos/asf/tajo/blob/5982cf1f/tajo-project/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml
index e9256ae..15a86ce 100644
--- a/tajo-project/pom.xml
+++ b/tajo-project/pom.xml
@@ -33,7 +33,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <hadoop.version>2.6.0</hadoop.version>
+    <hadoop.version>2.7.1</hadoop.version>
     <protobuf.version>2.5.0</protobuf.version>
     <tajo.version>0.11.0-SNAPSHOT</tajo.version>
     <hbase.version>1.1.1</hbase.version>

http://git-wip-us.apache.org/repos/asf/tajo/blob/5982cf1f/tajo-storage/tajo-storage-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/pom.xml b/tajo-storage/tajo-storage-hdfs/pom.xml
index 9edd57f..2ea125c 100644
--- a/tajo-storage/tajo-storage-hdfs/pom.xml
+++ b/tajo-storage/tajo-storage-hdfs/pom.xml
@@ -257,6 +257,10 @@
           <groupId>com.sun.jersey.jersey-test-framework</groupId>
           <artifactId>jersey-test-framework-grizzly2</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>netty-all</artifactId>
+          <groupId>io.netty</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -308,6 +312,10 @@
           <artifactId>hadoop-mapreduce-client-core</artifactId>
           <groupId>org.apache.hadoop</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>netty-all</artifactId>
+          <groupId>io.netty</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>


Mime
View raw message