This is an automated email from the ASF dual-hosted git repository. kxiao pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/doris.git
commit c9d5f9787ab0a536f1de22999d529a01eb92cc64 Author: Calvin Kirs <[email protected]> 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 | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index bfcaa3defd..3e1ad92c28 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 0625528a56..4301bf7ffc 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -238,6 +238,7 @@ under the License. <netty-3-test.version>3.10.6.Final</netty-3-test.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 --> @@ -245,7 +246,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> <fabric8.kubernetes.version>6.7.2</fabric8.kubernetes.version> @@ -276,7 +277,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> @@ -375,6 +376,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> @@ -484,6 +490,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> @@ -859,6 +877,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> @@ -1038,7 +1061,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> @@ -1053,6 +1076,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> @@ -1339,18 +1368,28 @@ under the License. <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: [email protected] For additional commands, e-mail: [email protected]
