File 0006-Pick-up-jruby.jar.patch of Package logstash6

From 5b705e4e7f6b7f58a28cdd3699997cae10a2d384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Wed, 15 Mar 2017 17:16:54 +0100
Subject: [PATCH 06/11] Pick up jruby.jar

---
 build.gradle               | 2 --
 buildSrc/build.gradle      | 4 ++++
 logstash-core/build.gradle | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f65c7e5abba..651892ae804b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -312,8 +312,6 @@ task generatePluginsVersion(dependsOn: bootstrap) {
   }
 }
 
-// If you are running a JRuby snapshot we will skip the integrity check.
-verifyFile.onlyIf { doChecksum }
 bootstrap.dependsOn installTestGems
 
 runIntegrationTests.shouldRunAfter tasks.getByPath(":logstash-core:test")
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 8f090798c79f..667b7cd4e1f9 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -6,3 +6,7 @@ group = 'org.logstash.gradle'
 repositories {
   mavenLocal()
 }
+
+dependencies {
+  compile files('/usr/share/jruby/lib/jruby.jar')
+}
diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle
index badc454b0aaa..db780eab9133 100644
--- a/logstash-core/build.gradle
+++ b/logstash-core/build.gradle
@@ -95,6 +95,10 @@ artifacts {
     }
 }
 
+configurations {
+    provided
+}
+
 project.sourceSets {
     main.compileClasspath += project.configurations.provided
     main.runtimeClasspath += project.configurations.provided
@@ -134,4 +138,5 @@ dependencies {
     testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0'
     testCompile 'org.elasticsearch:securemock:1.2'
     testCompile 'org.assertj:assertj-core:3.8.0'
+    provided files('/usr/share/jruby/lib/jruby.jar')
 }
-- 
2.26.0

openSUSE Build Service is sponsored by