From 004f88f7300f42b5b8c391890e5f42292bfd9296 Mon Sep 17 00:00:00 2001
From: Joao Duarte <jsvduarte@gmail.com>
Date: Wed, 30 Jul 2025 20:40:42 +0100
Subject: [PATCH 1/2] don't rely on rubyUtils.gradle loading the versions

---
 build.gradle        |  2 +-
 loadVersions.gradle | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 loadVersions.gradle

diff --git a/build.gradle b/build.gradle
index 9611ece..7673cc0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     shadowGradlePluginVersion = '8.1.1'
 }
 
-
+apply from: "$rootDir/loadVersions.gradle"
 apply from: LOGSTASH_CORE_PATH + "/../rubyUtils.gradle"
 
 // ===========================================================================
diff --git a/loadVersions.gradle b/loadVersions.gradle
new file mode 100644
index 0000000..6af1193
--- /dev/null
+++ b/loadVersions.gradle
@@ -0,0 +1,14 @@
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "org.yaml:snakeyaml:2.2"
+  }
+}
+
+// load versions of jdk and jruby asap so we can use them anywhere else in the scripts
+import org.yaml.snakeyaml.Yaml
+def versionsFile = file(LOGSTASH_CORE_PATH + "/../versions.yml")
+gradle.ext.versions = new Yaml().load(versionsFile.text)

From cf2c421d00876417761f3db72fc57132454c5d99 Mon Sep 17 00:00:00 2001
From: Joao Duarte <jsvduarte@gmail.com>
Date: Thu, 31 Jul 2025 09:51:07 +0100
Subject: [PATCH 2/2] simplify build.gradle and get jruby version from Logstash
 core

---
 build.gradle        | 13 ++++++++++---
 loadVersions.gradle | 14 --------------
 2 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100644 loadVersions.gradle

diff --git a/build.gradle b/build.gradle
index 7673cc0..49e4af8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,9 @@ buildscript {
         mavenCentral()
         gradlePluginPortal()
     }
+    dependencies {
+      classpath "org.yaml:snakeyaml:2.2"
+    }
 }
 
 plugins {
@@ -14,11 +17,15 @@ plugins {
 }
 
 ext {
-    snakeYamlVersion = '2.2'
     shadowGradlePluginVersion = '8.1.1'
 }
 
-apply from: "$rootDir/loadVersions.gradle"
+// 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"
 
 // ===========================================================================
@@ -60,7 +67,7 @@ dependencies {
     implementation fileTree(dir: LOGSTASH_CORE_PATH, include: "**/logstash-core.jar")
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.jruby:jruby-complete:9.4.7.0'
+    testImplementation "org.jruby:jruby-complete:${gradle.ext.versions.jruby.version}"
 }
 
 clean {
diff --git a/loadVersions.gradle b/loadVersions.gradle
deleted file mode 100644
index 6af1193..0000000
--- a/loadVersions.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "org.yaml:snakeyaml:2.2"
-  }
-}
-
-// load versions of jdk and jruby asap so we can use them anywhere else in the scripts
-import org.yaml.snakeyaml.Yaml
-def versionsFile = file(LOGSTASH_CORE_PATH + "/../versions.yml")
-gradle.ext.versions = new Yaml().load(versionsFile.text)