You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by yh...@apache.org on 2024/06/02 00:50:45 UTC
(beam) branch master updated: Bump Jackson databind to 2.15 (#31473)
This is an automated email from the ASF dual-hosted git repository.
yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new fa4ead99a6b Bump Jackson databind to 2.15 (#31473)
fa4ead99a6b is described below
commit fa4ead99a6b2cd5b50f9efed99016c215061e2d4
Author: Yi Hu <ya...@google.com>
AuthorDate: Sat Jun 1 20:50:39 2024 -0400
Bump Jackson databind to 2.15 (#31473)
* Bump Jackson databind to 2.15
* Fix unncessary test dependency
* Fix license check
---
.../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +-
sdks/java/container/license_scripts/dep_urls_java.yaml | 2 +-
sdks/java/io/cdap/build.gradle | 2 --
sdks/java/io/hadoop-format/build.gradle | 6 ++++++
4 files changed, 8 insertions(+), 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
index 78a6b371e6f..e54946456d4 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<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
index c3a3fd2708f..e0b78f209b0 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:
diff --git a/sdks/java/io/cdap/build.gradle b/sdks/java/io/cdap/build.gradle
index cda4896a37c..ae701448fd6 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 fe2a0498880..24e23f39aa0 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,1.34['
+ }
+ }
testImplementation library.java.hadoop_common
testImplementation library.java.hadoop_hdfs
testImplementation library.java.hadoop_mapreduce_client_core