From a35907d6e7c6e199af60ff438d9ef9cd0272f694 Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Thu, 31 Jul 2025 14:49:46 +0100 Subject: [PATCH 1/2] don't rely on rubyUtils for versions.yml loading --- build.gradle | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index dc6af31..50d056c 100644 --- a/build.gradle +++ b/build.gradle @@ -4,12 +4,14 @@ import static java.nio.file.StandardCopyOption.REPLACE_EXISTING buildscript { ext { - snakeYamlVersion = '1.33' shadowGradlePluginVersion = '8.1.1' } repositories { mavenCentral() } + dependencies { + classpath "org.yaml:snakeyaml:2.2" + } } plugins { @@ -17,6 +19,11 @@ plugins { id 'java' } +// load versions.yml from core before loading rubyUtils.gradle +import org.yaml.snakeyaml.Yaml +def versionsFile = file(LOGSTASH_CORE_PATH + "/../versions.yml") +gradle.ext.versions = new Yaml().load(versionsFile.text) + apply from: LOGSTASH_CORE_PATH + "/../rubyUtils.gradle" // =========================================================================== @@ -36,8 +43,8 @@ pluginInfo.pluginName = "java_codec_example" // must match the @LogstashPlu // =========================================================================== java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } repositories { @@ -51,14 +58,14 @@ shadowJar { dependencies { implementation 'org.apache.logging.log4j:log4j-api:2.9.1' implementation 'org.apache.logging.log4j:log4j-core:2.9.1' - implementation "com.fasterxml.jackson.core:jackson-core:2.9.5" - implementation "com.fasterxml.jackson.core:jackson-databind:2.9.5" - implementation "com.fasterxml.jackson.core:jackson-annotations:2.9.5" - implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.5" + implementation "com.fasterxml.jackson.core:jackson-core:${gradle.ext.versions.jackson}" + implementation "com.fasterxml.jackson.core:jackson-databind:${gradle.ext.versions['jackson-databind']}" + implementation "com.fasterxml.jackson.core:jackson-annotations:${gradle.ext.versions.jackson}" + implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${gradle.ext.versions.jackson}" implementation fileTree(dir: LOGSTASH_CORE_PATH, include: "**/logstash-core-?.?.?.jar") testImplementation 'junit:junit:4.12' - testImplementation 'org.jruby:jruby-complete:9.1.13.0' + testImplementation "org.jruby:jruby-complete:${gradle.ext.versions.jruby.version}" } clean { From abca4f7f12987386feba7bf8736555ce054c6c85 Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Fri, 1 Aug 2025 09:40:45 +0100 Subject: [PATCH 2/2] minor fixes --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 50d056c..3ab5890 100644 --- a/build.gradle +++ b/build.gradle @@ -56,13 +56,13 @@ shadowJar { } dependencies { - implementation 'org.apache.logging.log4j:log4j-api:2.9.1' - implementation 'org.apache.logging.log4j:log4j-core:2.9.1' + implementation 'org.apache.logging.log4j:log4j-api:2.17.0' + implementation 'org.apache.logging.log4j:log4j-core:2.17.0' implementation "com.fasterxml.jackson.core:jackson-core:${gradle.ext.versions.jackson}" implementation "com.fasterxml.jackson.core:jackson-databind:${gradle.ext.versions['jackson-databind']}" implementation "com.fasterxml.jackson.core:jackson-annotations:${gradle.ext.versions.jackson}" implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${gradle.ext.versions.jackson}" - implementation fileTree(dir: LOGSTASH_CORE_PATH, include: "**/logstash-core-?.?.?.jar") + implementation fileTree(dir: LOGSTASH_CORE_PATH, include: "**/logstash-core.jar") testImplementation 'junit:junit:4.12' testImplementation "org.jruby:jruby-complete:${gradle.ext.versions.jruby.version}"