Skip to content

Commit

Permalink
[Chore](dependencies)Upgrade Fe dependencies (#44872)
Browse files Browse the repository at this point in the history 
### What problem does this PR solve?

upgrade guava to 32.2.1-jre
upgrade zookeeper to 3.9.3
upgrade azure to 1.2.29
exclusion ini4j and lucene
  • Loading branch information
@CalvinKirs
CalvinKirs authored Dec 12, 2024
1 parent 13add3c commit 947100f
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 9 deletions.
19 changes: 19 additions & 0 deletions fe/fe-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ under the License.
<groupId>com.alibaba.otter</groupId>
<artifactId>canal.client</artifactId>
<version>1.1.6</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -410,6 +411,7 @@ under the License.
<groupId>com.huaweicloud</groupId>
<artifactId>hadoop-huaweicloud</artifactId>
<version>${huaweiobs.version}</version>
<scope>${obs.dependency.scope}</scope>
<exclusions>
<exclusion>
<artifactId>jackson-databind</artifactId>
Expand All @@ -421,6 +423,7 @@ under the License.
<groupId>com.qcloud.cos</groupId>
<artifactId>hadoop-cos</artifactId>
<version>${tencentcos.version}</version>
<scope>${cos.dependency.scope}</scope>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
Expand Down Expand Up @@ -758,6 +761,20 @@ under the License.
<groupId>com.qcloud</groupId>
<artifactId>cos_api</artifactId>
<version>5.6.211</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</exclusion>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.qcloud</groupId>
Expand All @@ -768,6 +785,7 @@ under the License.
<groupId>com.huaweicloud</groupId>
<artifactId>esdk-obs-java-bundle</artifactId>
<version>[3.21.11,)</version>
<scope>${obs.dependency.scope}</scope>
</dependency>
<dependency>
<groupId>com.baidubce</groupId>
Expand All @@ -791,6 +809,7 @@ under the License.
<artifactId>gcs-connector</artifactId>
<version>hadoop3-2.2.21</version>
<classifier>shaded</classifier>
<scope>${gcs.dependency.scope}</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
30 changes: 21 additions & 9 deletions fe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,20 @@ under the License.
<module>be-java-extensions</module>
</modules>
<properties>
<doris.hive.catalog.shade.version>2.1.1</doris.hive.catalog.shade.version>
<avro.version>1.11.4</avro.version>
<parquet.version>1.13.1</parquet.version>
<spark.version>3.4.3</spark.version>
<hudi.version>0.15.0</hudi.version>
<obs.dependency.scope>compile</obs.dependency.scope>
<cos.dependency.scope>compile</cos.dependency.scope>
<gcs.dependency.scope>compile</gcs.dependency.scope>
<!--suppress UnresolvedMavenProperty -->
<doris.thirdparty>${fe.dir}/../thirdparty</doris.thirdparty>
<!--suppress UnresolvedMavenProperty -->
<doris.home>${fe.dir}/../</doris.home>
<revision>1.2-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<doris.hive.catalog.shade.version>2.1.1</doris.hive.catalog.shade.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!--plugin parameters-->
Expand All @@ -248,7 +255,7 @@ under the License.
<commons-text.version>1.10.0</commons-text.version>
<commons-validator.version>1.7</commons-validator.version>
<gson.version>2.10.1</gson.version>
<guava.version>32.1.2-jre</guava.version>
<guava.version>33.2.1-jre</guava.version>
<jackson.version>2.16.0</jackson.version>
<java-cup.version>0.11-a-czt02-cdh</java-cup.version>
<javassist.version>3.18.2-GA</javassist.version>
Expand Down Expand Up @@ -301,7 +308,6 @@ 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.4.3</spark.version>
<hudi-spark.version>hudi-spark3.4.x</hudi-spark.version>
<hive.version>3.1.3</hive.version>
<hive.common.version>2.3.9</hive.common.version>
Expand All @@ -314,16 +320,13 @@ under the License.
you can find avro version info in iceberg mvn repository -->
<iceberg.version>1.4.3</iceberg.version>
<maxcompute.version>0.49.0-public</maxcompute.version>
<avro.version>1.11.4</avro.version>
<arrow.version>17.0.0</arrow.version>
<!-- hudi -->
<hudi.version>0.15.0</hudi.version>
<presto.hadoop.version>2.7.4-11</presto.hadoop.version>
<presto.hive.version>3.0.0-8</presto.hive.version>
<!-- lakesoul -->
<lakesoul.version>2.6.2</lakesoul.version>

<parquet.version>1.13.1</parquet.version>

<commons-collections.version>3.2.2</commons-collections.version>
<commons-compress.version>1.27.1</commons-compress.version>
<scala.version>2.12.10</scala.version>
Expand All @@ -346,7 +349,7 @@ under the License.
<spring.version>2.7.18</spring.version>
<spring-framework.version>5.3.39</spring-framework.version>
<orc.version>1.8.4</orc.version>
<zookeeper.version>3.9.2</zookeeper.version>
<zookeeper.version>3.9.3</zookeeper.version>
<velocity-engine-core.version>2.4</velocity-engine-core.version>
<ranger-plugins-common.version>2.4.0</ranger-plugins-common.version>
<bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
Expand All @@ -372,7 +375,7 @@ under the License.
<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
<asm.version>9.4</asm.version>
<airlift.concurrent.version>202</airlift.concurrent.version>
<azure.sdk.version>1.2.27</azure.sdk.version>
<azure.sdk.version>1.2.29</azure.sdk.version>
<azure.sdk.batch.version>12.22.0</azure.sdk.batch.version>
<semver4j.version>5.3.0</semver4j.version>
<aliyun-sdk-oss.version>3.15.0</aliyun-sdk-oss.version>
Expand Down Expand Up @@ -1319,6 +1322,10 @@ under the License.
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
</exclusion>
<exclusion>
<groupId>org.ini4j</groupId>
<artifactId>ini4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- For Iceberg, must be consistent with Iceberg version -->
Expand Down Expand Up @@ -1651,6 +1658,11 @@ under the License.
<artifactId>concurrent</artifactId>
<version>${airlift.concurrent.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-bom</artifactId>
Expand Down

0 comments on commit 947100f

Please sign in to comment.