Bump Jackson databind to 2.15 (apache#31473)

* Bump Jackson databind to 2.15 * Fix unncessary test dependency * Fix license check
christogav · Jun 2, 2024 · fa4ead9 · fa4ead9
1 parent 51525d3
commit fa4ead9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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<Project> {
     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/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:

diff --git 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
@@ -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,1.34['
+    }
+  }
   testImplementation library.java.hadoop_common
   testImplementation library.java.hadoop_hdfs
   testImplementation library.java.hadoop_mapreduce_client_core