Skip to content
Merged
2 changes: 1 addition & 1 deletion .github/trigger_files/IO_Iceberg_Integration_Tests.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run.",
"modification": 1
"modification": 6
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run.",
"modification": 2,
"modification": 3,
"https://github.com/apache/beam/pull/35159": "moving WindowedValue and making an interface"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run.",
"modification": 1
"modification": 3
}
6 changes: 3 additions & 3 deletions it/google-cloud-platform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ dependencies {
implementation library.java.jackson_databind
implementation 'org.apache.hadoop:hadoop-common:3.3.5'
implementation 'org.apache.avro:avro:1.11.1'
implementation 'org.apache.parquet:parquet-avro:1.12.0'
implementation 'org.apache.parquet:parquet-common:1.12.0'
implementation 'org.apache.parquet:parquet-hadoop:1.12.0'
implementation 'org.apache.parquet:parquet-avro:1.15.2'
implementation 'org.apache.parquet:parquet-common:1.15.2'
implementation 'org.apache.parquet:parquet-hadoop:1.15.2'
implementation 'org.apache.commons:commons-lang3:3.9'
implementation library.java.gax
implementation library.java.google_api_common
Expand Down
2 changes: 2 additions & 0 deletions sdks/java/io/expansion-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ configurations.runtimeClasspath {
// Pin avro to 1.11.4 due to https://github.com/apache/beam/issues/34968
// cannot upgrade this to the latest version due to https://github.com/apache/beam/issues/34993
resolutionStrategy.force 'org.apache.avro:avro:1.11.4'
// force parquet-avro:1.15.2 to fix CVE-2025-46762
resolutionStrategy.force 'org.apache.parquet:parquet-avro:1.15.2'

// Pin Jetty version due to hadoop 3.4.1 using 9.4.53.v20231009, which had
// two direct vulnerabilities. There is one dependency vulnerability left
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/io/file-schema-transform/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ configurations.implementation {
}
}

def parquet_version = "1.15.1"
def parquet_version = "1.15.2"

dependencies {
implementation library.java.avro
Expand Down
5 changes: 4 additions & 1 deletion sdks/java/io/iceberg/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,11 @@ def hadoopVersions = [

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

// we cannot upgrade this since the newer iceberg requires Java 11
// many other modules like examples/expansion use Java 8 and have the iceberg dependency
// def iceberg_version = "1.9.0"
def iceberg_version = "1.6.1"
def parquet_version = "1.15.1"
def parquet_version = "1.15.2"
def orc_version = "1.9.2"
def hive_version = "3.1.3"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,9 @@ private static Schema.FieldType icebergTypeToBeamFieldType(final Type type) {
return Schema.FieldType.map(
icebergTypeToBeamFieldType(type.asMapType().keyType()),
icebergTypeToBeamFieldType(type.asMapType().valueType()));
default:
throw new RuntimeException("Unrecognized Iceberg Type: " + type.typeId());
}
throw new RuntimeException("Unrecognized IcebergIO Type");
}

private static Schema.Field icebergFieldToBeamField(final Types.NestedField field) {
Expand Down Expand Up @@ -379,6 +380,9 @@ private static void copyFieldIntoRecord(Record rec, Types.NestedField field, Row
}
Optional.ofNullable(icebergMap).ifPresent(v -> rec.setField(name, v));
break;
default:
// Do nothing for unsupported types
break;
}
}

Expand Down
2 changes: 1 addition & 1 deletion sdks/java/io/parquet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def hadoopVersions = [

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

def parquet_version = "1.15.1"
def parquet_version = "1.15.2"

dependencies {
implementation library.java.vendored_guava_32_1_2_jre
Expand Down
Loading