From bf0f46fbf1ab81b3302acf0733e9f88767f8274a Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Fri, 31 May 2024 22:43:17 -0400 Subject: [PATCH 1/3] Bump Jackson databind to 2.15 --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +- sdks/java/io/hadoop-format/build.gradle | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 78a6b371e6f0..e54946456d4e 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -617,7 +617,7 @@ class BeamModulePlugin implements Plugin { def influxdb_version = "2.19" def httpclient_version = "4.5.13" def httpcore_version = "4.4.14" - def jackson_version = "2.14.1" + def jackson_version = "2.15.4" def jaxb_api_version = "2.3.3" def jsr305_version = "3.0.2" def everit_json_version = "1.14.2" diff --git a/sdks/java/io/hadoop-format/build.gradle b/sdks/java/io/hadoop-format/build.gradle index fe2a04988808..0ce251101d04 100644 --- a/sdks/java/io/hadoop-format/build.gradle +++ b/sdks/java/io/hadoop-format/build.gradle @@ -88,6 +88,12 @@ dependencies { testImplementation library.java.cassandra_driver_mapping // TODO(yathu) bump to cassandra-5.x which uses newer jamm when released & beam runs test on Java11 testImplementation "org.apache.cassandra:cassandra-all:3.11.10" + // Pin snakeyaml version due to cassandra-all not support 2.x + testImplementation ("org.yaml:snakeyaml") { + version { + strictly '1.33' + } + } testImplementation library.java.hadoop_common testImplementation library.java.hadoop_hdfs testImplementation library.java.hadoop_mapreduce_client_core From 42f911e178660b6a3bab92e32be6d85143e87f04 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Sat, 1 Jun 2024 11:44:26 -0400 Subject: [PATCH 2/3] Fix unncessary test dependency --- sdks/java/io/cdap/build.gradle | 2 -- sdks/java/io/hadoop-format/build.gradle | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sdks/java/io/cdap/build.gradle b/sdks/java/io/cdap/build.gradle index cda4896a37ca..ae701448fd67 100644 --- a/sdks/java/io/cdap/build.gradle +++ b/sdks/java/io/cdap/build.gradle @@ -70,8 +70,6 @@ dependencies { testImplementation library.java.mockito_core testImplementation library.java.testcontainers_postgresql testImplementation project(path: ":sdks:java:extensions:avro", configuration: "testRuntimeMigration") - testImplementation project(path: ":sdks:java:io:hadoop-common", configuration: "testRuntimeMigration") - testImplementation project(path: ":sdks:java:io:hadoop-format", configuration: "testRuntimeMigration") testImplementation project(path: ":sdks:java:testing:test-utils", configuration: "testRuntimeMigration") testImplementation project(path: ":runners:direct-java", configuration: "shadow") testImplementation project(path: ":sdks:java:io:common", configuration: "testRuntimeMigration") diff --git a/sdks/java/io/hadoop-format/build.gradle b/sdks/java/io/hadoop-format/build.gradle index 0ce251101d04..24e23f39aa0b 100644 --- a/sdks/java/io/hadoop-format/build.gradle +++ b/sdks/java/io/hadoop-format/build.gradle @@ -91,7 +91,7 @@ dependencies { // Pin snakeyaml version due to cassandra-all not support 2.x testImplementation ("org.yaml:snakeyaml") { version { - strictly '1.33' + strictly '[1,1.34[' } } testImplementation library.java.hadoop_common From 97b60b875aa506616d627f40962f9da196f761ce Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Sat, 1 Jun 2024 12:12:23 -0400 Subject: [PATCH 3/3] Fix license check --- sdks/java/container/license_scripts/dep_urls_java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/container/license_scripts/dep_urls_java.yaml b/sdks/java/container/license_scripts/dep_urls_java.yaml index c3a3fd2708f2..e0b78f209b00 100644 --- a/sdks/java/container/license_scripts/dep_urls_java.yaml +++ b/sdks/java/container/license_scripts/dep_urls_java.yaml @@ -58,7 +58,7 @@ xz: '1.5': # The original repo is down. This license is taken from https://tukaani.org/xz/java.html. license: "file://{}/xz/COPYING" jackson-bom: - '2.14.1': + '2.15.4': license: "https://raw.githubusercontent.com/FasterXML/jackson-bom/master/LICENSE" type: "Apache License 2.0" junit-dep: