Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-12354 Update dependencies in time for 1.0 release

This commit is contained in:
stack 2014-10-29 11:16:18 -07:00
parent 752c546099
commit 7aed6de9c8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
View File

@ -202,7 +202,7 @@ public class TestSplitLogManager {
Mockito.when(sm.isServerOnline(Mockito.any(ServerName.class))).thenReturn(true); Mockito.when(sm.isServerOnline(Mockito.any(ServerName.class))).thenReturn(true);
Mockito.when(master.getServerManager()).thenReturn(sm); Mockito.when(master.getServerManager()).thenReturn(sm);
to = 6000; to = 12000;
conf.setInt(HConstants.HBASE_SPLITLOG_MANAGER_TIMEOUT, to); conf.setInt(HConstants.HBASE_SPLITLOG_MANAGER_TIMEOUT, to);
conf.setInt("hbase.splitlog.manager.unassigned.timeout", 2 * to); conf.setInt("hbase.splitlog.manager.unassigned.timeout", 2 * to);

18
pom.xml
View File

@ -956,16 +956,16 @@
<buildDate>${maven.build.timestamp}</buildDate> <buildDate>${maven.build.timestamp}</buildDate>
<compileSource>1.7</compileSource> <compileSource>1.7</compileSource>
<!-- Dependencies --> <!-- 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> <hadoop-three.version>3.0.0-SNAPSHOT</hadoop-three.version>
<commons-cli.version>1.2</commons-cli.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 --> <!-- pretty outdated -->
<commons-io.version>2.4</commons-io.version> <commons-io.version>2.4</commons-io.version>
<commons-lang.version>2.6</commons-lang.version> <commons-lang.version>2.6</commons-lang.version>
<commons-logging.version>1.1.3</commons-logging.version> <commons-logging.version>1.2</commons-logging.version>
<commons-math.version>2.1</commons-math.version> <commons-math.version>2.2</commons-math.version>
<disruptor.version>3.2.0</disruptor.version> <disruptor.version>3.3.0</disruptor.version>
<collections.version>3.2.1</collections.version> <collections.version>3.2.1</collections.version>
<httpclient.version>3.1</httpclient.version> <httpclient.version>3.1</httpclient.version>
<metrics-core.version>2.2.0</metrics-core.version> <metrics-core.version>2.2.0</metrics-core.version>
@ -980,16 +980,16 @@
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<htrace.version>3.0.4</htrace.version> <htrace.version>3.0.4</htrace.version>
<log4j.version>1.2.17</log4j.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> <protobuf.version>2.5.0</protobuf.version>
<thrift.version>0.9.0</thrift.version> <thrift.version>0.9.0</thrift.version>
<zookeeper.version>3.4.6</zookeeper.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> <hadoop-snappy.version>0.0.1-SNAPSHOT</hadoop-snappy.version>
<clover.version>2.6.3</clover.version> <clover.version>2.6.3</clover.version>
<jamon-runtime.version>2.3.1</jamon-runtime.version> <jamon-runtime.version>2.3.1</jamon-runtime.version>
<jettison.version>1.3.1</jettison.version> <jettison.version>1.3.3</jettison.version>
<netty.version>4.0.19.Final</netty.version> <netty.version>4.0.23.Final</netty.version>
<joni.version>2.1.2</joni.version> <joni.version>2.1.2</joni.version>
<!-- Plugin Dependencies --> <!-- Plugin Dependencies -->
<maven.assembly.version>2.4</maven.assembly.version> <maven.assembly.version>2.4</maven.assembly.version>