Skip to content

Commit

Permalink
Upgrade Apache Commons Compress to 1.26.1
Browse files Browse the repository at this point in the history
  • Loading branch information
dmikurube committed Apr 23, 2024
1 parent 81d2d51 commit 61c4fb9
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
23 changes: 23 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,17 @@ dependencies {

implementation libs.embulk.util.file

// Apache Commons Compress (commons-compress) has been depending on commons-codec, commons-io, and commons-lang3 since 1.26.0.
//
// It had had some internal utility classes, like Charsets and IOUtils, until 1.25.0, which were duplicated
// with commons-codec and commons-io. Apache Commons Compress started to reuse the original ones from 1.26.0.
//
// See: https://commons.apache.org/proper/commons-compress/changes-report.html#a1.26.0
implementation libs.commons.compress

implementation libs.commons.codec
implementation libs.commons.io
implementation libs.commons.lang3
}

embulkPlugin {
Expand All @@ -71,6 +81,19 @@ javadocJar {
}
}

// A safer and strict alternative to: "dependencies" (and "dependencies --write-locks")
//
// This task fails explicitly when the specified dependency is not available.
// In contrast, "dependencies (--write-locks)" does not fail even when a part the dependencies are unavailable.
//
// https://docs.gradle.org/8.7/userguide/dependency_locking.html#generating_and_updating_dependency_locks
task checkDependencies {
notCompatibleWithConfigurationCache("The task \"checkDependencies\" filters configurations at execution time.")
doLast {
configurations.findAll { it.canBeResolved }.each { it.resolve() }
}
}

publishing {
publications {
maven(MavenPublication) {
Expand Down
5 changes: 4 additions & 1 deletion gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ 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
commons-codec:commons-codec:1.16.1=compileClasspath,runtimeClasspath
commons-io:commons-io:2.16.1=compileClasspath,runtimeClasspath
javax.validation:validation-api:2.0.1.Final=compileClasspath,runtimeClasspath
org.apache.commons:commons-compress:1.10=compileClasspath,runtimeClasspath
org.apache.commons:commons-compress:1.26.1=compileClasspath,runtimeClasspath
org.apache.commons:commons-lang3:3.14.0=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
Expand Down
8 changes: 7 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@ jackson = "2.16.2"

embulk-util-file = "0.2.0"

commons-compress = "1.10"
commons-compress = "1.26.1"
commons-codec = "1.16.1"
commons-io = "2.16.1"
commons-lang3 = "3.14.0"

[libraries]

Expand All @@ -30,6 +33,9 @@ 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" }
commons-codec = { group = "commons-codec", name = "commons-codec", version.ref = "commons-codec" }
commons-io = { group = "commons-io", name = "commons-io", version.ref = "commons-io" }
commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }

[bundles]

Expand Down

0 comments on commit 61c4fb9

Please sign in to comment.