Update to JRuby 9.4

Dockerfile

@@ -35,7 +35,7 @@ COPY LICENSE.txt /opt/logstash/LICENSE.txt
 COPY NOTICE.TXT /opt/logstash/NOTICE.TXT
 COPY licenses /opt/logstash/licenses
 COPY CONTRIBUTORS /opt/logstash/CONTRIBUTORS
-COPY Gemfile.template Gemfile.jruby-2.6.lock.* /opt/logstash/
+COPY Gemfile.template Gemfile.jruby-3.1.lock.* /opt/logstash/
 COPY Rakefile /opt/logstash/Rakefile
 COPY build.gradle /opt/logstash/build.gradle
 COPY rubyUtils.gradle /opt/logstash/rubyUtils.gradle

Gemfile.template

@@ -31,3 +31,4 @@ gem "rspec", "~> 3.5", :group => :development
 gem "webmock", "~> 3", :group => :development
 gem "jar-dependencies", "= 0.4.1" # Gem::LoadError with jar-dependencies 0.4.2
 gem "murmurhash3", "= 0.1.6" # Pins until version 0.1.7-java is released
+gem "thwait"

bin/logstash.lib.sh

@@ -167,7 +167,7 @@ setup_vendored_jruby() {
   fi
 
   if [ -z "$LS_GEM_HOME" ] ; then
-    export GEM_HOME="${LOGSTASH_HOME}/vendor/bundle/jruby/2.6.0"
+    export GEM_HOME="${LOGSTASH_HOME}/vendor/bundle/jruby/3.1.0"
   else
     export GEM_HOME=${LS_GEM_HOME}
   fi

build.gradle

@@ -294,9 +294,9 @@ def bundlerVersion = "~> 2"
 
 tasks.register("installBundler") {
     dependsOn assemblyDeps
-    outputs.files file("${projectDir}/vendor/bundle/jruby/2.6.0/bin/bundle")
+    outputs.files file("${projectDir}/vendor/bundle/jruby/3.1.0/bin/bundle")
     doLast {
-      gem(projectDir, buildDir, "bundler", bundlerVersion, "${projectDir}/vendor/bundle/jruby/2.6.0")
+      gem(projectDir, buildDir, "bundler", bundlerVersion, "${projectDir}/vendor/bundle/jruby/3.1.0")
   }
 }
 
@@ -417,7 +417,7 @@ tasks.register("unpackTarDistribution", Copy) {
 
 def qaBuildPath = "${buildDir}/qa/integration"
 def qaVendorPath = "${qaBuildPath}/vendor"
-def qaBundledGemPath = "${qaVendorPath}/jruby/2.6.0".toString()
+def qaBundledGemPath = "${qaVendorPath}/jruby/3.1.0".toString()
 def qaBundleBin = "${qaBundledGemPath}/bin/bundle"
 
 tasks.register("installIntegrationTestBundler"){

lib/bootstrap/bundler.rb

@@ -119,7 +119,7 @@ def invoke!(options = {})
         )
       end
       # create Gemfile.jruby-1.9.lock from template iff a template exists it itself does not exist
-      lock_template = ::File.join(ENV["LOGSTASH_HOME"], "Gemfile.jruby-2.6.lock.release")
+      lock_template = ::File.join(ENV["LOGSTASH_HOME"], "Gemfile.jruby-3.1.lock.release")
       if ::File.exists?(lock_template) && !::File.exists?(Environment::LOCKFILE)
         FileUtils.copy(lock_template, Environment::LOCKFILE)
       end

lib/pluginmanager/gem_installer.rb

@@ -26,7 +26,7 @@ module LogStash module PluginManager
   # - Generate the specifications
   # - Copy the data in the right folders
   class GemInstaller
-    GEM_HOME = Pathname.new(::File.join(LogStash::Environment::BUNDLE_DIR, "jruby", "2.6.0"))
+    GEM_HOME = Pathname.new(::File.join(LogStash::Environment::BUNDLE_DIR, "jruby", "3.1.0"))
     SPECIFICATIONS_DIR = "specifications"
     GEMS_DIR = "gems"
     CACHE_DIR = "cache"

logstash-core/lib/logstash/api/modules/logging.rb

@@ -26,15 +26,16 @@ class Logging < ::LogStash::Api::Modules::Base
         #
         # return any unused configurations
         def handle_logging(settings)
-          Hash[settings.map do |key, level|
+          couplesList = settings.map do |key, level|
             if key.start_with?("logger.")
               _, path = key.split("logger.")
               LogStash::Logging::Logger::configure_logging(level, path)
               nil
             else
               [key, level]
             end
-          end]
+          end.reject {|value| value.nil?} # skip nil which result in ArgumentError since JRuby 9.4
+          Hash[couplesList]
         end
 
         put "/" do

logstash-core/lib/logstash/codecs/base.rb

@@ -91,7 +91,7 @@ def flush(&block)
   end
 
   public
-  def clone
+  def clone(*args)
     LogStash::Plugins::Contextualizer.initialize_plugin(execution_context, self.class, params).tap do |klone|
       klone.metric = @metric if klone.instance_variable_get(:@metric).nil?
     end