From cf80f17de551df640566c45ec5c1440b378af149 Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Tue, 7 Jul 2020 15:27:57 +0100 Subject: [PATCH] update jruby to 9.2.12.0 Also tweak the documentation since most of the add-opens are no longer needed, except: java.io due to colinsurprenant/jruby-stdin-channel#1 java.security due to jruby-openssl java.nio.channels, sun.nio.ch, sun.management and java.io from jruby: https://github.com/jruby/jruby/blob/9.2.12.0/bin/.jruby.module_opts Co-authored-by: Ry Biesemeyer --- docs/static/troubleshooting.asciidoc | 22 +++++++--------------- rubyUtils.gradle | 2 +- versions.yml | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/docs/static/troubleshooting.asciidoc b/docs/static/troubleshooting.asciidoc index cb48217de8..124eaa6008 100644 --- a/docs/static/troubleshooting.asciidoc +++ b/docs/static/troubleshooting.asciidoc @@ -59,8 +59,8 @@ Running Logstash with Java 11 results in warnings similar to these: [source,sh] ----- WARNING: An illegal reflective access operation has occurred -WARNING: Illegal reflective access by org.jruby.util.SecurityHelper (file:/Users/chrisuser/logstash-6.7.0/logstash-core/lib/jars/jruby-complete-9.2.6.0.jar) to field java.lang.reflect.Field.modifiers -WARNING: Please consider reporting this to the maintainers of org.jruby.util.SecurityHelper +WARNING: Illegal reflective access by org.jruby.ext.openssl.SecurityHelper (file:/{...}/jruby{...}jopenssl.jar) to field java.security.MessageDigest.provider +WARNING: Please consider reporting this to the maintainers of org.jruby.ext.openssl.SecurityHelper WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations WARNING: All illegal access operations will be denied in a future release ----- @@ -73,18 +73,11 @@ Try adding these values to the `jvm.options` file. [source,sh] ----- ---add-opens=java.base/java.lang=ALL-UNNAMED ---add-opens=java.base/java.security=ALL-UNNAMED ---add-opens=java.base/java.util=ALL-UNNAMED ---add-opens=java.base/java.security.cert=ALL-UNNAMED ---add-opens=java.base/java.util.zip=ALL-UNNAMED ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED ---add-opens=java.base/java.util.regex=ALL-UNNAMED ---add-opens=java.base/java.net=ALL-UNNAMED ---add-opens=java.base/java.io=ALL-UNNAMED ---add-opens=java.base/java.lang=ALL-UNNAMED ---add-opens=java.base/javax.crypto=ALL-UNNAMED ---add-opens=java.management/sun.management=ALL-UNNAMED +--add-opens=java.base/java.security=ALL-UNNAMED +--add-opens=java.base/java.io=ALL-UNNAMED +--add-opens=java.base/java.nio.channels=org.jruby.dist +--add-opens=java.base/sun.nio.ch=org.jruby.dist +--add-opens=java.management/sun.management=org.jruby.dist ----- *Notes:* @@ -338,4 +331,3 @@ Coming soon - diff --git a/rubyUtils.gradle b/rubyUtils.gradle index b6ff3f11fd..b9c4f71251 100644 --- a/rubyUtils.gradle +++ b/rubyUtils.gradle @@ -25,7 +25,7 @@ buildscript { dependencies { classpath 'org.yaml:snakeyaml:1.23' classpath "de.undercouch:gradle-download-task:4.0.4" - classpath "org.jruby:jruby-complete:9.2.11.1" + classpath "org.jruby:jruby-complete:9.2.12.0" } } diff --git a/versions.yml b/versions.yml index 8be13928d6..aef69bab3d 100644 --- a/versions.yml +++ b/versions.yml @@ -7,8 +7,8 @@ logstash-core-plugin-api: 2.1.16 # 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.2.11.1 - sha1: cceb81635fe3cd39f895c7632428e94b503e8e3d + version: 9.2.12.0 + sha1: bccc2034e773cb1aba2cc4b8b40921265f6e857f # jruby-runtime-override, if specified, will override the jruby version installed in vendor/jruby for logstash runtime only, # not for the compile-time jars