From 70ab6b6231278680036a57573aab63bd3e0443dd Mon Sep 17 00:00:00 2001 From: Dai MIKURUBE Date: Fri, 26 Apr 2024 17:16:10 +0900 Subject: [PATCH 1/2] Upgrade Jackson to 2.16.2, embulk-util-config to 0.5.0, and embulk-util-json to 0.4.0 --- build.gradle | 1 + embulk-guess-json/gradle.lockfile | 15 ++++++++------- gradle.lockfile | 15 ++++++++------- gradle/libs.versions.toml | 21 ++++++++++++--------- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index fc74a235..6e16cbcc 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation libs.embulk.util.config implementation libs.validation + implementation platform(libs.jackson.bom) implementation libs.bundles.jackson implementation libs.embulk.util.file diff --git a/embulk-guess-json/gradle.lockfile b/embulk-guess-json/gradle.lockfile index ddfd0402..f5a0700b 100644 --- a/embulk-guess-json/gradle.lockfile +++ b/embulk-guess-json/gradle.lockfile @@ -1,15 +1,16 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath -javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.4=compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath +javax.validation:validation-api:2.0.1.Final=compileClasspath,runtimeClasspath org.embulk:embulk-spi:0.11=compileClasspath -org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath +org.embulk:embulk-util-config:0.5.0=compileClasspath,runtimeClasspath org.embulk:embulk-util-file:0.1.5=compileClasspath,runtimeClasspath -org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath +org.embulk:embulk-util-json:0.4.0=compileClasspath,runtimeClasspath org.msgpack:msgpack-core:0.8.24=compileClasspath org.slf4j:slf4j-api:2.0.7=compileClasspath empty= diff --git a/gradle.lockfile b/gradle.lockfile index 8829b64a..c76d81c0 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -1,15 +1,16 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath -javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.16.2=compileClasspath,runtimeClasspath +javax.validation:validation-api:2.0.1.Final=compileClasspath,runtimeClasspath org.embulk:embulk-spi:0.11=compileClasspath -org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath +org.embulk:embulk-util-config:0.5.0=compileClasspath,runtimeClasspath org.embulk:embulk-util-file:0.1.5=compileClasspath,runtimeClasspath -org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath +org.embulk:embulk-util-json:0.4.0=compileClasspath,runtimeClasspath org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath org.msgpack:msgpack-core:0.8.24=compileClasspath diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 78193dc5..2503f77d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,14 +5,16 @@ gradle-embulk-plugins = "0.7.0" embulk-spi = "0.11" slf4j-api = "2.0.7" -embulk-util-config = "0.3.4" -validation-api = "1.1.0.Final" +embulk-util-config = "0.5.0" +validation-api = "2.0.1.Final" -jackson = "2.6.7" -jackson-databind = "2.6.7.5" +# See https://github.com/FasterXML/jackson/wiki/Jackson-Releases for Jackson versions. +# +# We choose Jackson with the latest patch release of the latest open branch. +jackson = "2.16.2" embulk-util-file = "0.1.5" -embulk-util-json = "0.3.0" +embulk-util-json = "0.4.0" embulk-util-timestamp = "0.2.2" junit4 = "4.13.2" @@ -27,10 +29,11 @@ embulk-util-file = { group = "org.embulk", name = "embulk-util-file", version.re embulk-util-json = { group = "org.embulk", name = "embulk-util-json", version.ref = "embulk-util-json" } embulk-util-timestamp = { group = "org.embulk", name = "embulk-util-timestamp", version.ref = "embulk-util-timestamp" } validation = { group = "javax.validation", name = "validation-api", version.ref = "validation-api" } -jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" } -jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "jackson" } -jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson-databind" } -jackson-datatype-jdk8 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jdk8", version.ref = "jackson" } +jackson-bom = { group = "com.fasterxml.jackson", name = "jackson-bom", version.ref = "jackson" } +jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations" } +jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core" } +jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind" } +jackson-datatype-jdk8 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jdk8" } junit4 = { group = "junit", name = "junit", version.ref = "junit4" } embulk-core = { group = "org.embulk", name = "embulk-core", version.ref = "embulk-core" } embulk-deps = { group = "org.embulk", name = "embulk-deps", version.ref = "embulk-core" } From e74bbee9eaf78ef3a57b50a2d03de39d1cf5afc0 Mon Sep 17 00:00:00 2001 From: Dai MIKURUBE Date: Sat, 27 Apr 2024 23:39:57 +0900 Subject: [PATCH 2/2] Depend on Jackson BOM from embulk-guess-json --- embulk-guess-json/build.gradle | 1 + embulk-guess-json/gradle.lockfile | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/embulk-guess-json/build.gradle b/embulk-guess-json/build.gradle index 2aac0223..e86b0a86 100644 --- a/embulk-guess-json/build.gradle +++ b/embulk-guess-json/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation libs.embulk.util.config implementation libs.validation + implementation platform(libs.jackson.bom) implementation libs.bundles.jackson implementation libs.embulk.util.file diff --git a/embulk-guess-json/gradle.lockfile b/embulk-guess-json/gradle.lockfile index f5a0700b..42c0e9eb 100644 --- a/embulk-guess-json/gradle.lockfile +++ b/embulk-guess-json/gradle.lockfile @@ -1,11 +1,11 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.4=compileClasspath,runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.16.2=compileClasspath,runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.16.2=compileClasspath,runtimeClasspath javax.validation:validation-api:2.0.1.Final=compileClasspath,runtimeClasspath org.embulk:embulk-spi:0.11=compileClasspath org.embulk:embulk-util-config:0.5.0=compileClasspath,runtimeClasspath