Skip to content

Commit 1d1fa7a

Browse files
authored
update commons-io commons-compress jrjackson databind (#15125)
* update commons-io to 2.13.0 and commons-compress to 1.23.0 * update databind and jackson
1 parent 98c3d30 commit 1d1fa7a

File tree

7 files changed

+9
-11
lines changed

7 files changed

+9
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
buildscript {
2121
ext {
22-
snakeYamlVersion = '1.33'
22+
snakeYamlVersion = '2.0'
2323
shadowGradlePluginVersion = '7.0.0'
2424
}
2525

logstash-core/benchmarks/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858
implementation "org.openjdk.jmh:jmh-core:$jmh"
5959
annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$jmh"
6060
implementation 'com.google.guava:guava:24.1.1-jre'
61-
implementation 'commons-io:commons-io:2.5'
61+
implementation 'commons-io:commons-io:2.13.0'
6262
runtimeOnly 'joda-time:joda-time:2.8.2'
6363
api "org.jruby:jruby-core:$jrubyVersion"
6464
}

logstash-core/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ dependencies {
181181
implementation 'org.codehaus.janino:janino:3.1.0'
182182
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
183183
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
184-
// pin version of jackson-dataformat-yaml's transitive dependency "snakeyaml"
185-
implementation "org.yaml:snakeyaml:1.33"
186184
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
187185
implementation('com.google.googlejavaformat:google-java-format:1.15.0') {
188186
exclude group: 'com.google.guava', module: 'guava'

tools/benchmark-cli/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ ext {
5050
dependencies {
5151
implementation 'net.sf.jopt-simple:jopt-simple:5.0.3'
5252
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12'
53-
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.20'
53+
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.23.0'
5454
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
5555
implementation group: 'commons-codec', name: 'commons-codec', version: '1.14'
5656

57-
implementation group: 'commons-io', name: 'commons-io', version: '2.7'
57+
implementation group: 'commons-io', name: 'commons-io', version: '2.13.0'
5858
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
5959
api "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
6060
implementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: elasticsearch

tools/dependencies-report/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ buildscript {
4242
}
4343

4444
dependencies {
45-
implementation 'commons-io:commons-io:2.6'
45+
implementation 'commons-io:commons-io:2.13.0'
4646
implementation 'org.apache.commons:commons-csv:1.5'
4747
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
4848
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"

tools/ingest-converter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
implementation 'net.sf.jopt-simple:jopt-simple:4.6'
4646
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
4747
testImplementation "junit:junit:4.12"
48-
testImplementation 'commons-io:commons-io:2.5'
48+
testImplementation 'commons-io:commons-io:2.13.0'
4949
}
5050

5151
javadoc {

versions.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jruby:
2424
# Note: this file is copied to the root of logstash-core because its gemspec needs it when
2525
# bundler evaluates the gemspec via bin/logstash
2626
# Ensure Jackson version here is kept in sync with version used by jrjackson gem
27-
jrjackson: 0.4.17
28-
jackson: 2.14.1
29-
jackson-databind: 2.14.1
27+
jrjackson: 0.4.18
28+
jackson: 2.15.2
29+
jackson-databind: 2.15.2

0 commit comments

Comments
 (0)