From b418efb146725bce0869608d8784152e48ee2837 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Wed, 1 May 2024 20:45:51 +0900 Subject: [PATCH] Upgrade Jackson to 2.16.2 --- build.gradle | 20 +++++++++------- gradle.lockfile | 15 ++++++++++++ gradle/libs.versions.toml | 50 +++++++++++++++++++++++++++++++++++++++ settings-gradle.lockfile | 4 ++++ 4 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 gradle.lockfile create mode 100644 gradle/libs.versions.toml create mode 100644 settings-gradle.lockfile diff --git a/build.gradle b/build.gradle index 4af5d7a..bd68585 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id "java" id "maven-publish" id "signing" - id "org.embulk.embulk-plugins" version "0.7.0" + alias(libs.plugins.gradle.embulk.plugins) } repositories { mavenCentral() @@ -32,14 +32,16 @@ java { } dependencies { - compileOnly "org.embulk:embulk-spi:0.11" - implementation "org.embulk:embulk-util-config:0.5.0" - implementation "org.embulk:embulk-util-file:0.2.0" - - testImplementation "junit:junit:4.13.2" - testImplementation "org.embulk:embulk-core:0.11.3" - testImplementation "org.embulk:embulk-deps:0.11.3" - testImplementation "org.embulk:embulk-junit4:0.11.3" + compileOnly libs.embulk.spi + implementation libs.embulk.util.config + implementation libs.embulk.util.file + implementation platform(libs.jackson.bom) + implementation libs.bundles.jackson + + testImplementation libs.junit4 + testImplementation libs.embulk.core + testImplementation libs.embulk.deps + testImplementation libs.embulk.junit4 } embulkPlugin { diff --git a/gradle.lockfile b/gradle.lockfile new file mode 100644 index 0000000..e64d8de --- /dev/null +++ b/gradle.lockfile @@ -0,0 +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.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 +org.embulk:embulk-util-file:0.2.0=compileClasspath,runtimeClasspath +org.msgpack:msgpack-core:0.8.24=compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath +empty= diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..3c3af74 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,50 @@ +[versions] + +gradle-embulk-plugins = "0.7.0" + +embulk-core = "0.11.3" +embulk-spi = "0.11" +embulk-util-config = "0.5.0" +embulk-util-file = "0.2.0" + +slf4j-api = "2.0.7" + +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" + + +junit4 = "4.13.2" + +[libraries] + +embulk-core = { group = "org.embulk", name = "embulk-core", version.ref = "embulk-core" } +embulk-deps = { group = "org.embulk", name = "embulk-deps", version.ref = "embulk-core" } +embulk-junit4 = { group = "org.embulk", name = "embulk-junit4", version.ref = "embulk-core" } +embulk-spi = { group = "org.embulk", name = "embulk-spi", version.ref = "embulk-spi" } +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" } +jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations" } +jackson-bom = { group = "com.fasterxml.jackson", name = "jackson-bom", version.ref = "jackson" } +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" } +slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-api" } +validation = { group = "javax.validation", name = "validation-api", version.ref = "validation-api" } + +[bundles] + +jackson = [ + "jackson-annotations", + "jackson-core", + "jackson-databind", + "jackson-datatype-jdk8", +] + +[plugins] + +gradle-embulk-plugins = { id = "org.embulk.embulk-plugins", version.ref = "gradle-embulk-plugins" } diff --git a/settings-gradle.lockfile b/settings-gradle.lockfile new file mode 100644 index 0000000..709a43f --- /dev/null +++ b/settings-gradle.lockfile @@ -0,0 +1,4 @@ +# 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. +empty=incomingCatalogForLibs0