logstash: Updated java dependencies

Added a upstream patch to update the
java dependencies

Change-Id: I34b5d6d1db36029a88f4295edd1e0d0a9b20672f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6906
Tested-by: michellew <[email protected]>
Reviewed-by: Anish Swaminathan <[email protected]>

SPECS/logstash/logstash-update-java-dependencies.patch

@@ -0,0 +1,71 @@
+From e6d59de458b10795e18070176ca215aaecf3d68e Mon Sep 17 00:00:00 2001
+From: Dan Hermann <[email protected]>
+Date: Fri, 18 Jan 2019 08:16:13 -0600
+Subject: [PATCH] Update java dependencies (#10340)
+
+---
+ build.gradle               |  2 +-
+ logstash-core/build.gradle | 16 ++++++++--------
+ versions.yml               |  2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/build.gradle b/build.gradle
+index 3fda82e..691a1ad 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -6,7 +6,7 @@ buildscript {
+         }
+     }
+     dependencies {
+-        classpath 'org.yaml:snakeyaml:1.17'
++        classpath 'org.yaml:snakeyaml:1.23'
+         classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1"
+     }
+ }
+diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle
+index e3baf6c..3ca3d18 100644
+--- a/logstash-core/build.gradle
++++ b/logstash-core/build.gradle
+@@ -118,15 +118,15 @@ def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property
+ def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()
+
+ dependencies {
+-    compile 'org.apache.logging.log4j:log4j-api:2.9.1'
+-    compile 'org.apache.logging.log4j:log4j-core:2.9.1'
+-    runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1'
++    compile 'org.apache.logging.log4j:log4j-api:2.11.1'
++    compile 'org.apache.logging.log4j:log4j-core:2.11.1'
++    runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
+     compile 'commons-codec:commons-codec:1.11'
+     // Jackson version moved to versions.yml in the project root (the JrJackson version is there too)
+     compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+     compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+     compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
+-    compile 'org.codehaus.janino:janino:3.0.8'
++    compile 'org.codehaus.janino:janino:3.0.11'
+     compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
+     if (customJRubyDir == "") {
+         compile "org.jruby:jruby-complete:${jrubyVersion}"
+@@ -137,9 +137,9 @@ dependencies {
+     // Do not upgrade this, later versions require GPL licensed code in javac-shaded that is
+     // Apache2 incompatible
+     compile 'com.google.googlejavaformat:google-java-format:1.1'
+-    testCompile 'org.apache.logging.log4j:log4j-core:2.9.1:tests'
++    testCompile 'org.apache.logging.log4j:log4j-core:2.11.1:tests'
+     testCompile 'junit:junit:4.12'
+-    testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0'
++    testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0'
+     testCompile 'org.elasticsearch:securemock:1.2'
+-    testCompile 'org.assertj:assertj-core:3.8.0'
++    testCompile 'org.assertj:assertj-core:3.11.1'
+ }
+diff --git a/versions.yml b/versions.yml
+index d7f2572..85083a0 100644
+--- a/versions.yml
++++ b/versions.yml
+@@ -21,4 +21,4 @@ jruby:
+ #       bundler evaluates the gemspec via bin/logstash
+ # Ensure Jackson version here is kept in sync with version used by jrjackson gem
+ jrjackson: 0.4.6
+-jackson: 2.9.5
++jackson: 2.9.8

SPECS/logstash/logstash.spec

@@ -1,7 +1,7 @@
 Summary:	Logstash is a tool for managing events and logs.
 Name:           logstash
 Version:        6.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        Apache License Version 2.0
 Group:          Applications/System
 Vendor:         VMware, Inc.
@@ -12,6 +12,7 @@ Source0:        %{name}-%{version}.tar.gz
 Source1:        %{name}.service
 Source2:        %{name}.conf
 BuildArch:      x86_64
+Patch0:         logstash-update-java-dependencies.patch
 BuildRequires:	openjdk8
 BuildRequires:	ruby
 BuildRequires:  git
@@ -29,6 +30,7 @@ Logstash is a server-side data processing pipeline that ingests data from a mult
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export OSS=true
@@ -113,6 +115,8 @@ fi
 %attr(-,logstash,logstash) /var/log/%{name}
 
 %changelog
+*   Wed Mar 20 2019 Ankit Jain <[email protected]> 6.4.3-2
+-   Updated java dependencies
 *   Mon Feb 11 2019 Siju Maliakkal <[email protected]> 6.4.3-1
 -   Upgrade to 6.4.3 for kibana,elasticsearch compatibility
 *   Thu Jan 24 2019 Siju Maliakkal <[email protected]> 6.4.1-1