[BugFix] upgrade hudi-common and fix CVEs (backport #59501) (#60777)

Signed-off-by: yan zhang <dirtysalt1987@gmail.com>
Co-authored-by: yan zhang <dirtysalt1987@gmail.com>
This commit is contained in:
mergify[bot] 2025-07-10 07:41:28 +00:00 committed by GitHub
parent 3324d3c96f
commit ef8b514082
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 54 additions and 10 deletions

View File

@ -292,7 +292,7 @@ public class HudiTable extends Table implements HiveMetaStoreTable {
}
if (tableType == HudiTableType.MOR) {
tHudiTable.setInstant_time(lastInstant == null ? "" : lastInstant.getTimestamp());
tHudiTable.setInstant_time(lastInstant == null ? "" : lastInstant.getCompletionTime());
}
tHudiTable.setHive_column_names(hudiProperties.get(HUDI_TABLE_COLUMN_NAMES));

View File

@ -116,7 +116,7 @@ public class HudiRemoteFileIO implements RemoteFileIO {
return resultPartitions.put(pathKey, fileDescs).build();
}
Iterator<FileSlice> hoodieFileSliceIterator = hudiContext.fsView
.getLatestMergedFileSlicesBeforeOrOn(partitionName, hudiContext.lastInstant.getTimestamp()).iterator();
.getLatestMergedFileSlicesBeforeOrOn(partitionName, hudiContext.lastInstant.getCompletionTime()).iterator();
while (hoodieFileSliceIterator.hasNext()) {
FileSlice fileSlice = hoodieFileSliceIterator.next();
Optional<HoodieBaseFile> baseFile = fileSlice.getBaseFile().toJavaOptional();

View File

@ -52,7 +52,7 @@ under the License.
<hadoop.version>3.4.1</hadoop.version>
<gcs.connector.version>hadoop3-2.2.26</gcs.connector.version>
<skip.plugin>false</skip.plugin>
<hudi.version>0.15.0</hudi.version>
<hudi.version>1.0.2</hudi.version>
<hive-apache.version>3.1.2-22</hive-apache.version>
<dlf-metastore-client.version>0.2.14</dlf-metastore-client.version>
<sonar.organization>starrocks</sonar.organization>
@ -77,6 +77,12 @@ under the License.
<!-- hadoop-azure requires no more than jetty10+ -->
<!-- https://stackoverflow.com/questions/66713254/spark-wasb-and-jetty-11 -->
<jetty.version>9.4.57.v20241219</jetty.version>
<byteman.version>4.0.24</byteman.version>
<!-- azure native sdk -->
<azure.version>1.2.34</azure.version>
<fastutil.version>8.5.15</fastutil.version>
<commons-beanutils.version>1.11.0</commons-beanutils.version>
<hbase.version>2.6.2</hbase.version>
</properties>
<profiles>
@ -744,6 +750,12 @@ under the License.
</exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
@ -955,9 +967,37 @@ under the License.
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-jetty</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-netty</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-http</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hbase.thirdparty</groupId>
<artifactId>hbase-shaded-netty</artifactId>
</exclusion>
</exclusions>
</dependency>

View File

@ -13,7 +13,7 @@
<properties>
<java-extensions.home>${basedir}/../</java-extensions.home>
<hudi.version>0.15.0</hudi.version>
<hudi.version>1.0.2</hudi.version>
</properties>
<dependencies>

View File

@ -60,6 +60,7 @@
<avro.version>1.11.4</avro.version>
<luben.zstd.jni.version>1.5.4-2</luben.zstd.jni.version>
<kryo.version>4.0.2</kryo.version>
<commons-beanutils.version>1.11.0</commons-beanutils.version>
</properties>
<dependencyManagement>
@ -162,6 +163,13 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-client</artifactId>

View File

@ -8,10 +8,6 @@ scan:
skip-files:
# hdfs required
- "**/hadoop-client-runtime-3.4.1.jar"
# hudi required
- "**/htrace-core4-4.2.0-incubating.jar"
- "**/hbase-protocol-shaded-2.4.13.jar"
- "**/hbase-shaded-netty-4.1.1.jar"
# kudu required
- "**/kudu-client-1.17.1.jar"
# paimon required