You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by mi...@apache.org on 2023/10/10 22:31:56 UTC
[impala] 04/04: IMPALA-12480: Use Hadoop version for hadoop-aliyun
This is an automated email from the ASF dual-hosted git repository.
michaelsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
commit 098ad53f656f0e623574778f13a1bba055e75cfc
Author: Michael Smith <mi...@cloudera.com>
AuthorDate: Tue Oct 3 09:41:39 2023 -0700
IMPALA-12480: Use Hadoop version for hadoop-aliyun
Uses the imported Hadoop version for the hadoop-aliyun module, which is
a tool in the hadoop project. This allows us to exclude vulnerable
versions of jdom that were previously included via hadoop-aliyun.
Change-Id: I270f3895ec668d9fb907f35b04cad2f149e3d0de
Reviewed-on: http://gerrit.cloudera.org:8080/20532
Reviewed-by: Michael Smith <mi...@cloudera.com>
Tested-by: Impala Public Jenkins <im...@cloudera.com>
---
bin/impala-config.sh | 2 --
fe/pom.xml | 1 +
java/executor-deps/pom.xml | 2 +-
java/pom.xml | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/bin/impala-config.sh b/bin/impala-config.sh
index 346c84523..074d92c5f 100755
--- a/bin/impala-config.sh
+++ b/bin/impala-config.sh
@@ -252,7 +252,6 @@ export ARCH_NAME=$(uname -p)
# other branches to override them in impala-config-branch.sh for cleaner patches.
export IMPALA_BOUNCY_CASTLE_VERSION=1.68
export IMPALA_COS_VERSION=3.1.0-8.0.8
-export IMPALA_OSS_VERSION=3.1.1
export IMPALA_DERBY_VERSION=10.14.2.0
export IMPALA_GUAVA_VERSION=31.1-jre
export IMPALA_HUDI_VERSION=0.5.0-incubating
@@ -1067,7 +1066,6 @@ echo "IMPALA_KUDU_VERSION = $IMPALA_KUDU_VERSION"
echo "IMPALA_RANGER_VERSION = $IMPALA_RANGER_VERSION"
echo "IMPALA_ICEBERG_VERSION = $IMPALA_ICEBERG_VERSION"
echo "IMPALA_COS_VERSION = $IMPALA_COS_VERSION"
-echo "IMPALA_OSS_VERSION = $IMPALA_OSS_VERSION"
echo "IMPALA_OBS_VERSION = $IMPALA_OBS_VERSION"
echo "IMPALA_SYSTEM_PYTHON2 = $IMPALA_SYSTEM_PYTHON2"
echo "IMPALA_SYSTEM_PYTHON3 = $IMPALA_SYSTEM_PYTHON3"
diff --git a/fe/pom.xml b/fe/pom.xml
index 5c3630a81..81ebd6a84 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -895,6 +895,7 @@ under the License.
<exclude>org.apache.parquet:*</exclude>
<exclude>org.apache.avro:*</exclude>
<exclude>org.apache.orc:*</exclude>
+ <exclude>org.jdom:jdom</exclude>
</excludes>
<includes>
<!-- ranger-plugins-audit depends on jetty-client, which in turn pulls in jetty-http and jetty-io. -->
diff --git a/java/executor-deps/pom.xml b/java/executor-deps/pom.xml
index 21cc92648..ba6f8074c 100644
--- a/java/executor-deps/pom.xml
+++ b/java/executor-deps/pom.xml
@@ -136,7 +136,7 @@ under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aliyun</artifactId>
- <version>${oss.version}</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
diff --git a/java/pom.xml b/java/pom.xml
index 863e32f5b..6e06c57e2 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -51,7 +51,6 @@ under the License.
<kite.version>${env.IMPALA_KITE_VERSION}</kite.version>
<knox.version>${env.IMPALA_KNOX_VERSION}</knox.version>
<cos.version>${env.IMPALA_COS_VERSION}</cos.version>
- <oss.version>${env.IMPALA_OSS_VERSION}</oss.version>
<obs.version>${env.IMPALA_OBS_VERSION}</obs.version>
<thrift.version>${env.IMPALA_THRIFT_POM_VERSION}</thrift.version>
<impala.extdatasrc.api.version>${project.version}</impala.extdatasrc.api.version>