This is an automated email from the ASF dual-hosted git repository.
zykkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 30b1b93353 [dependency](fe)Dependency version upgrade (#21191)
30b1b93353 is described below
commit 30b1b93353aee68f74fade46dcec1326feddd4b1
Author: Calvin Kirs <acm_mas...@163.com>
AuthorDate: Thu Jun 29 10:01:33 2023 +0800
[dependency](fe)Dependency version upgrade (#21191)
Keep hadoop-aliyun version consistent with hadoop main version (3.3.5)
upgrade jackson to 2.14.3
upgrade netty version to 4.1.94.final
binding check.freamework version to 3.32.0
upgrade snappy-java to 1.1.10.1
upgrade hudi version to 0.13.1
upgrade spring version to 2.7.13
upgrade orc version to 1.8.4
revert nonsensical changes
---
fe/fe-core/pom.xml | 2 --
fe/pom.xml | 66 +++++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index 3d4e64b087..1b77adb24d 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -36,7 +36,6 @@ under the License.
<awssdk.version>2.17.257</awssdk.version>
<huaweiobs.version>3.1.1-hw-45</huaweiobs.version>
<tencentcos.version>3.3.5</tencentcos.version>
- <aliyunoss.version>3.2.2</aliyunoss.version>
</properties>
<profiles>
<profile>
@@ -413,7 +412,6 @@ under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aliyun</artifactId>
- <version>${aliyunoss.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/fe/pom.xml b/fe/pom.xml
index 3c12f0c30b..12fe1b7231 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -215,7 +215,7 @@ under the License.
<commons-validator.version>1.7</commons-validator.version>
<gson.version>2.8.9</gson.version>
<guava.version>30.0-jre</guava.version>
- <jackson.version>2.12.3</jackson.version>
+ <jackson.version>2.14.3</jackson.version>
<java-cup.version>0.11-a-czt02-cdh</java-cup.version>
<javassist.version>3.18.2-GA</javassist.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@@ -233,9 +233,10 @@ under the License.
<log4j-1.2.version>2.18.0</log4j-1.2.version>
<slf4j.version>2.0.6</slf4j.version>
<metrics-core.version>4.0.2</metrics-core.version>
- <netty-all.version>4.1.89.Final</netty-all.version>
+ <netty-all.version>4.1.94.Final</netty-all.version>
<objenesis.version>2.1</objenesis.version>
<grpc.version>1.30.0</grpc.version>
+ <check.freamework.version>3.32.0</check.freamework.version>
<protobuf.version>3.21.12</protobuf.version>
<!-- we use protoc-jar-maven-plugin to generate protobuf generated
code -->
<!-- see
https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/ to get correct
version -->
@@ -243,7 +244,7 @@ under the License.
<protoc.artifact>com.google.protobuf:protoc:${protoc.artifact.version}</protoc.artifact>
<grpc.java.artifact>io.grpc:protoc-gen-grpc-java:${grpc.version}</grpc.java.artifact>
<protoparser.version>3.1.5</protoparser.version>
- <snappy-java.version>1.1.7.2</snappy-java.version>
+ <snappy-java.version>1.1.10.1</snappy-java.version>
<automaton.version>1.11-8</automaton.version>
<generex.version>1.0.1</generex.version>
<kubernetes-client.version>5.12.2</kubernetes-client.version>
@@ -275,7 +276,7 @@ under the License.
<arrow.version>9.0.0</arrow.version>
<avro.version>1.11.1</avro.version>
<!-- hudi -->
- <hudi.version>0.13.0</hudi.version>
+ <hudi.version>0.13.1</hudi.version>
<presto.hadoop.version>2.7.4-11</presto.hadoop.version>
<presto.hive.version>3.0.0-8</presto.hive.version>
@@ -295,7 +296,8 @@ under the License.
<hadoop.version>3.3.5</hadoop.version>
<joda.version>2.8.1</joda.version>
<project.scm.id>github</project.scm.id>
- <spring.version>2.7.8</spring.version>
+ <spring.version>2.7.13</spring.version>
+ <orc.version>1.8.4</orc.version>
<zookeeper.version>3.4.14</zookeeper.version>
<velocity-engine-core.version>2.3</velocity-engine-core.version>
<ojdbc6.version>11.2.0.4</ojdbc6.version>
@@ -373,6 +375,11 @@ under the License.
<artifactId>opentelemetry-exporter-zipkin</artifactId>
<version>${opentelemetry.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.orc</groupId>
+ <artifactId>orc-core</artifactId>
+ <version>${orc.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -482,6 +489,18 @@ under the License.
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-aliyun</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <!-- pls confirm if this is a mandatory dependency -->
+ <exclusion>
+ <groupId>org.ini4j</groupId>
+ <artifactId>ini4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>hive-catalog-shade</artifactId>
@@ -846,6 +865,11 @@ under the License.
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker</artifactId>
+ <version>${check.freamework.version}</version>
+ </dependency>
<!-- https://mvnrepository.com/artifact/com.squareup/protoparser
-->
<dependency>
<groupId>com.squareup</groupId>
@@ -1025,7 +1049,7 @@ under the License.
<groupId>org.apache.spark</groupId>
<artifactId>spark-launcher_2.12</artifactId>
<version>${spark.version}</version>
- <!-- <scope>provided</scope> -->
+ <scope>provided</scope>
</dependency>
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-sql_2.12 -->
<dependency>
@@ -1040,6 +1064,12 @@ under the License.
</exclusions>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-tags_2.12</artifactId>
+ <version>${spark.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -1300,22 +1330,42 @@ under the License.
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
<version>${hive.common.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
- <version>${mapreduce.client.version}</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId>
- <version>${mapreduce.client.version}</version>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
