bump version for hadoop, aws-sdk and json

URL: https://geelib.qihoo.net/geelib/repoMergeDetail?repoId=xt_hadoop/hbox&mergeId=17
Qihoo360 · Jun 25, 2024 · b33f922 · b33f922
2 parents 5971bbc + ecd23c9
commit b33f922
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -197,8 +197,6 @@
                   <includes>
                     <!-- for /jobhistory/job -->
                     <include>*-default.xml</include>
-                    <include>org/apache/hadoop/io/*</include>
-                    <include>org/apache/hadoop/tracing/*</include>
                     <include>org/apache/hadoop/conf/*</include>
                     <include>org/apache/hadoop/crypto/key/*</include>
                     <include>org/apache/hadoop/fs/*</include>
@@ -212,13 +210,16 @@
                     <include>org/apache/hadoop/hdfs/shortcircuit/*</include>
                     <include>org/apache/hadoop/hdfs/util/*</include>
                     <include>org/apache/hadoop/http/*</include>
+                    <include>org/apache/hadoop/io/*</include>
                     <include>org/apache/hadoop/io/retry/*</include>
                     <include>org/apache/hadoop/ipc/**/*</include>
                     <include>org/apache/hadoop/metrics2/**/*</include>
                     <include>org/apache/hadoop/net/unix/*</include>
+                    <include>org/apache/hadoop/security/SecurityUtil*</include>
                     <include>org/apache/hadoop/security/http/XFrameOptionsFilter*</include>
                     <include>org/apache/hadoop/security/token/**/*</include>
                     <include>org/apache/hadoop/service/*</include>
+                    <include>org/apache/hadoop/tracing/*</include>
                     <include>org/apache/hadoop/util/*</include>
                     <include>org/apache/hadoop/util/concurrent/*</include>
                     <include>org/apache/hadoop/yarn/webapp/**/*</include>

diff --git a/pom.xml b/pom.xml
@@ -34,7 +34,7 @@
     -->
     <project.target.release>8</project.target.release>
 
-    <hadoop.version>3.2.1</hadoop.version>
+    <hadoop.version>[3.2.4]</hadoop.version>
     <sortpom.version>4.0.0</sortpom.version>
     <sort.verifyFail>warn</sort.verifyFail>
 
@@ -124,13 +124,13 @@
       <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
-        <version>20140107</version>
+        <version>[20231013,)</version>
       </dependency>
       <!-- amazon s3 -->
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-s3</artifactId>
-        <version>1.11.86</version>
+        <version>[1.12.261]</version>
       </dependency>
       <!-- junit -->
       <dependency>

diff --git a/web/pom.xml b/web/pom.xml
@@ -249,6 +249,7 @@
                     <exclude>org.apache.hadoop.service.*</exclude>
                     <exclude>org.apache.hadoop.tracing.*</exclude>
                     <exclude>org.apache.hadoop.util.*</exclude>
+                    <exclude>org.apache.hadoop.yarn.api.*</exclude>
                     <exclude>org.apache.hadoop.yarn.api.records.*</exclude>
                     <exclude>org.apache.hadoop.yarn.conf.*</exclude>
                     <exclude>org.apache.hadoop.yarn.exceptions.*</exclude>