This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new a80746e067a [revert](fe) revert upgrade dependencies of #33360 (#35714)
a80746e067a is described below
commit a80746e067aeacccf65842eca53630892741df97
Author: Ashin Gau <ashin...@users.noreply.github.com>
AuthorDate: Sat Jun 1 23:37:43 2024 +0800
[revert](fe) revert upgrade dependencies of #33360 (#35714)
revert: #33360, which make conflicts in hudi.
---
fe/be-java-extensions/avro-scanner/pom.xml | 6 -
fe/be-java-extensions/hudi-scanner/pom.xml | 16 +-
fe/be-java-extensions/preload-extensions/pom.xml | 4 +-
fe/fe-core/pom.xml | 16 +-
fe/pom.xml | 268 ++---------------------
5 files changed, 27 insertions(+), 283 deletions(-)
diff --git a/fe/be-java-extensions/avro-scanner/pom.xml
b/fe/be-java-extensions/avro-scanner/pom.xml
index 9fc05aa3859..f95fa947051 100644
--- a/fe/be-java-extensions/avro-scanner/pom.xml
+++ b/fe/be-java-extensions/avro-scanner/pom.xml
@@ -60,12 +60,6 @@ under the License.
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
- <!--hive-catalog-shade shoule exclude avro, now, we need to add avro
here-->
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>1.11.3</version>
- </dependency>
<dependency>
<groupId>org.apache.doris</groupId>
<artifactId>hive-catalog-shade</artifactId>
diff --git a/fe/be-java-extensions/hudi-scanner/pom.xml
b/fe/be-java-extensions/hudi-scanner/pom.xml
index 4e5029ddfea..d4f7a458612 100644
--- a/fe/be-java-extensions/hudi-scanner/pom.xml
+++ b/fe/be-java-extensions/hudi-scanner/pom.xml
@@ -35,8 +35,7 @@ under the License.
<spark.version>3.2.0</spark.version>
<sparkbundle.version>3.2</sparkbundle.version>
<janino.version>3.0.16</janino.version>
- <avro.version>1.11.3</avro.version>
- <netty.version>4.1.108.Final</netty.version>
+ <avro.version>1.11.2</avro.version>
</properties>
<dependencyManagement>
@@ -53,17 +52,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-core_2.12</artifactId>
- <version>${spark.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- <classifier>osx-x86_64</classifier>
- <version>${netty.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -128,7 +116,7 @@ under the License.
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-avro</artifactId>
- <version>1.13.1</version>
+ <version>1.10.1</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/fe/be-java-extensions/preload-extensions/pom.xml
b/fe/be-java-extensions/preload-extensions/pom.xml
index bf7fef49d32..ee7d9c29c28 100644
--- a/fe/be-java-extensions/preload-extensions/pom.xml
+++ b/fe/be-java-extensions/preload-extensions/pom.xml
@@ -33,7 +33,7 @@ under the License.
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<scala.binary.version>2.12</scala.binary.version>
- <spark.version>3.5.1</spark.version>
+ <spark.version>3.2.0</spark.version>
<janino.version>3.0.16</janino.version>
</properties>
@@ -220,7 +220,7 @@ under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-cos</artifactId>
- <version>3.4.0</version>
+ <version>3.3.5</version>
</dependency>
<!-- For BE Paimon OSS/S3 Access -->
<dependency>
diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml
index baa8976de27..52c3fa074a4 100644
--- a/fe/fe-core/pom.xml
+++ b/fe/fe-core/pom.xml
@@ -360,10 +360,6 @@ under the License.
<artifactId>netty-all</artifactId>
<groupId>io.netty</groupId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!--
https://mvnrepository.com/artifact/com.alibaba.otter/canal.protocol -->
@@ -620,11 +616,6 @@ under the License.
<artifactId>protocol-core</artifactId>
<version>${awssdk.version}</version>
</dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>utils</artifactId>
- <version>${awssdk.version}</version>
- </dependency>
<!-- For Iceberg, must be consistent with Iceberg version -->
<dependency>
<groupId>org.apache.avro</groupId>
@@ -678,7 +669,7 @@ under the License.
<dependency>
<groupId>com.google.cloud.bigdataoss</groupId>
<artifactId>gcs-connector</artifactId>
- <version>hadoop3-2.2.21</version>
+ <version>hadoop2-2.2.8</version>
<classifier>shaded</classifier>
<exclusions>
<exclusion>
@@ -699,6 +690,11 @@ under the License.
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo-shaded</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ </dependency>
+
</dependencies>
<repositories>
<!-- for huawei obs sdk -->
diff --git a/fe/pom.xml b/fe/pom.xml
index 3511557737a..3cb5af10e6e 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -252,21 +252,22 @@ under the License.
<json-simple.version>1.1.1</json-simple.version>
<junit.version>5.8.2</junit.version>
<hikaricp.version>4.0.3</hikaricp.version>
- <clickhouse.version>0.6.0</clickhouse.version>
+ <druid.version>1.2.5</druid.version>
+ <clickhouse.version>0.4.6</clickhouse.version>
<thrift.version>0.16.0</thrift.version>
<tomcat-embed-core.version>8.5.86</tomcat-embed-core.version>
<log4j2.version>2.18.0</log4j2.version>
<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.108.Final</netty-all.version>
+ <netty-all.version>4.1.94.Final</netty-all.version>
<!--The dependence of transitive dependence cannot be ruled out, only
Saving the nation through twisted ways.-->
<netty-3-test.version>3.10.6.Final</netty-3-test.version>
<objenesis.version>2.1</objenesis.version>
<!-- NOTE: Using grpc-java whose version is newer than 1.34.0 will
break the build on CentOS 6 due to the obsolete GLIBC -->
<grpc-java.version>1.34.0</grpc-java.version>
- <grpc.version>1.62.2</grpc.version>
- <check.freamework.version>3.42.0</check.freamework.version>
+ <grpc.version>1.58.0</grpc.version>
+ <check.freamework.version>3.38.0</check.freamework.version>
<protobuf.version>3.24.3</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 -->
@@ -274,7 +275,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-java.version}</grpc.java.artifact>
<protoparser.version>3.1.5</protoparser.version>
- <snappy-java.version>1.1.10.5</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>
@@ -291,10 +292,10 @@ under the License.
<javax.activation.version>1.2.0</javax.activation.version>
<jaxws-api.version>2.3.0</jaxws-api.version>
<RoaringBitmap.version>0.8.13</RoaringBitmap.version>
- <spark.version>3.5.1</spark.version>
+ <spark.version>3.4.1</spark.version>
<hive.version>3.1.3</hive.version>
<hive.common.version>2.3.9</hive.common.version>
- <nimbusds.version>9.37.3</nimbusds.version>
+ <nimbusds.version>9.35</nimbusds.version>
<mapreduce.client.version>2.10.1</mapreduce.client.version>
<calcite.version>1.33.0</calcite.version>
<avatica.version>1.22.0</avatica.version>
@@ -304,12 +305,10 @@ under the License.
<iceberg.version>1.1.0</iceberg.version>
<delta.version>3.0.0rc1</delta.version>
<maxcompute.version>0.45.2-public</maxcompute.version>
- <avro.version>1.11.3</avro.version>
+ <avro.version>1.11.2</avro.version>
<arrow.version>13.0.0</arrow.version>
<!-- hudi -->
<hudi.version>0.13.1</hudi.version>
- <!--hbase-->
- <hbase.version>2.5.8</hbase.version>
<presto.hadoop.version>2.7.4-11</presto.hadoop.version>
<presto.hive.version>3.0.0-8</presto.hive.version>
@@ -327,14 +326,12 @@ under the License.
<mariadb-java-client.version>3.0.9</mariadb-java-client.version>
<dlf-metastore-client-hive.version>0.2.14</dlf-metastore-client-hive.version>
<hadoop.version>3.3.6</hadoop.version>
- <awssdk.version>2.23.19</awssdk.version>
<joda.version>2.8.1</joda.version>
<project.scm.id>github</project.scm.id>
<spring.version>2.7.13</spring.version>
- <jetty.version>9.4.54.v20240208</jetty.version>
<orc.version>1.8.4</orc.version>
<ojdbc8.version>12.2.0.1</ojdbc8.version>
- <zookeeper.version>3.9.2</zookeeper.version>
+ <zookeeper.version>3.4.14</zookeeper.version>
<velocity-engine-core.version>2.3</velocity-engine-core.version>
<opentelemetry.version>1.26.0</opentelemetry.version>
<ranger-plugins-common.version>2.4.0</ranger-plugins-common.version>
@@ -343,8 +340,8 @@ under the License.
<kerby.version>2.0.3</kerby.version>
<jettison.version>1.5.4</jettison.version>
<vesoft.client.version>3.0.0</vesoft.client.version>
- <!--ivy-->
- <ivy.version>2.5.2</ivy.version>
+ <!--todo waiting release-->
+ <quartz.version>2.3.2</quartz.version>
<!-- paimon -->
<paimon.version>0.7.0-incubating</paimon.version>
<disruptor.version>3.4.4</disruptor.version>
@@ -398,18 +395,16 @@ under the License.
</profiles>
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ </dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>${nimbusds.version}</version>
</dependency>
- <!--apache ivy-->
- <dependency>
- <groupId>org.apache.ivy</groupId>
- <artifactId>ivy</artifactId>
- <version>${ivy.version}</version>
- </dependency>
-
<!-- opentelemetry-->
<dependency>
<groupId>io.opentelemetry</groupId>
@@ -591,12 +586,6 @@ under the License.
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ch.qos.logback</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -865,94 +854,6 @@ under the License.
<artifactId>netty-transport</artifactId>
<version>${netty-all.version}</version>
</dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-udt</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-rxtx</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <classifier>linux-aarch_64</classifier>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- <classifier>osx-x86_64</classifier>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-kqueue</artifactId>
- <classifier>osx-aarch_64</classifier>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-epoll</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-dns</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-xml</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-redis</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-socks</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-smtp</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-stomp</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-haproxy</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-proxy</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler-ssl-ocsp</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-resolver-dns-classes-macos</artifactId>
- <version>${netty-all.version}</version>
- </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
@@ -1252,108 +1153,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <!--jetty-->
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-common</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>javax-websocket-server-impl</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util-ajax</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-annotations</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-xml</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-http</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>javax-websocket-client-impl</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-plus</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
- </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.spark/spark-launcher_2.12 -->
<dependency>
<groupId>org.apache.spark</groupId>
@@ -1400,11 +1199,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-api</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-aws</artifactId>
@@ -1516,11 +1310,6 @@ under the License.
<artifactId>avro-ipc</artifactId>
<version>${avro.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-mapred</artifactId>
- <version>${avro.version}</version>
- </dependency>
<!--
https://mvnrepository.com/artifact/org.apache.hudi/hudi-common -->
<dependency>
<groupId>org.apache.hudi</groupId>
@@ -1543,29 +1332,6 @@ under the License.
<groupId>org.apache.hive</groupId>
<artifactId>hive-storage-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>${hbase.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.hbase.thirdparty</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop2-compat</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
