Skip to content

Upgrade embulk-util-config to 0.5.0 along with Jackson to 2.15.4 #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmikurube merged 1 commit into from
Feb 17, 2025
Merged

Upgrade embulk-util-config to 0.5.0 along with Jackson to 2.15.4 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,7 @@ dependencies {
compileOnly libs.embulk.spi
compileOnly libs.slf4j

implementation(libs.embulk.util.config) {
// Conflict with Embulk Core
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
exclude group: 'com.fasterxml.jackson.datatype', module: 'jackson-datatype-jdk8'
exclude group: 'javax.validation', module: 'validation-api'
}

// embulk-input-gcs:0.3.2 and earlier have been working with containing jackson-core:2.9.6 (no other Jackson sublibrarires)
// while embulk-core has had jackson-core/annotations/databind 2.6.7. Safer to have the combat-tested version as of now.
//
// It (and other Jackson sublibraries) will be replaced with the latest Jackson after Embulk v0.10.32 and later get popular.
implementation libs.jackson.core

implementation libs.jackson.annotations
implementation libs.jackson.databind
implementation libs.jackson.datatype.jdk8
implementation libs.validation

implementation libs.embulk.util.config
implementation libs.embulk.util.file
implementation(libs.embulk.util.retryhelper) {
exclude group: "org.slf4j", module: "slf4j-api"
Expand Down
13 changes: 7 additions & 6 deletions gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +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.6.7=compileClasspath,runtimeClasspath
com.fasterxml.jackson.core:jackson-core:2.9.6=compileClasspath,runtimeClasspath
com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=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
com.google.api-client:google-api-client:1.27.0=compileClasspath,runtimeClasspath
com.google.api.grpc:proto-google-common-protos:1.12.0=compileClasspath,runtimeClasspath
com.google.api.grpc:proto-google-iam-v1:0.12.0=compileClasspath,runtimeClasspath
Expand Down Expand Up @@ -33,14 +34,14 @@ io.grpc:grpc-context:1.12.0=compileClasspath,runtimeClasspath
io.opencensus:opencensus-api:0.15.0=compileClasspath,runtimeClasspath
io.opencensus:opencensus-contrib-http-util:0.15.0=compileClasspath,runtimeClasspath
javax.annotation:javax.annotation-api:1.2=compileClasspath,runtimeClasspath
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
javax.validation:validation-api:2.0.1.Final=compileClasspath,runtimeClasspath
joda-time:joda-time:2.9.2=compileClasspath,runtimeClasspath
org.apache.httpcomponents:httpclient:4.5.5=compileClasspath,runtimeClasspath
org.apache.httpcomponents:httpcore:4.4.9=compileClasspath,runtimeClasspath
org.checkerframework:checker-compat-qual:2.5.2=compileClasspath,runtimeClasspath
org.codehaus.mojo:animal-sniffer-annotations:1.14=compileClasspath,runtimeClasspath
org.embulk:embulk-spi:0.11=compileClasspath
org.embulk:embulk-util-config:0.3.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-config:0.5.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-file:0.1.3=compileClasspath,runtimeClasspath
org.embulk:embulk-util-retryhelper:0.8.1=compileClasspath,runtimeClasspath
org.msgpack:msgpack-core:0.8.24=compileClasspath
Expand Down
9 changes: 1 addition & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ gradle-embulk-plugins = "0.7.0"
embulk-spi = "0.11"
slf4j-api = "2.0.7"

embulk-util-config = "0.3.0"
validation-api = "1.1.0.Final"

embulk-util-config = "0.5.0"
embulk-util-file = "0.1.3"
embulk-util-retryhelper = "0.8.1"

Expand All @@ -32,11 +30,6 @@ 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" }
embulk-util-retryhelper = { group = "org.embulk", name = "embulk-util-retryhelper", version.ref = "embulk-util-retryhelper" }
validation = { group = "javax.validation", name = "validation-api", version.ref = "validation-api" }
jackson-annotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version = "2.6.7" }
jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version = "2.9.6" }
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.6.7" }
jackson-datatype-jdk8 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jdk8", version = "2.6.7" }
google-cloud-storage = { group = "com.google.cloud", name = "google-cloud-storage", version.ref = "google-cloud-storage" }
jcl-over-slf4j = { group = "org.slf4j", name = "jcl-over-slf4j", version.ref = "jcl-over-slf4j" }
junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
Expand Down
Loading