Skip to content

Commit

Permalink
Bump slf4j-api to 2.0.13, and Logback to 1.3.14
Browse files Browse the repository at this point in the history
  • Loading branch information
dmikurube committed May 22, 2024
1 parent 7eeba32 commit 68b5d1b
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 16 deletions.
12 changes: 10 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,25 @@ dependencies {
// The classes of "embulk-spi" are excluded from "embulk-core" below for the consistency as a JAR file.
// But, they should be included in the compile classpath.
compileOnly "org.embulk:embulk-spi:0.11"
compileOnly "org.slf4j:slf4j-api:2.0.13"
compileOnly "org.msgpack:msgpack-core:0.8.24"

implementation(project(":embulk-core")) {
// The JAR file of "embulk-core" should already contain classes of "embulk-spi".
exclude group: "org.embulk", module: "embulk-spi"
}

// Logback 1.4.x seems to be the latest as of Feb, 2023. But actually, their version strategy is:
// Logback 1.5.x seems to be the latest as of May, 2024, but we use the Logback 1.3.x as of now because
// Logback 1.5.x requires JDK 11. It also expects Jakarta EE (jakarta.*), not Java EE (javax.*).
// https://logback.qos.ch/download.html
//
// Embulk still needs to work on JDK 8 for a while.
//
// Logback 1.3.x and 1.4.x are both older stable versions, but still a kind of maintained. Their version strategy is:
// * Logback 1.3.x for Java 8 and Java EE (javax.*)
// * Logback 1.4.x for Java 11 and Jakarta EE (jakarta.*)
// https://logback.qos.ch/dependencies.html
implementation "ch.qos.logback:logback-classic:1.3.6"
implementation "ch.qos.logback:logback-classic:1.3.14"

deps project(":embulk-deps")

Expand Down
4 changes: 2 additions & 2 deletions embulk-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies {
// especially after "embulk-spi" goes out for another Git repository. Note that "embulk-core"
// may need to have newer versions of "slf4j-api" or "msgpack-core" before updating them in
// "embulk-spi".
implementation "org.slf4j:slf4j-api:2.0.7"
implementation "org.slf4j:slf4j-api:2.0.13"
implementation "org.msgpack:msgpack-core:0.8.24"

// This "embulk-core" should not have any more library dependencies.
Expand All @@ -67,7 +67,7 @@ dependencies {

testImplementation "junit:junit:4.13.2"
testImplementation project(":embulk-junit4")
testImplementation "ch.qos.logback:logback-classic:1.3.6"
testImplementation "ch.qos.logback:logback-classic:1.3.14"

// TODO: Remove this, and load it with EmbulkDependencyClassLoader.
// This statement gets it loaded by the top-level ClassLoader.
Expand Down
2 changes: 1 addition & 1 deletion embulk-core/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# This file is expected to be part of source control.
org.embulk:embulk-spi:0.11=compileClasspath,runtimeClasspath,spi
org.msgpack:msgpack-core:0.8.24=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions embulk-deps/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ java {

dependencies {
compileOnly project(":embulk-core")
compileOnly "org.slf4j:slf4j-api:2.0.7"
compileOnly "org.slf4j:slf4j-api:2.0.13"
compileOnly "org.msgpack:msgpack-core:0.8.24"

// Use the same "jcl-over-slf4j" version with slf4f-api.
// "maven-resolver-transport-http(:1.9.16)" needs "org.slf4j:jcl-over-slf4j(:1.7.36)".
api("org.slf4j:jcl-over-slf4j:2.0.7") {
// "maven-resolver-transport-http(:1.9.20)" needs "org.slf4j:jcl-over-slf4j(:1.7.36)".
api("org.slf4j:jcl-over-slf4j:2.0.13") {
exclude group: "org.slf4j", module: "slf4j-api"
}

Expand Down Expand Up @@ -98,7 +98,7 @@ dependencies {
testImplementation project(":embulk-core")
testImplementation project(":embulk-junit4")
testImplementation "junit:junit:4.13.2"
testImplementation "org.slf4j:slf4j-simple:2.0.7"
testImplementation "org.slf4j:slf4j-simple:2.0.13"
}

javadoc {
Expand Down
4 changes: 2 additions & 2 deletions embulk-deps/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ org.eclipse.sisu:org.eclipse.sisu.inject:0.9.0.M2=compileClasspath,runtimeClassp
org.embulk:embulk-util-rubytime:0.4.0=compileClasspath,runtimeClasspath
org.embulk:embulk-util-timestamp:0.3.0=compileClasspath,runtimeClasspath
org.msgpack:msgpack-core:0.8.24=compileClasspath
org.slf4j:jcl-over-slf4j:2.0.7=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:2.0.7=compileClasspath
org.slf4j:jcl-over-slf4j:2.0.13=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:2.0.13=compileClasspath
org.yaml:snakeyaml:2.2=compileClasspath,runtimeClasspath
empty=
2 changes: 2 additions & 0 deletions embulk-junit4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ java {

dependencies {
compileOnly "org.embulk:embulk-spi:0.11"
compileOnly "org.slf4j:slf4j-api:2.0.13"
compileOnly "org.msgpack:msgpack-core:0.8.24"

api "junit:junit:4.13.2"
api "org.hamcrest:hamcrest-library:1.3"
Expand Down
2 changes: 1 addition & 1 deletion embulk-junit4/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ org.embulk:embulk-spi:0.11=compileClasspath,runtimeClasspath
org.hamcrest:hamcrest-core:1.3=compileClasspath,runtimeClasspath
org.hamcrest:hamcrest-library:1.3=compileClasspath,runtimeClasspath
org.msgpack:msgpack-core:0.8.24=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath
empty=
8 changes: 4 additions & 4 deletions gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 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.
ch.qos.logback:logback-classic:1.3.6=compileClasspath,runtimeClasspath
ch.qos.logback:logback-core:1.3.6=compileClasspath,runtimeClasspath
ch.qos.logback:logback-classic:1.3.14=compileClasspath,runtimeClasspath
ch.qos.logback:logback-core:1.3.14=compileClasspath,runtimeClasspath
com.fasterxml.jackson.core:jackson-annotations:2.16.2=deps,embulk-decoder-bzip2,embulk-decoder-gzip,embulk-encoder-bzip2,embulk-encoder-gzip,embulk-filter-remove_columns,embulk-filter-rename,embulk-formatter-csv,embulk-guess-bzip2,embulk-guess-csv,embulk-guess-csv_all_strings,embulk-guess-gzip,embulk-guess-json,embulk-input-config,embulk-input-file,embulk-output-file,embulk-output-null,embulk-output-stdout,embulk-parser-csv,embulk-parser-json
com.fasterxml.jackson.core:jackson-core:2.16.2=deps,embulk-decoder-bzip2,embulk-decoder-gzip,embulk-encoder-bzip2,embulk-encoder-gzip,embulk-filter-remove_columns,embulk-filter-rename,embulk-formatter-csv,embulk-guess-bzip2,embulk-guess-csv,embulk-guess-csv_all_strings,embulk-guess-gzip,embulk-guess-json,embulk-input-config,embulk-input-file,embulk-output-file,embulk-output-null,embulk-output-stdout,embulk-parser-csv,embulk-parser-json
com.fasterxml.jackson.core:jackson-databind:2.16.2=deps,embulk-decoder-bzip2,embulk-decoder-gzip,embulk-encoder-bzip2,embulk-encoder-gzip,embulk-filter-remove_columns,embulk-filter-rename,embulk-formatter-csv,embulk-guess-bzip2,embulk-guess-csv,embulk-guess-csv_all_strings,embulk-guess-gzip,embulk-guess-json,embulk-input-config,embulk-input-file,embulk-output-file,embulk-output-null,embulk-output-stdout,embulk-parser-csv,embulk-parser-json
Expand Down Expand Up @@ -66,7 +66,7 @@ org.embulk:embulk-util-rubytime:0.4.0=deps,embulk-formatter-csv,embulk-guess-csv
org.embulk:embulk-util-text:0.2.0=embulk-formatter-csv,embulk-guess-csv,embulk-guess-csv_all_strings,embulk-parser-csv
org.embulk:embulk-util-timestamp:0.3.0=deps,embulk-formatter-csv,embulk-guess-csv,embulk-guess-csv_all_strings,embulk-input-config,embulk-output-stdout,embulk-parser-csv,embulk-parser-json
org.msgpack:msgpack-core:0.8.24=compileClasspath,runtimeClasspath
org.slf4j:jcl-over-slf4j:2.0.7=deps
org.slf4j:slf4j-api:2.0.7=compileClasspath,runtimeClasspath
org.slf4j:jcl-over-slf4j:2.0.13=deps
org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath
org.yaml:snakeyaml:2.2=deps
empty=

0 comments on commit 68b5d1b

Please sign in to comment.