github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-06-28 09:46:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

upgrade jruby to 9.4.7.0 (#16125)

Browse source
This commit is contained in:
João Duarte 2024-05-02 09:59:04 +01:00 • committed by GitHub
parent 830733d758
commit 4350855e7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rubyUtils.gradle
View file

@ -25,7 +25,7 @@ buildscript {
dependencies { dependencies {
classpath "org.yaml:snakeyaml:${snakeYamlVersion}" classpath "org.yaml:snakeyaml:${snakeYamlVersion}"
classpath "de.undercouch:gradle-download-task:4.0.4" 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) versionMap = (Map) (new Yaml()).load(new File("${versionsPath}").text)
String jRubyURL 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 jRubyVersion
String jRubySha1 String jRubySha1
Boolean doChecksum Boolean doChecksum
@ -224,7 +222,6 @@ if (versionMap["jruby-runtime-override"]) {
doChecksum = true doChecksum = true
} }
def jrubyTarPath = "${projectDir}/vendor/_/jruby-dist-${jRubyVersion}-bin.tar.gz" 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 customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property("custom.jruby.path") : ""
def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim() def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()

4
versions.yml
View file

@ -13,8 +13,8 @@ bundled_jdk:
# jruby must reference a *released* version of jruby which can be downloaded from the official download url # 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 # *and* for which jars artifacts are published for compile-time
jruby: jruby:
version: 9.4.6.0 version: 9.4.7.0
sha1: 871d520c9f2494ca56138200c6b2a95c54d0a639 sha1: ea3b99edcb48ed436173977551a113759541c18c
# jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby # jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby
#jruby-runtime-override: #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 # 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