You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2022/06/20 18:38:07 UTC

[incubator-kyuubi] branch branch-1.5 updated: [KYUUBI #2915] Revert "[KYUUBI #2000][DEPS] Bump Hadoop 3.3.2"

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch branch-1.5
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/branch-1.5 by this push:
     new 1f07fbf20 [KYUUBI #2915] Revert "[KYUUBI #2000][DEPS] Bump Hadoop 3.3.2"
1f07fbf20 is described below

commit 1f07fbf204f5b5df3dec932f2edcbb77b4f16fdc
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Tue Jun 21 02:18:09 2022 +0800

    [KYUUBI #2915] Revert "[KYUUBI #2000][DEPS] Bump Hadoop 3.3.2"
    
    https://github.com/apache/incubator-kyuubi/issues/2904
    This reverts commit e250c4ae359d24726e1894bec20b5dd4a3051d85.
    
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #2915 from pan3793/revert.
    
    Closes #2915
    
    Closes #2000
    
    9c789eb1 [Cheng Pan] Revert "[KYUUBI #2000][DEPS] Bump Hadoop 3.3.2"
    
    Authored-by: Cheng Pan <ch...@apache.org>
    Signed-off-by: Cheng Pan <ch...@apache.org>
    (cherry picked from commit 3435e2ae4938b37826de9256626704e5d76a4bc8)
    Signed-off-by: Cheng Pan <ch...@apache.org>
---
 dev/dependencyList |  5 +++--
 pom.xml            | 12 +-----------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/dev/dependencyList b/dev/dependencyList
index a06761041..74c26c915 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -23,8 +23,8 @@ curator-client/2.12.0//curator-client-2.12.0.jar
 curator-framework/2.12.0//curator-framework-2.12.0.jar
 curator-recipes/2.12.0//curator-recipes-2.12.0.jar
 guava/30.1-jre//guava-30.1-jre.jar
-hadoop-client-api/3.3.2//hadoop-client-api-3.3.2.jar
-hadoop-client-runtime/3.3.2//hadoop-client-runtime-3.3.2.jar
+hadoop-client-api/3.3.1//hadoop-client-api-3.3.1.jar
+hadoop-client-runtime/3.3.1//hadoop-client-runtime-3.3.1.jar
 hive-common/2.3.9//hive-common-2.3.9.jar
 hive-metastore/2.3.9//hive-metastore-2.3.9.jar
 hive-serde/2.3.9//hive-serde-2.3.9.jar
@@ -34,6 +34,7 @@ hive-shims-common/2.3.9//hive-shims-common-2.3.9.jar
 hk2-api/2.6.1//hk2-api-2.6.1.jar
 hk2-locator/2.6.1//hk2-locator-2.6.1.jar
 hk2-utils/2.6.1//hk2-utils-2.6.1.jar
+htrace-core4/4.1.0-incubating//htrace-core4-4.1.0-incubating.jar
 jackson-annotations/2.13.3//jackson-annotations-2.13.3.jar
 jackson-core/2.13.3//jackson-core-2.13.3.jar
 jackson-databind/2.13.3//jackson-databind-2.13.3.jar
diff --git a/pom.xml b/pom.xml
index df6375bc2..2e6482f5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
         <google.jsr305.version>3.0.2</google.jsr305.version>
         <guava.version>30.1-jre</guava.version>
         <guava.failureaccess.version>1.0.1</guava.failureaccess.version>
-        <hadoop.version>3.3.2</hadoop.version>
+        <hadoop.version>3.3.1</hadoop.version>
         <hive.version>2.3.9</hive.version>
         <hive.service.rpc.version>3.1.2</hive.service.rpc.version>
         <hudi.version>0.10.0</hudi.version>
@@ -269,12 +269,6 @@
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-client-api</artifactId>
                 <version>${hadoop.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.xerial.snappy</groupId>
-                        <artifactId>snappy-java</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
 
             <dependency>
@@ -286,10 +280,6 @@
                         <groupId>commons-logging</groupId>
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
-                    <exclusion>
-                        <groupId>org.xerial.snappy</groupId>
-                        <artifactId>snappy-java</artifactId>
-                    </exclusion>
                 </exclusions>
             </dependency>