mirror of
https://github.com/elastic/logstash.git
synced 2025-04-22 05:37:21 -04:00
4a2268a43f
This commit updates the version of jruby used in Logstash to `9.3.4.0`. * Updates the references of `jruby` from `9.2.20.1` to `9.3.4.0` * Updates references/locations of ruby from `2.5.0` to `2.6.0` * Updates java imports including `org.logstash.util` to be quoted * Without quoting the name of the import, the following error is observed in tests: * `java.lang.NoClassDefFoundError: org/logstash/Util (wrong name: org/logstash/util)` * Maybe an instance of https://github.com/jruby/jruby/issues/4861 * Adds a monkey patch to `require` to resolve compatibility issue between latest `jruby` and `polyglot` gem * The addition of https://github.com/jruby/jruby/pull/7145 to disallow circular causes, will throw when `polyglot` is thrown into the mix, and stop logstash from starting and building - any gems that use an exception to determine whether or not to load the native gem, will trigger the code added in that commit. * This commit adds a monkey patch of `require` to rollback the circular cause exception back to the original cause. * Removes the use of the deprecated `JavaClass` * Adds additional `require time` in `generate_build_metadata` * Rewrites a test helper to avoid potentially calling `~>` on `FalseClass` Co-authored-by: Joao Duarte <jsvduarte@gmail.com> Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
41 lines
1.5 KiB
Ruby
41 lines
1.5 KiB
Ruby
# Licensed to Elasticsearch B.V. under one or more contributor
|
|
# license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright
|
|
# ownership. Elasticsearch B.V. licenses this file to you under
|
|
# the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
rule ".rb" => ".treetop" do |task, args|
|
|
require 'logstash/patches/polyglot'
|
|
require "treetop"
|
|
compiler = Treetop::Compiler::GrammarCompiler.new
|
|
compiler.compile(task.source, task.name)
|
|
puts "Compiling #{task.source}"
|
|
end
|
|
|
|
namespace "compile" do
|
|
desc "Compile the config grammar"
|
|
task "grammar" => %w(
|
|
logstash-core/lib/logstash/config/grammar.rb
|
|
logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb
|
|
)
|
|
|
|
task "logstash-core-java" do
|
|
puts("Building logstash-core using gradle")
|
|
# this expansion is necessary to use the path separators of the hosting OS
|
|
sh(File.join(".", "gradlew"), "assemble")
|
|
end
|
|
|
|
desc "Build everything"
|
|
task "all" => ["grammar", "logstash-core-java"]
|
|
end
|