This is an automated email from the ASF dual-hosted git repository. leesf pushed a commit to branch task#69426984_upgrade_hudi_version in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 1f16c716b6d9c83e512ba2592c21efb098e2454e Author: fengze <[email protected]> AuthorDate: Thu Jul 18 12:44:26 2024 +0800 to #57098136 upgrade hudi version to 0.15.0.1.adb-SNAPSHOT --- docker/hoodie/hadoop/base/pom.xml | 2 +- docker/hoodie/hadoop/base_java11/pom.xml | 2 +- docker/hoodie/hadoop/datanode/pom.xml | 2 +- docker/hoodie/hadoop/historyserver/pom.xml | 2 +- docker/hoodie/hadoop/hive_base/pom.xml | 2 +- docker/hoodie/hadoop/namenode/pom.xml | 2 +- docker/hoodie/hadoop/pom.xml | 2 +- docker/hoodie/hadoop/prestobase/pom.xml | 2 +- docker/hoodie/hadoop/spark_base/pom.xml | 2 +- docker/hoodie/hadoop/sparkadhoc/pom.xml | 2 +- docker/hoodie/hadoop/sparkmaster/pom.xml | 2 +- docker/hoodie/hadoop/sparkworker/pom.xml | 2 +- docker/hoodie/hadoop/trinobase/pom.xml | 2 +- docker/hoodie/hadoop/trinocoordinator/pom.xml | 2 +- docker/hoodie/hadoop/trinoworker/pom.xml | 2 +- hudi-aws/pom.xml | 10 +- hudi-cli/pom.xml | 2 +- hudi-client/hudi-client-common/pom.xml | 4 +- hudi-client/hudi-flink-client/pom.xml | 4 +- hudi-client/hudi-java-client/pom.xml | 4 +- hudi-client/hudi-spark-client/pom.xml | 4 +- hudi-client/pom.xml | 2 +- hudi-common/pom.xml | 2 +- hudi-examples/hudi-examples-common/pom.xml | 16 +- hudi-examples/hudi-examples-flink/pom.xml | 10 +- hudi-examples/hudi-examples-java/pom.xml | 16 +- hudi-examples/hudi-examples-k8s/pom.xml | 200 +++++++++++++++++++++ hudi-examples/hudi-examples-spark/pom.xml | 2 +- hudi-examples/pom.xml | 3 +- hudi-flink-datasource/hudi-flink/pom.xml | 4 +- hudi-flink-datasource/hudi-flink1.14.x/pom.xml | 4 +- hudi-flink-datasource/hudi-flink1.15.x/pom.xml | 4 +- hudi-flink-datasource/hudi-flink1.16.x/pom.xml | 4 +- hudi-flink-datasource/hudi-flink1.17.x/pom.xml | 4 +- hudi-flink-datasource/hudi-flink1.18.x/pom.xml | 4 +- hudi-flink-datasource/pom.xml | 4 +- hudi-gcp/pom.xml | 2 +- hudi-hadoop-common/pom.xml | 2 +- hudi-hadoop-mr/pom.xml | 2 +- hudi-integ-test/pom.xml | 2 +- hudi-io/pom.xml | 2 +- hudi-kafka-connect/pom.xml | 4 +- .../hudi-metaserver/hudi-metaserver-client/pom.xml | 2 +- .../hudi-metaserver/hudi-metaserver-server/pom.xml | 2 +- hudi-platform-service/hudi-metaserver/pom.xml | 4 +- hudi-platform-service/pom.xml | 2 +- hudi-spark-datasource/hudi-spark-common/pom.xml | 4 +- hudi-spark-datasource/hudi-spark/pom.xml | 12 +- hudi-spark-datasource/hudi-spark2-common/pom.xml | 2 +- hudi-spark-datasource/hudi-spark2/pom.xml | 4 +- hudi-spark-datasource/hudi-spark3-common/pom.xml | 2 +- hudi-spark-datasource/hudi-spark3.0.x/pom.xml | 4 +- hudi-spark-datasource/hudi-spark3.1.x/pom.xml | 4 +- hudi-spark-datasource/hudi-spark3.2.x/pom.xml | 4 +- .../hudi-spark3.2plus-common/pom.xml | 2 +- hudi-spark-datasource/hudi-spark3.3.x/pom.xml | 4 +- hudi-spark-datasource/hudi-spark3.4.x/pom.xml | 4 +- hudi-spark-datasource/hudi-spark3.5.x/pom.xml | 4 +- hudi-spark-datasource/pom.xml | 2 +- hudi-sync/hudi-adb-sync/pom.xml | 2 +- hudi-sync/hudi-datahub-sync/pom.xml | 4 +- hudi-sync/hudi-hive-sync/pom.xml | 2 +- hudi-sync/hudi-sync-common/pom.xml | 2 +- hudi-sync/pom.xml | 2 +- hudi-tests-common/pom.xml | 2 +- hudi-timeline-service/pom.xml | 2 +- hudi-utilities/pom.xml | 2 +- packaging/hudi-aws-bundle/pom.xml | 3 +- packaging/hudi-cli-bundle/pom.xml | 2 +- packaging/hudi-datahub-sync-bundle/pom.xml | 2 +- packaging/hudi-flink-bundle/pom.xml | 2 +- packaging/hudi-gcp-bundle/pom.xml | 2 +- packaging/hudi-hadoop-mr-bundle/pom.xml | 2 +- packaging/hudi-hive-sync-bundle/pom.xml | 2 +- packaging/hudi-integ-test-bundle/pom.xml | 2 +- packaging/hudi-kafka-connect-bundle/pom.xml | 3 +- packaging/hudi-metaserver-server-bundle/pom.xml | 2 +- packaging/hudi-presto-bundle/pom.xml | 2 +- packaging/hudi-spark-bundle/pom.xml | 7 +- packaging/hudi-timeline-server-bundle/pom.xml | 2 +- packaging/hudi-trino-bundle/pom.xml | 3 +- packaging/hudi-utilities-bundle/pom.xml | 7 +- packaging/hudi-utilities-slim-bundle/pom.xml | 2 +- pom.xml | 39 ++-- 84 files changed, 358 insertions(+), 157 deletions(-) diff --git a/docker/hoodie/hadoop/base/pom.xml b/docker/hoodie/hadoop/base/pom.xml index c487ed2dbda5..18cfed7a7cb4 100644 --- a/docker/hoodie/hadoop/base/pom.xml +++ b/docker/hoodie/hadoop/base/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/base_java11/pom.xml b/docker/hoodie/hadoop/base_java11/pom.xml index 7649faf01dee..1f813e37d0a6 100644 --- a/docker/hoodie/hadoop/base_java11/pom.xml +++ b/docker/hoodie/hadoop/base_java11/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/datanode/pom.xml b/docker/hoodie/hadoop/datanode/pom.xml index f0c5f9ab5eeb..9a80514d1cde 100644 --- a/docker/hoodie/hadoop/datanode/pom.xml +++ b/docker/hoodie/hadoop/datanode/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/historyserver/pom.xml b/docker/hoodie/hadoop/historyserver/pom.xml index eb9412c2977f..9717eb910cdb 100644 --- a/docker/hoodie/hadoop/historyserver/pom.xml +++ b/docker/hoodie/hadoop/historyserver/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/hive_base/pom.xml b/docker/hoodie/hadoop/hive_base/pom.xml index 6dac4e5488a5..ca4a66931d4a 100644 --- a/docker/hoodie/hadoop/hive_base/pom.xml +++ b/docker/hoodie/hadoop/hive_base/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/namenode/pom.xml b/docker/hoodie/hadoop/namenode/pom.xml index 3f8005f44943..0b6244d27b18 100644 --- a/docker/hoodie/hadoop/namenode/pom.xml +++ b/docker/hoodie/hadoop/namenode/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/pom.xml b/docker/hoodie/hadoop/pom.xml index 0e8d40c86a55..61d5393e9376 100644 --- a/docker/hoodie/hadoop/pom.xml +++ b/docker/hoodie/hadoop/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/docker/hoodie/hadoop/prestobase/pom.xml b/docker/hoodie/hadoop/prestobase/pom.xml index b0c1c534d2e3..e19d863a877c 100644 --- a/docker/hoodie/hadoop/prestobase/pom.xml +++ b/docker/hoodie/hadoop/prestobase/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/spark_base/pom.xml b/docker/hoodie/hadoop/spark_base/pom.xml index 147b0ad0a789..977b0f4d039d 100644 --- a/docker/hoodie/hadoop/spark_base/pom.xml +++ b/docker/hoodie/hadoop/spark_base/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/sparkadhoc/pom.xml b/docker/hoodie/hadoop/sparkadhoc/pom.xml index 2aaac476829e..9dfbc28cecfd 100644 --- a/docker/hoodie/hadoop/sparkadhoc/pom.xml +++ b/docker/hoodie/hadoop/sparkadhoc/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/sparkmaster/pom.xml b/docker/hoodie/hadoop/sparkmaster/pom.xml index b1578d11a7d1..ab981fdba6d9 100644 --- a/docker/hoodie/hadoop/sparkmaster/pom.xml +++ b/docker/hoodie/hadoop/sparkmaster/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/sparkworker/pom.xml b/docker/hoodie/hadoop/sparkworker/pom.xml index ade8c26da637..2b5e5e475e28 100644 --- a/docker/hoodie/hadoop/sparkworker/pom.xml +++ b/docker/hoodie/hadoop/sparkworker/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/trinobase/pom.xml b/docker/hoodie/hadoop/trinobase/pom.xml index 23c4adcc7a5f..50f760fac596 100644 --- a/docker/hoodie/hadoop/trinobase/pom.xml +++ b/docker/hoodie/hadoop/trinobase/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/trinocoordinator/pom.xml b/docker/hoodie/hadoop/trinocoordinator/pom.xml index 75d9482bf27b..563d3df8c5e1 100644 --- a/docker/hoodie/hadoop/trinocoordinator/pom.xml +++ b/docker/hoodie/hadoop/trinocoordinator/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/docker/hoodie/hadoop/trinoworker/pom.xml b/docker/hoodie/hadoop/trinoworker/pom.xml index ca78924d76f6..5546d1a192f5 100644 --- a/docker/hoodie/hadoop/trinoworker/pom.xml +++ b/docker/hoodie/hadoop/trinoworker/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi-hadoop-docker</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> diff --git a/hudi-aws/pom.xml b/hudi-aws/pom.xml index c765d6e558c3..e548179e4ac8 100644 --- a/hudi-aws/pom.xml +++ b/hudi-aws/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-aws</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-aws</name> <packaging>jar</packaging> @@ -187,6 +187,12 @@ <version>${aws.sdk.httpcore.version}</version> </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>sts</artifactId> + <version>${aws.sdk.version}</version> + </dependency> + <!-- Test --> <dependency> <groupId>org.apache.hudi</groupId> diff --git a/hudi-cli/pom.xml b/hudi-cli/pom.xml index b5a6e3a53d3f..873272de3009 100644 --- a/hudi-cli/pom.xml +++ b/hudi-cli/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-client/hudi-client-common/pom.xml b/hudi-client/hudi-client-common/pom.xml index 2abcf5fa82fd..98371687fc08 100644 --- a/hudi-client/hudi-client-common/pom.xml +++ b/hudi-client/hudi-client-common/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-client-common</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-client-common</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-flink-client/pom.xml b/hudi-client/hudi-flink-client/pom.xml index 5969ee00b81a..b47eeef4cbb3 100644 --- a/hudi-client/hudi-flink-client/pom.xml +++ b/hudi-client/hudi-flink-client/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink-client</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-flink-client</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-java-client/pom.xml b/hudi-client/hudi-java-client/pom.xml index e31d51a94c0b..331f0b16fefe 100644 --- a/hudi-client/hudi-java-client/pom.xml +++ b/hudi-client/hudi-java-client/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-java-client</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-java-client</name> <packaging>jar</packaging> diff --git a/hudi-client/hudi-spark-client/pom.xml b/hudi-client/hudi-spark-client/pom.xml index 1a41cb33d40e..840cb85a04e1 100644 --- a/hudi-client/hudi-spark-client/pom.xml +++ b/hudi-client/hudi-spark-client/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi-client</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark-client</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark-client</name> <packaging>jar</packaging> diff --git a/hudi-client/pom.xml b/hudi-client/pom.xml index e119a6dba805..c77c829ab917 100644 --- a/hudi-client/pom.xml +++ b/hudi-client/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-common/pom.xml b/hudi-common/pom.xml index 92731ea7d282..bc8b48235ad8 100644 --- a/hudi-common/pom.xml +++ b/hudi-common/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/hudi-examples-common/pom.xml b/hudi-examples/hudi-examples-common/pom.xml index 84b9c2478cae..1f5906ea85d4 100644 --- a/hudi-examples/hudi-examples-common/pom.xml +++ b/hudi-examples/hudi-examples-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -40,20 +40,6 @@ </resources> <plugins> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>add-source</goal> - <goal>compile</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> diff --git a/hudi-examples/hudi-examples-flink/pom.xml b/hudi-examples/hudi-examples-flink/pom.xml index ffb31b599ff8..926705778cf2 100644 --- a/hudi-examples/hudi-examples-flink/pom.xml +++ b/hudi-examples/hudi-examples-flink/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -30,7 +30,7 @@ <properties> <main.basedir>${project.parent.basedir}</main.basedir> <checkstyle.skip>true</checkstyle.skip> - <parquet.version>1.11.1</parquet.version> + <parquet.version>${flink.format.parquet.version}</parquet.version> </properties> <build> @@ -189,6 +189,12 @@ <version>${flink.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-metrics-dropwizard</artifactId> + <version>${flink.version}</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.parquet</groupId> diff --git a/hudi-examples/hudi-examples-java/pom.xml b/hudi-examples/hudi-examples-java/pom.xml index 30fd75ebbd64..cff5dcdc50f8 100644 --- a/hudi-examples/hudi-examples-java/pom.xml +++ b/hudi-examples/hudi-examples-java/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -59,20 +59,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>net.alchim31.maven</groupId> - <artifactId>scala-maven-plugin</artifactId> - <executions> - <execution> - <id>scala-compile-first</id> - <phase>process-resources</phase> - <goals> - <goal>add-source</goal> - <goal>compile</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> diff --git a/hudi-examples/hudi-examples-k8s/pom.xml b/hudi-examples/hudi-examples-k8s/pom.xml new file mode 100644 index 000000000000..c122bbe7e2f6 --- /dev/null +++ b/hudi-examples/hudi-examples-k8s/pom.xml @@ -0,0 +1,200 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> + <artifactId>hudi-examples</artifactId> + <groupId>org.apache.hudi</groupId> + <version>0.15.0.1.adb-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <artifactId>hudi-examples-k8s</artifactId> + + <properties> + <main.basedir>${project.parent.basedir}</main.basedir> + <checkstyle.skip>true</checkstyle.skip> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.8</source> + <target>1.8</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>${maven-shade-plugin.version}</version> + <executions> + <!-- Run shade goal on package phase --> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <includes> + <include>*:*</include> + </includes> + <excludes> + <exclude>org.apache.hbase.thirdparty:*</exclude> + <exclude>org.apache.flink:flink-shaded-force-shading</exclude> + <exclude>com.google.code.findbugs:jsr305</exclude> + <exclude>org.slf4j:*</exclude> + <exclude>org.apache.logging.log4j:*</exclude> + </excludes> + </artifactSet> + <filters> + <filter> + <!-- Do not copy the signatures in the META-INF folder. + Otherwise, this might cause SecurityExceptions when using the JAR. --> + <artifact>*:*</artifact> + <excludes> + <exclude>META-INF/*.SF</exclude> + <exclude>META-INF/*.DSA</exclude> + <exclude>META-INF/*.RSA</exclude> +\ </excludes> + </filter> + </filters> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.apache.hudi.examples.k8s.quickstart.HudiDataStreamWriter</mainClass> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + </plugin> + </plugins> + + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> + + <dependencies> + <!-- Hoodie --> + <dependency> + <groupId>org.apache.hudi</groupId> + <artifactId>hudi-flink${flink.bundle.version}-bundle</artifactId> + <scope>compile</scope> + <version>${project.version}</version> + </dependency> + + <!-- Flink --> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>${flink.streaming.java.artifactId}</artifactId> + <scope>provided</scope> + <version>${flink.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>${flink.clients.artifactId}</artifactId> + <exclusions> + <exclusion> + <groupId>com.esotericsoftware.kryo</groupId> + <artifactId>kryo</artifactId> + </exclusion> + <exclusion> + <groupId>com.esotericsoftware.minlog</groupId> + <artifactId>minlog</artifactId> + </exclusion> + </exclusions> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-table-common</artifactId> + <version>${flink.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>${flink.table.runtime.artifactId}</artifactId> + <version>${flink.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Hadoop --> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <scope>runtime</scope> + <version>${hadoop.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>runtime</scope> + <version>${hadoop.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + <scope>runtime</scope> + <version>${hadoop.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>runtime</scope> + <version>${hadoop.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-aws</artifactId> + <scope>runtime</scope> + <version>${hadoop.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.hudi</groupId> + <artifactId>hudi-tests-common</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> diff --git a/hudi-examples/hudi-examples-spark/pom.xml b/hudi-examples/hudi-examples-spark/pom.xml index 84971ab48092..8f6afa15887f 100644 --- a/hudi-examples/hudi-examples-spark/pom.xml +++ b/hudi-examples/hudi-examples-spark/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-examples</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-examples/pom.xml b/hudi-examples/pom.xml index 43c626742e30..1b596f433b3f 100644 --- a/hudi-examples/pom.xml +++ b/hudi-examples/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,6 +32,7 @@ <module>hudi-examples-spark</module> <module>hudi-examples-flink</module> <module>hudi-examples-java</module> + <module>hudi-examples-k8s</module> </modules> </project> diff --git a/hudi-flink-datasource/hudi-flink/pom.xml b/hudi-flink-datasource/hudi-flink/pom.xml index 4d64c94b9c1a..7bea4e1ac9f3 100644 --- a/hudi-flink-datasource/hudi-flink/pom.xml +++ b/hudi-flink-datasource/hudi-flink/pom.xml @@ -22,12 +22,12 @@ <parent> <artifactId>hudi-flink-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/hudi-flink-datasource/hudi-flink1.14.x/pom.xml b/hudi-flink-datasource/hudi-flink1.14.x/pom.xml index 7d7f7a4a11ec..3ebad3670c87 100644 --- a/hudi-flink-datasource/hudi-flink1.14.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.14.x/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-flink-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink1.14.x</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/hudi-flink-datasource/hudi-flink1.15.x/pom.xml b/hudi-flink-datasource/hudi-flink1.15.x/pom.xml index b4ae65f3a5ef..2ad1b6b26b06 100644 --- a/hudi-flink-datasource/hudi-flink1.15.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.15.x/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-flink-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink1.15.x</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/hudi-flink-datasource/hudi-flink1.16.x/pom.xml b/hudi-flink-datasource/hudi-flink1.16.x/pom.xml index c2d842996f27..18d4c35ce906 100644 --- a/hudi-flink-datasource/hudi-flink1.16.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.16.x/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-flink-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink1.16.x</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/hudi-flink-datasource/hudi-flink1.17.x/pom.xml b/hudi-flink-datasource/hudi-flink1.17.x/pom.xml index 7657adbe3eed..ce3c0f8b27e5 100644 --- a/hudi-flink-datasource/hudi-flink1.17.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.17.x/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-flink-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink1.17.x</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/hudi-flink-datasource/hudi-flink1.18.x/pom.xml b/hudi-flink-datasource/hudi-flink1.18.x/pom.xml index 336838c1db64..67c85246022b 100644 --- a/hudi-flink-datasource/hudi-flink1.18.x/pom.xml +++ b/hudi-flink-datasource/hudi-flink1.18.x/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-flink-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink1.18.x</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/hudi-flink-datasource/pom.xml b/hudi-flink-datasource/pom.xml index 52f744328fdb..83435c5878e4 100644 --- a/hudi-flink-datasource/pom.xml +++ b/hudi-flink-datasource/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-flink-datasource</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>pom</packaging> <properties> diff --git a/hudi-gcp/pom.xml b/hudi-gcp/pom.xml index d541cb9997aa..1adfa8b7b60e 100644 --- a/hudi-gcp/pom.xml +++ b/hudi-gcp/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> diff --git a/hudi-hadoop-common/pom.xml b/hudi-hadoop-common/pom.xml index 6c1d29726d99..3675fa3081a0 100644 --- a/hudi-hadoop-common/pom.xml +++ b/hudi-hadoop-common/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-hadoop-mr/pom.xml b/hudi-hadoop-mr/pom.xml index db7235f5f4d1..787a7fff2667 100644 --- a/hudi-hadoop-mr/pom.xml +++ b/hudi-hadoop-mr/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-integ-test/pom.xml b/hudi-integ-test/pom.xml index 9efa317fd1b9..ecd0dfbd5209 100644 --- a/hudi-integ-test/pom.xml +++ b/hudi-integ-test/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>hudi-integ-test</artifactId> diff --git a/hudi-io/pom.xml b/hudi-io/pom.xml index 2be5196e2076..ef048e985781 100644 --- a/hudi-io/pom.xml +++ b/hudi-io/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-kafka-connect/pom.xml b/hudi-kafka-connect/pom.xml index 7e2c472b21a8..8bca27ce7542 100644 --- a/hudi-kafka-connect/pom.xml +++ b/hudi-kafka-connect/pom.xml @@ -19,13 +19,13 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-kafka-connect</artifactId> <description>Kafka Connect Sink Connector for Hudi</description> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <packaging>jar</packaging> <properties> diff --git a/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml b/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml index f96e02c12fd9..c36106aefc02 100644 --- a/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml +++ b/hudi-platform-service/hudi-metaserver/hudi-metaserver-client/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-metaserver</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml b/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml index bc3bcdd58208..c440ab28d91d 100644 --- a/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml +++ b/hudi-platform-service/hudi-metaserver/hudi-metaserver-server/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-metaserver</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-platform-service/hudi-metaserver/pom.xml b/hudi-platform-service/hudi-metaserver/pom.xml index fe07160caea8..9ac1384a0305 100644 --- a/hudi-platform-service/hudi-metaserver/pom.xml +++ b/hudi-platform-service/hudi-metaserver/pom.xml @@ -20,12 +20,12 @@ <parent> <artifactId>hudi-platform-service</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-metaserver</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-metaserver</name> <packaging>pom</packaging> diff --git a/hudi-platform-service/pom.xml b/hudi-platform-service/pom.xml index 8bd5db83d634..ab683c4920b6 100644 --- a/hudi-platform-service/pom.xml +++ b/hudi-platform-service/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-spark-datasource/hudi-spark-common/pom.xml b/hudi-spark-datasource/hudi-spark-common/pom.xml index fae7d95a4c51..0eb8856d376a 100644 --- a/hudi-spark-datasource/hudi-spark-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark-common/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark-common_${scala.binary.version}</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark-common_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark/pom.xml b/hudi-spark-datasource/hudi-spark/pom.xml index bbe0fd573487..e9ebdc46cb1d 100644 --- a/hudi-spark-datasource/hudi-spark/pom.xml +++ b/hudi-spark-datasource/hudi-spark/pom.xml @@ -19,12 +19,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark_${scala.binary.version}</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark_${scala.binary.version}</name> <packaging>jar</packaging> @@ -410,6 +410,14 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.apache.hudi</groupId> + <artifactId>hudi-hive-sync</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.curator</groupId> diff --git a/hudi-spark-datasource/hudi-spark2-common/pom.xml b/hudi-spark-datasource/hudi-spark2-common/pom.xml index 215e8e9a4504..dc778235a37d 100644 --- a/hudi-spark-datasource/hudi-spark2-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark2-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-spark-datasource/hudi-spark2/pom.xml b/hudi-spark-datasource/hudi-spark2/pom.xml index 149c59c9b214..fb217449ae24 100644 --- a/hudi-spark-datasource/hudi-spark2/pom.xml +++ b/hudi-spark-datasource/hudi-spark2/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark2_${scala.binary.version}</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark2_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3-common/pom.xml b/hudi-spark-datasource/hudi-spark3-common/pom.xml index 877fdb1b6fd6..df74676a7ade 100644 --- a/hudi-spark-datasource/hudi-spark3-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark3-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-spark-datasource/hudi-spark3.0.x/pom.xml b/hudi-spark-datasource/hudi-spark3.0.x/pom.xml index 77a3d3ebecfe..81e7b02c68f7 100644 --- a/hudi-spark-datasource/hudi-spark3.0.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.0.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.0.x_2.12</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark3.0.x_2.12</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3.1.x/pom.xml b/hudi-spark-datasource/hudi-spark3.1.x/pom.xml index 3841fb276fbb..17792e1fbb40 100644 --- a/hudi-spark-datasource/hudi-spark3.1.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.1.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.1.x_2.12</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark3.1.x_2.12</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3.2.x/pom.xml b/hudi-spark-datasource/hudi-spark3.2.x/pom.xml index efef41e3c873..87c02a6caddd 100644 --- a/hudi-spark-datasource/hudi-spark3.2.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.2.x/pom.xml @@ -18,12 +18,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.2.x_2.12</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark3.2.x_2.12</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3.2plus-common/pom.xml b/hudi-spark-datasource/hudi-spark3.2plus-common/pom.xml index a8cf636a6b7d..d3db6840da92 100644 --- a/hudi-spark-datasource/hudi-spark3.2plus-common/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.2plus-common/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-spark-datasource/hudi-spark3.3.x/pom.xml b/hudi-spark-datasource/hudi-spark3.3.x/pom.xml index 74fa3c7ca840..48d5d691c3fe 100644 --- a/hudi-spark-datasource/hudi-spark3.3.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.3.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.3.x_2.12</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark3.3.x_2.12</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3.4.x/pom.xml b/hudi-spark-datasource/hudi-spark3.4.x/pom.xml index d5877d6240aa..05fbdb0d60b8 100644 --- a/hudi-spark-datasource/hudi-spark3.4.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.4.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.4.x_2.12</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark3.4.x_2.12</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/hudi-spark3.5.x/pom.xml b/hudi-spark-datasource/hudi-spark3.5.x/pom.xml index 291d6f8cf5ab..f88df0022d44 100644 --- a/hudi-spark-datasource/hudi-spark3.5.x/pom.xml +++ b/hudi-spark-datasource/hudi-spark3.5.x/pom.xml @@ -17,12 +17,12 @@ <parent> <artifactId>hudi-spark-datasource</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>hudi-spark3.5.x_${scala.binary.version}</artifactId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <name>hudi-spark3.5.x_${scala.binary.version}</name> <packaging>jar</packaging> diff --git a/hudi-spark-datasource/pom.xml b/hudi-spark-datasource/pom.xml index a590ea2ae1f6..18d85b1b323e 100644 --- a/hudi-spark-datasource/pom.xml +++ b/hudi-spark-datasource/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-sync/hudi-adb-sync/pom.xml b/hudi-sync/hudi-adb-sync/pom.xml index c825f5c4419c..b212967679cd 100644 --- a/hudi-sync/hudi-adb-sync/pom.xml +++ b/hudi-sync/hudi-adb-sync/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/hudi-sync/hudi-datahub-sync/pom.xml b/hudi-sync/hudi-datahub-sync/pom.xml index ecd9688eb6af..2d34299a2b48 100644 --- a/hudi-sync/hudi-datahub-sync/pom.xml +++ b/hudi-sync/hudi-datahub-sync/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -34,7 +34,7 @@ <packaging>jar</packaging> <properties> - <datahub.version>0.8.31</datahub.version> + <datahub.version>0.8.45</datahub.version> <httpasync.version>4.1.5</httpasync.version> </properties> diff --git a/hudi-sync/hudi-hive-sync/pom.xml b/hudi-sync/hudi-hive-sync/pom.xml index 855bc2fcd188..54b5c32483c0 100644 --- a/hudi-sync/hudi-hive-sync/pom.xml +++ b/hudi-sync/hudi-hive-sync/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/hudi-sync/hudi-sync-common/pom.xml b/hudi-sync/hudi-sync-common/pom.xml index 451ce76f0e42..2d18f676dfca 100644 --- a/hudi-sync/hudi-sync-common/pom.xml +++ b/hudi-sync/hudi-sync-common/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-sync/pom.xml b/hudi-sync/pom.xml index 6e0d52652fa8..d2ed5715713d 100644 --- a/hudi-sync/pom.xml +++ b/hudi-sync/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-tests-common/pom.xml b/hudi-tests-common/pom.xml index e6f3e49d869d..ab538ceaf622 100644 --- a/hudi-tests-common/pom.xml +++ b/hudi-tests-common/pom.xml @@ -18,7 +18,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-timeline-service/pom.xml b/hudi-timeline-service/pom.xml index 4dc8f423505c..0d0853bd57f9 100644 --- a/hudi-timeline-service/pom.xml +++ b/hudi-timeline-service/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/hudi-utilities/pom.xml b/hudi-utilities/pom.xml index 6bc1235fd46d..ce8ae6093764 100644 --- a/hudi-utilities/pom.xml +++ b/hudi-utilities/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-aws-bundle/pom.xml b/packaging/hudi-aws-bundle/pom.xml index 0c649efce576..4ebab08dc221 100644 --- a/packaging/hudi-aws-bundle/pom.xml +++ b/packaging/hudi-aws-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -72,7 +72,6 @@ </transformers> <artifactSet> <includes combine.children="append"> - <include>org.apache.hudi:hudi-hadoop-common</include> <include>org.apache.hudi:hudi-hadoop-mr</include> <include>org.apache.hudi:hudi-sync-common</include> <include>org.apache.hudi:hudi-hive-sync</include> diff --git a/packaging/hudi-cli-bundle/pom.xml b/packaging/hudi-cli-bundle/pom.xml index 9919c47c0d9e..0805fe5f595f 100644 --- a/packaging/hudi-cli-bundle/pom.xml +++ b/packaging/hudi-cli-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-datahub-sync-bundle/pom.xml b/packaging/hudi-datahub-sync-bundle/pom.xml index 7dee3e104a4b..8af6661069d2 100644 --- a/packaging/hudi-datahub-sync-bundle/pom.xml +++ b/packaging/hudi-datahub-sync-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-flink-bundle/pom.xml b/packaging/hudi-flink-bundle/pom.xml index 5954b9d6a93a..e40cf930ee1c 100644 --- a/packaging/hudi-flink-bundle/pom.xml +++ b/packaging/hudi-flink-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-gcp-bundle/pom.xml b/packaging/hudi-gcp-bundle/pom.xml index f03c40da31c4..f1307702a1ec 100644 --- a/packaging/hudi-gcp-bundle/pom.xml +++ b/packaging/hudi-gcp-bundle/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-hadoop-mr-bundle/pom.xml b/packaging/hudi-hadoop-mr-bundle/pom.xml index 72688523f5aa..5154a3640f6e 100644 --- a/packaging/hudi-hadoop-mr-bundle/pom.xml +++ b/packaging/hudi-hadoop-mr-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-hive-sync-bundle/pom.xml b/packaging/hudi-hive-sync-bundle/pom.xml index 9b5e0e776255..cbd09150a3e3 100644 --- a/packaging/hudi-hive-sync-bundle/pom.xml +++ b/packaging/hudi-hive-sync-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-integ-test-bundle/pom.xml b/packaging/hudi-integ-test-bundle/pom.xml index bb2ecf93d287..767bd725dee4 100644 --- a/packaging/hudi-integ-test-bundle/pom.xml +++ b/packaging/hudi-integ-test-bundle/pom.xml @@ -17,7 +17,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-kafka-connect-bundle/pom.xml b/packaging/hudi-kafka-connect-bundle/pom.xml index f7c450eea0ef..47d25bc32f18 100644 --- a/packaging/hudi-kafka-connect-bundle/pom.xml +++ b/packaging/hudi-kafka-connect-bundle/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -108,6 +108,7 @@ <include>com.lmax:disruptor</include> <include>com.github.davidmoten:guava-mini</include> <include>com.github.davidmoten:hilbert-curve</include> + <include>com.github.ben-manes.caffeine:caffeine</include> <include>com.yammer.metrics:metrics-core</include> <include>com.beust:jcommander</include> <include>io.javalin:javalin</include> diff --git a/packaging/hudi-metaserver-server-bundle/pom.xml b/packaging/hudi-metaserver-server-bundle/pom.xml index 1de46a4dec04..8f3f98c07f2a 100644 --- a/packaging/hudi-metaserver-server-bundle/pom.xml +++ b/packaging/hudi-metaserver-server-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-presto-bundle/pom.xml b/packaging/hudi-presto-bundle/pom.xml index bfe62b699ab1..ba201566f72e 100644 --- a/packaging/hudi-presto-bundle/pom.xml +++ b/packaging/hudi-presto-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-spark-bundle/pom.xml b/packaging/hudi-spark-bundle/pom.xml index 7e8c7e4f17ec..4f3de46a9589 100644 --- a/packaging/hudi-spark-bundle/pom.xml +++ b/packaging/hudi-spark-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -92,7 +92,6 @@ <include>org.jetbrains.kotlin:*</include> <include>org.rocksdb:rocksdbjni</include> <include>org.antlr:stringtemplate</include> - <include>org.roaringbitmap:RoaringBitmap</include> <!-- Bundle Jackson JSR310 library since it is not present in spark 2.x. For spark 3.x this will bundle the same JSR310 version that is included in spark runtime --> <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</include> @@ -200,10 +199,6 @@ <pattern>org.openjdk.jol.</pattern> <shadedPattern>org.apache.hudi.org.openjdk.jol.</shadedPattern> </relocation> - <relocation> - <pattern>org.roaringbitmap.</pattern> - <shadedPattern>org.apache.hudi.org.roaringbitmap.</shadedPattern> - </relocation> <relocation> <pattern>com.uber.m3.</pattern> <shadedPattern>org.apache.hudi.com.uber.m3.</shadedPattern> diff --git a/packaging/hudi-timeline-server-bundle/pom.xml b/packaging/hudi-timeline-server-bundle/pom.xml index 9990c7149e54..6d4bd7d0d7e3 100644 --- a/packaging/hudi-timeline-server-bundle/pom.xml +++ b/packaging/hudi-timeline-server-bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/packaging/hudi-trino-bundle/pom.xml b/packaging/hudi-trino-bundle/pom.xml index a6161821ba41..36e27de892bc 100644 --- a/packaging/hudi-trino-bundle/pom.xml +++ b/packaging/hudi-trino-bundle/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -80,6 +80,7 @@ <include>org.apache.parquet:parquet-avro</include> <include>org.apache.avro:avro</include> + <include>com.github.ben-manes.caffeine:caffeine</include> <include>org.codehaus.jackson:*</include> <include>com.yammer.metrics:metrics-core</include> <include>com.google.guava:guava</include> diff --git a/packaging/hudi-utilities-bundle/pom.xml b/packaging/hudi-utilities-bundle/pom.xml index 821f39e5ea11..57953f741b55 100644 --- a/packaging/hudi-utilities-bundle/pom.xml +++ b/packaging/hudi-utilities-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -116,7 +116,6 @@ <include>org.rocksdb:rocksdbjni</include> <include>org.antlr:stringtemplate</include> <include>org.apache.parquet:parquet-avro</include> - <include>org.roaringbitmap:RoaringBitmap</include> <!-- Bundle Jackson JSR310 library since it is not present in spark 2.x. For spark 3.x this will bundle the same JSR310 version that is included in spark runtime --> <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</include> @@ -236,10 +235,6 @@ <pattern>com.google.protobuf.</pattern> <shadedPattern>org.apache.hudi.com.google.protobuf.</shadedPattern> </relocation> - <relocation> - <pattern>org.roaringbitmap.</pattern> - <shadedPattern>org.apache.hudi.org.roaringbitmap.</shadedPattern> - </relocation> <relocation> <pattern>com.uber.m3.</pattern> <shadedPattern>org.apache.hudi.com.uber.m3.</shadedPattern> diff --git a/packaging/hudi-utilities-slim-bundle/pom.xml b/packaging/hudi-utilities-slim-bundle/pom.xml index c2bfa50e497c..b47ad31ca95e 100644 --- a/packaging/hudi-utilities-slim-bundle/pom.xml +++ b/packaging/hudi-utilities-slim-bundle/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>hudi</artifactId> <groupId>org.apache.hudi</groupId> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 10798d9403e6..ee445c1b7f75 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.hudi</groupId> <artifactId>hudi</artifactId> <packaging>pom</packaging> - <version>0.15.0</version> + <version>0.15.0.1.adb-SNAPSHOT</version> <description>Apache Hudi brings stream style processing on big data</description> <url>https://github.com/apache/hudi</url> <name>Hudi</name> @@ -111,9 +111,9 @@ <glassfish.version>2.17</glassfish.version> <glassfish.el.version>3.0.1-b12</glassfish.el.version> <parquet.version>1.10.1</parquet.version> - <junit.jupiter.version>5.7.2</junit.jupiter.version> - <junit.vintage.version>5.7.2</junit.vintage.version> - <junit.platform.version>1.7.2</junit.platform.version> + <junit.jupiter.version>5.8.2</junit.jupiter.version> + <junit.vintage.version>5.8.2</junit.vintage.version> + <junit.platform.version>1.8.2</junit.platform.version> <mockito.jupiter.version>3.12.4</mockito.jupiter.version> <log4j2.version>2.17.2</log4j2.version> <slf4j.version>1.7.36</slf4j.version> @@ -130,7 +130,7 @@ <orc.spark.version>1.6.0</orc.spark.version> <orc.flink.version>1.5.6</orc.flink.version> <roaringbitmap.version>0.9.47</roaringbitmap.version> - <airlift.version>0.25</airlift.version> + <airlift.version>0.27</airlift.version> <tally.version>0.13.0</tally.version> <prometheus.version>0.8.0</prometheus.version> <aws.sdk.httpclient.version>4.5.13</aws.sdk.httpclient.version> @@ -140,7 +140,7 @@ <spark2.version>2.4.4</spark2.version> <spark3.version>3.5.1</spark3.version> <sparkbundle.version></sparkbundle.version> - <flink1.18.version>1.18.0</flink1.18.version> + <flink1.18.version>1.18.1</flink1.18.version> <flink1.17.version>1.17.1</flink1.17.version> <flink1.16.version>1.16.2</flink1.16.version> <flink1.15.version>1.15.1</flink1.15.version> @@ -166,8 +166,8 @@ <spark30.version>3.0.2</spark30.version> <spark31.version>3.1.3</spark31.version> <spark32.version>3.2.3</spark32.version> - <spark33.version>3.3.1</spark33.version> - <spark34.version>3.4.1</spark34.version> + <spark33.version>3.3.4</spark33.version> + <spark34.version>3.4.3</spark34.version> <spark35.version>3.5.1</spark35.version> <hudi.spark.module>hudi-spark3.2.x</hudi.spark.module> <!-- NOTE: Different Spark versions might require different number of shared @@ -185,13 +185,13 @@ <scala.version>${scala12.version}</scala.version> <scala.collection-compat.version>2.8.1</scala.collection-compat.version> <scala.binary.version>2.12</scala.binary.version> - <apache-rat-plugin.version>0.13</apache-rat-plugin.version> + <apache-rat-plugin.version>0.16.1</apache-rat-plugin.version> <scala-maven-plugin.version>3.3.1</scala-maven-plugin.version> <scalatest.spark_pre31.version>3.0.1</scalatest.spark_pre31.version> <scalatest.spark3.version>3.1.0</scalatest.spark3.version> <scalatest.version>${scalatest.spark3.version}</scalatest.version> <surefire-log4j.file>log4j2-surefire.properties</surefire-log4j.file> - <thrift.version>0.12.0</thrift.version> + <thrift.version>0.13.0</thrift.version> <javalin.version>4.6.7</javalin.version> <jetty.version>9.4.53.v20231009</jetty.version> <htrace.version>3.1.0-incubating</htrace.version> @@ -221,7 +221,7 @@ <zk-curator.version>2.7.1</zk-curator.version> <disruptor.version>3.4.2</disruptor.version> <antlr.version>4.8</antlr.version> - <aws.sdk.version>2.18.40</aws.sdk.version> + <aws.sdk.version>2.25.69</aws.sdk.version> <proto.version>3.21.7</proto.version> <protoc.version>3.21.5</protoc.version> <dynamodb.lockclient.version>1.2.0</dynamodb.lockclient.version> @@ -483,6 +483,8 @@ <include>org.apache.hbase.thirdparty:hbase-shaded-protobuf</include> <include>org.apache.hbase.thirdparty:hbase-unsafe</include> <include>org.apache.htrace:htrace-core4</include> + <!-- roaring bitmap --> + <include>org.roaringbitmap:RoaringBitmap</include> <!-- afterburner module for jackson performance --> <include>com.fasterxml.jackson.module:jackson-module-afterburner</include> <include>com.fasterxml.jackson.module:jackson-module-scala_${scala.binary.version}</include> @@ -583,6 +585,10 @@ <shadedPattern>org.apache.hudi.org.apache.hadoop.metrics2.util.MetricSampleQuantiles </shadedPattern> </relocation> + <relocation> + <pattern>org.roaringbitmap.</pattern> + <shadedPattern>org.apache.hudi.org.roaringbitmap.</shadedPattern> + </relocation> <relocation> <pattern>com.fasterxml.jackson.module</pattern> <shadedPattern>org.apache.hudi.com.fasterxml.jackson.module @@ -1834,6 +1840,17 @@ </repository> </repositories> + <distributionManagement> + <repository> + <id>releases</id> + <url>http://mvnrepo.alibaba-inc.com/mvn/releases</url> + </repository> + <snapshotRepository> + <id>snapshots</id> + <url>http://mvnrepo.alibaba-inc.com/mvn/snapshots</url> + </snapshotRepository> + </distributionManagement> + <profiles> <profile> <id>release</id>
