Skip to content

Commit 91fb8ab

Browse files
liferoadAmar3tto
andauthored
upgrade org.apache.parquet:parquet-avro to to 1.15.2 (#35037)
* upgrade org.apache.parquet:parquet-avro to to 1.15.2 * keep iceberg to 1.6.1 * use 1.9.0 for iceberg * run all iceberg tests * require Java 11 * fixed java11 for iceberg * switched back to iceberg_version = "1.6.1" * merged master --------- Co-authored-by: Vitaly Terentyev <vitaly.terentyev.akv@gmail.com>
1 parent ef7afaf commit 91fb8ab

9 files changed

Lines changed: 19 additions & 10 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
3-
"modification": 1
3+
"modification": 6
44
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
3-
"modification": 2,
3+
"modification": 3,
44
"https://github.com/apache/beam/pull/35159": "moving WindowedValue and making an interface"
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
3-
"modification": 1
3+
"modification": 3
44
}

it/google-cloud-platform/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ dependencies {
4747
implementation library.java.jackson_databind
4848
implementation 'org.apache.hadoop:hadoop-common:3.3.5'
4949
implementation 'org.apache.avro:avro:1.11.1'
50-
implementation 'org.apache.parquet:parquet-avro:1.12.0'
51-
implementation 'org.apache.parquet:parquet-common:1.12.0'
52-
implementation 'org.apache.parquet:parquet-hadoop:1.12.0'
50+
implementation 'org.apache.parquet:parquet-avro:1.15.2'
51+
implementation 'org.apache.parquet:parquet-common:1.15.2'
52+
implementation 'org.apache.parquet:parquet-hadoop:1.15.2'
5353
implementation 'org.apache.commons:commons-lang3:3.9'
5454
implementation library.java.gax
5555
implementation library.java.google_api_common

sdks/java/io/expansion-service/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ configurations.runtimeClasspath {
3636
// Pin avro to 1.11.4 due to https://github.com/apache/beam/issues/34968
3737
// cannot upgrade this to the latest version due to https://github.com/apache/beam/issues/34993
3838
resolutionStrategy.force 'org.apache.avro:avro:1.11.4'
39+
// force parquet-avro:1.15.2 to fix CVE-2025-46762
40+
resolutionStrategy.force 'org.apache.parquet:parquet-avro:1.15.2'
3941

4042
// Pin Jetty version due to hadoop 3.4.1 using 9.4.53.v20231009, which had
4143
// two direct vulnerabilities. There is one dependency vulnerability left

sdks/java/io/file-schema-transform/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ configurations.implementation {
3232
}
3333
}
3434

35-
def parquet_version = "1.15.1"
35+
def parquet_version = "1.15.2"
3636

3737
dependencies {
3838
implementation library.java.avro

sdks/java/io/iceberg/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ def hadoopVersions = [
3737

3838
hadoopVersions.each {kv -> configurations.create("hadoopVersion$kv.key")}
3939

40+
// we cannot upgrade this since the newer iceberg requires Java 11
41+
// many other modules like examples/expansion use Java 8 and have the iceberg dependency
42+
// def iceberg_version = "1.9.0"
4043
def iceberg_version = "1.6.1"
41-
def parquet_version = "1.15.1"
44+
def parquet_version = "1.15.2"
4245
def orc_version = "1.9.2"
4346
def hive_version = "3.1.3"
4447

sdks/java/io/iceberg/src/main/java/org/apache/beam/sdk/io/iceberg/IcebergUtils.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@ private static Schema.FieldType icebergTypeToBeamFieldType(final Type type) {
111111
return Schema.FieldType.map(
112112
icebergTypeToBeamFieldType(type.asMapType().keyType()),
113113
icebergTypeToBeamFieldType(type.asMapType().valueType()));
114+
default:
115+
throw new RuntimeException("Unrecognized Iceberg Type: " + type.typeId());
114116
}
115-
throw new RuntimeException("Unrecognized IcebergIO Type");
116117
}
117118

118119
private static Schema.Field icebergFieldToBeamField(final Types.NestedField field) {
@@ -379,6 +380,9 @@ private static void copyFieldIntoRecord(Record rec, Types.NestedField field, Row
379380
}
380381
Optional.ofNullable(icebergMap).ifPresent(v -> rec.setField(name, v));
381382
break;
383+
default:
384+
// Do nothing for unsupported types
385+
break;
382386
}
383387
}
384388

sdks/java/io/parquet/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def hadoopVersions = [
3535

3636
hadoopVersions.each {kv -> configurations.create("hadoopVersion$kv.key")}
3737

38-
def parquet_version = "1.15.1"
38+
def parquet_version = "1.15.2"
3939

4040
dependencies {
4141
implementation library.java.vendored_guava_32_1_2_jre

0 commit comments

Comments
 (0)