Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

buildscript {
ext {
snakeYamlVersion = '1.33'
snakeYamlVersion = '2.0'
shadowGradlePluginVersion = '7.0.0'
}

Expand Down
2 changes: 1 addition & 1 deletion logstash-core/benchmarks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ dependencies {
implementation "org.openjdk.jmh:jmh-core:$jmh"
annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$jmh"
implementation 'com.google.guava:guava:24.1.1-jre'
implementation 'commons-io:commons-io:2.5'
implementation 'commons-io:commons-io:2.13.0'
runtimeOnly 'joda-time:joda-time:2.8.2'
api "org.jruby:jruby-core:$jrubyVersion"
}
Expand Down
2 changes: 0 additions & 2 deletions logstash-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ dependencies {
implementation 'org.codehaus.janino:janino:3.1.0'
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
// pin version of jackson-dataformat-yaml's transitive dependency "snakeyaml"
implementation "org.yaml:snakeyaml:1.33"
implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
implementation('com.google.googlejavaformat:google-java-format:1.15.0') {
exclude group: 'com.google.guava', module: 'guava'
Expand Down
4 changes: 2 additions & 2 deletions tools/benchmark-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ ext {
dependencies {
implementation 'net.sf.jopt-simple:jopt-simple:5.0.3'
implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12'
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.20'
implementation group: 'org.apache.commons', name: 'commons-compress', version: '1.23.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
implementation group: 'commons-codec', name: 'commons-codec', version: '1.14'

implementation group: 'commons-io', name: 'commons-io', version: '2.7'
implementation group: 'commons-io', name: 'commons-io', version: '2.13.0'
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
api "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
implementation group: 'org.elasticsearch.client', name: 'elasticsearch-rest-client', version: elasticsearch
Expand Down
2 changes: 1 addition & 1 deletion tools/dependencies-report/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ buildscript {
}

dependencies {
implementation 'commons-io:commons-io:2.6'
implementation 'commons-io:commons-io:2.13.0'
implementation 'org.apache.commons:commons-csv:1.5'
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
Expand Down
2 changes: 1 addition & 1 deletion tools/ingest-converter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
implementation 'net.sf.jopt-simple:jopt-simple:4.6'
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
testImplementation "junit:junit:4.12"
testImplementation 'commons-io:commons-io:2.5'
testImplementation 'commons-io:commons-io:2.13.0'
}

javadoc {
Expand Down
6 changes: 3 additions & 3 deletions versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jruby:
# Note: this file is copied to the root of logstash-core because its gemspec needs it when
# bundler evaluates the gemspec via bin/logstash
# Ensure Jackson version here is kept in sync with version used by jrjackson gem
jrjackson: 0.4.17
jackson: 2.14.1
jackson-databind: 2.14.1
jrjackson: 0.4.18
jackson: 2.15.2
jackson-databind: 2.15.2