From 4350855e7b127d95b6b29a0ffea19a529fc5111d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Thu, 2 May 2024 09:59:04 +0100 Subject: [PATCH] upgrade jruby to 9.4.7.0 (#16125) --- rubyUtils.gradle | 5 +---- versions.yml | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rubyUtils.gradle b/rubyUtils.gradle index e16fa703c..52875b13d 100644 --- a/rubyUtils.gradle +++ b/rubyUtils.gradle @@ -25,7 +25,7 @@ buildscript { dependencies { classpath "org.yaml:snakeyaml:${snakeYamlVersion}" classpath "de.undercouch:gradle-download-task:4.0.4" - classpath "org.jruby:jruby-core:9.4.6.0" + classpath "org.jruby:jruby-core:9.4.7.0" } } @@ -207,8 +207,6 @@ def versionsPath = project.hasProperty("LOGSTASH_CORE_PATH") ? LOGSTASH_CORE_PAT versionMap = (Map) (new Yaml()).load(new File("${versionsPath}").text) String jRubyURL -String previousJRubyVersion = "9.3.9.0" -String previousJRubyURL = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/${previousJRubyVersion}/jruby-dist-${previousJRubyVersion}-bin.tar.gz" String jRubyVersion String jRubySha1 Boolean doChecksum @@ -224,7 +222,6 @@ if (versionMap["jruby-runtime-override"]) { doChecksum = true } def jrubyTarPath = "${projectDir}/vendor/_/jruby-dist-${jRubyVersion}-bin.tar.gz" -def previousJrubyTarPath = "${projectDir}/vendor/_/jruby-dist-${previousJRubyVersion}-bin.tar.gz" def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property("custom.jruby.path") : "" def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim() diff --git a/versions.yml b/versions.yml index cef9ccf33..4d44004f2 100644 --- a/versions.yml +++ b/versions.yml @@ -13,8 +13,8 @@ bundled_jdk: # jruby must reference a *released* version of jruby which can be downloaded from the official download url # *and* for which jars artifacts are published for compile-time jruby: - version: 9.4.6.0 - sha1: 871d520c9f2494ca56138200c6b2a95c54d0a639 + version: 9.4.7.0 + sha1: ea3b99edcb48ed436173977551a113759541c18c # jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby #jruby-runtime-override: # url: https://oss.sonatype.org/content/repositories/snapshots/org/jruby/jruby-dist/9.3.0.0-SNAPSHOT/jruby-dist-9.3.0.0-20210723.214927-259-bin.tar.gz