hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject git commit: HBASE-12354 Update dependencies in time for 1.0 release
Date Wed, 29 Oct 2014 18:16:24 GMT
Repository: hbase
Updated Branches:
  refs/heads/master b240b00f4 -> 7cfafe401


HBASE-12354 Update dependencies in time for 1.0 release


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

Branch: refs/heads/master
Commit: 7cfafe401e18522cbd92a8b06fb2ea380f71ced9
Parents: b240b00
Author: stack <stack@apache.org>
Authored: Wed Oct 29 11:16:18 2014 -0700
Committer: stack <stack@apache.org>
Committed: Wed Oct 29 11:16:18 2014 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/master/TestSplitLogManager.java  |  2 +-
 pom.xml                                           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/7cfafe40/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
index 5847b93..76a6db9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
@@ -203,7 +203,7 @@ public class TestSplitLogManager {
     Mockito.when(sm.isServerOnline(Mockito.any(ServerName.class))).thenReturn(true);
     Mockito.when(master.getServerManager()).thenReturn(sm);
 
-    to = 6000;
+    to = 12000;
     conf.setInt(HConstants.HBASE_SPLITLOG_MANAGER_TIMEOUT, to);
     conf.setInt("hbase.splitlog.manager.unassigned.timeout", 2 * to);
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/7cfafe40/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 23ac6ca..076a446 100644
--- a/pom.xml
+++ b/pom.xml
@@ -944,16 +944,16 @@
     <buildDate>${maven.build.timestamp}</buildDate>
     <compileSource>1.7</compileSource>
     <!-- Dependencies -->
-    <hadoop-two.version>2.4.0</hadoop-two.version>
+    <hadoop-two.version>2.5.1</hadoop-two.version>
     <hadoop-three.version>3.0.0-SNAPSHOT</hadoop-three.version>
     <commons-cli.version>1.2</commons-cli.version>
-    <commons-codec.version>1.7</commons-codec.version>
+    <commons-codec.version>1.9</commons-codec.version>
     <!-- pretty outdated -->
     <commons-io.version>2.4</commons-io.version>
     <commons-lang.version>2.6</commons-lang.version>
-    <commons-logging.version>1.1.3</commons-logging.version>
-    <commons-math.version>2.1</commons-math.version>
-    <disruptor.version>3.2.0</disruptor.version>
+    <commons-logging.version>1.2</commons-logging.version>
+    <commons-math.version>2.2</commons-math.version>
+    <disruptor.version>3.3.0</disruptor.version>
     <collections.version>3.2.1</collections.version>
     <httpclient.version>3.1</httpclient.version>
     <metrics-core.version>2.2.0</metrics-core.version>
@@ -968,16 +968,16 @@
     <junit.version>4.11</junit.version>
     <htrace.version>3.0.4</htrace.version>
     <log4j.version>1.2.17</log4j.version>
-    <mockito-all.version>1.9.0</mockito-all.version>
+    <mockito-all.version>1.10.8</mockito-all.version>
     <protobuf.version>2.5.0</protobuf.version>
     <thrift.version>0.9.0</thrift.version>
     <zookeeper.version>3.4.6</zookeeper.version>
-    <slf4j.version>1.7.5</slf4j.version>
+    <slf4j.version>1.7.7</slf4j.version>
     <hadoop-snappy.version>0.0.1-SNAPSHOT</hadoop-snappy.version>
     <clover.version>2.6.3</clover.version>
     <jamon-runtime.version>2.3.1</jamon-runtime.version>
-    <jettison.version>1.3.1</jettison.version>
-    <netty.version>4.0.19.Final</netty.version>
+    <jettison.version>1.3.3</jettison.version>
+    <netty.version>4.0.23.Final</netty.version>
     <joni.version>2.1.2</joni.version>
     <!-- Plugin Dependencies -->
     <maven.assembly.version>2.4</maven.assembly.version>


Mime
View raw message