github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

update jar dependencies

Browse source 
Fixes #11103
This commit is contained in:
Joao Duarte 2019-10-23 10:30:25 +01:00 • committed by João Duarte
parent afe4f8189d
commit 743723bf96
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
logstash-core/build.gradle
View file

@ -138,7 +138,7 @@ dependencies {
compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
compile 'org.codehaus.janino:janino:3.0.15'
compile 'org.codehaus.janino:janino:3.1.0'
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
if (customJRubyDir == "") {
compile "org.jruby:jruby-complete:${jrubyVersion}"
@ -152,7 +152,7 @@ dependencies {
exclude group: 'com.google.guava', module: 'guava'
}
compile 'org.javassist:javassist:3.26.0-GA'
compile 'com.google.guava:guava:22.0'
//compile 'com.google.guava:guava:22.0'
testCompile 'org.apache.logging.log4j:log4j-core:2.12.1:tests'
testCompile 'junit:junit:4.12'
testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0'

4
logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java
View file

@ -15,8 +15,8 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.codehaus.commons.compiler.CompileException;
import org.codehaus.commons.compiler.ICookable;
import org.codehaus.commons.compiler.ISimpleCompiler;
import org.codehaus.janino.Scanner;
import org.codehaus.janino.SimpleCompiler;
/**
@ -132,7 +132,7 @@ public final class ComputeStepSyntaxElement<T extends Dataset> {
Path sourceDir = null;
try {
final Path parentDir;
final String dir = System.getProperty(ICookable.SYSTEM_PROPERTY_SOURCE_DEBUGGING_DIR);
final String dir = System.getProperty(Scanner.SYSTEM_PROPERTY_SOURCE_DEBUGGING_DIR);
if (dir != null) {
parentDir = Paths.get(dir);
sourceDir = parentDir.resolve("org").resolve("logstash").resolve("generated");