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 98b85881031..0e10ee71589 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 @@ -202,7 +202,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); diff --git a/pom.xml b/pom.xml index 26c2bb053cc..5f89b5a9306 100644 --- a/pom.xml +++ b/pom.xml @@ -956,16 +956,16 @@ ${maven.build.timestamp} 1.7 - 2.4.0 + 2.5.1 3.0.0-SNAPSHOT 1.2 - 1.7 + 1.9 2.4 2.6 - 1.1.3 - 2.1 - 3.2.0 + 1.2 + 2.2 + 3.3.0 3.2.1 3.1 2.2.0 @@ -980,16 +980,16 @@ 4.11 3.0.4 1.2.17 - 1.9.0 + 1.10.8 2.5.0 0.9.0 3.4.6 - 1.7.5 + 1.7.7 0.0.1-SNAPSHOT 2.6.3 2.3.1 - 1.3.1 - 4.0.19.Final + 1.3.3 + 4.0.23.Final 2.1.2 2.4