Merge pull request #7 from embulk/upgrade-util-config-0.5.0

Upgrade embulk-util-config to 0.5.0 along with the Bean Validation API and Jackson
embulk · Apr 11, 2024 · 237799a · 237799a
2 parents 3b1975d + 45f408b
commit 237799a
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git 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-bzip2/build.gradle b/embulk-guess-bzip2/build.gradle
@@ -39,6 +39,7 @@ dependencies {
 
     implementation libs.embulk.util.config
     implementation libs.validation
+    implementation platform(libs.jackson.bom)
     implementation libs.bundles.jackson
 }
 

diff --git a/embulk-guess-bzip2/gradle.lockfile b/embulk-guess-bzip2/gradle.lockfile
@@ -1,13 +1,14 @@
 # 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.msgpack:msgpack-core:0.8.24=compileClasspath
 org.slf4j:slf4j-api:2.0.7=compileClasspath
 empty=
diff --git a/gradle.lockfile b/gradle.lockfile
@@ -1,14 +1,15 @@
 # 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.apache.commons:commons-compress:1.10=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.msgpack:msgpack-core:0.8.24=compileClasspath
 org.slf4j:slf4j-api:2.0.7=compileClasspath

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,10 +5,13 @@ 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"
-jackson = "2.6.7"
-jackson-databind = "2.6.7.5"
+embulk-util-config = "0.5.0"
+validation-api = "2.0.1.Final"
+
+# 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"
 
@@ -21,10 +24,11 @@ slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" }
 embulk-util-config = { group = "org.embulk", name = "embulk-util-config", version.ref = "embulk-util-config" }
 embulk-util-file = { group = "org.embulk", name = "embulk-util-file", version.ref = "embulk-util-file" }
 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" }
 commons-compress = { group = "org.apache.commons", name = "commons-compress", version.ref = "commons-compress" }
 
 [bundles]