diff --git a/common/src/test/java/net/qihoo/hbox/common/HadoopVersionTest.java b/common/src/test/java/net/qihoo/hbox/common/HadoopVersionTest.java index 4ea6b34..4af8a53 100644 --- a/common/src/test/java/net/qihoo/hbox/common/HadoopVersionTest.java +++ b/common/src/test/java/net/qihoo/hbox/common/HadoopVersionTest.java @@ -9,14 +9,14 @@ public class HadoopVersionTest { public void testParseHadoopVersion() { assertTrue(HadoopVersion.hasHaddopVersion()); - // assume the hadoop version at build time is 3.2.1 + // assume the hadoop version at build time is 3.2.4 assertTrue(HadoopVersion.isHaddopVersionAtLeast(3)); assertTrue(HadoopVersion.isHaddopVersionAtLeast(3, 2)); - assertTrue(HadoopVersion.isHaddopVersionAtLeast(3, 2, 1)); + assertTrue(HadoopVersion.isHaddopVersionAtLeast(3, 2, 4)); assertFalse(HadoopVersion.isHaddopVersionAtLeast(4)); assertFalse(HadoopVersion.isHaddopVersionAtLeast(3, 3)); - assertFalse(HadoopVersion.isHaddopVersionAtLeast(3, 2, 2)); + assertFalse(HadoopVersion.isHaddopVersionAtLeast(3, 2, 5)); assertTrue(HadoopVersion.isHaddopVersionAtLeast(2, 6)); assertTrue(HadoopVersion.isHaddopVersionAtLeast(2, 7)); diff --git a/history-server/pom.xml b/history-server/pom.xml index 59b5ee5..1886e4d 100644 --- a/history-server/pom.xml +++ b/history-server/pom.xml @@ -197,8 +197,6 @@ *-default.xml - org/apache/hadoop/io/* - org/apache/hadoop/tracing/* org/apache/hadoop/conf/* org/apache/hadoop/crypto/key/* org/apache/hadoop/fs/* @@ -212,13 +210,16 @@ org/apache/hadoop/hdfs/shortcircuit/* org/apache/hadoop/hdfs/util/* org/apache/hadoop/http/* + org/apache/hadoop/io/* org/apache/hadoop/io/retry/* org/apache/hadoop/ipc/**/* org/apache/hadoop/metrics2/**/* org/apache/hadoop/net/unix/* + org/apache/hadoop/security/SecurityUtil* org/apache/hadoop/security/http/XFrameOptionsFilter* org/apache/hadoop/security/token/**/* org/apache/hadoop/service/* + org/apache/hadoop/tracing/* org/apache/hadoop/util/* org/apache/hadoop/util/concurrent/* org/apache/hadoop/yarn/webapp/**/* diff --git a/pom.xml b/pom.xml index 08e6a9a..d29a909 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ --> 8 - 3.2.1 + [3.2.4] 4.0.0 warn @@ -124,13 +124,13 @@ org.json json - 20140107 + [20231013,) com.amazonaws aws-java-sdk-s3 - 1.11.86 + [1.12.261] diff --git a/web/pom.xml b/web/pom.xml index 61508f5..2c22903 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -249,6 +249,7 @@ org.apache.hadoop.service.* org.apache.hadoop.tracing.* org.apache.hadoop.util.* + org.apache.hadoop.yarn.api.* org.apache.hadoop.yarn.api.records.* org.apache.hadoop.yarn.conf.* org.apache.hadoop.yarn.exceptions.*