Browse code
logstash: Updated java dependencies
Added a upstream patch to update the
java dependencies
Change-Id: I08b25579b1d10a099669c3ca6eb887b20a1f6dc1
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6670
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Ankit Jain authored on 2019/02/12 02:48:59Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,71 @@ |
| 0 |
+From e6d59de458b10795e18070176ca215aaecf3d68e Mon Sep 17 00:00:00 2001 |
|
| 1 |
+From: Dan Hermann <danhermann@users.noreply.github.com> |
|
| 2 |
+Date: Fri, 18 Jan 2019 08:16:13 -0600 |
|
| 3 |
+Subject: [PATCH] Update java dependencies (#10340) |
|
| 4 |
+ |
|
| 5 |
+--- |
|
| 6 |
+ build.gradle | 2 +- |
|
| 7 |
+ logstash-core/build.gradle | 16 ++++++++-------- |
|
| 8 |
+ versions.yml | 2 +- |
|
| 9 |
+ 3 files changed, 10 insertions(+), 10 deletions(-) |
|
| 10 |
+ |
|
| 11 |
+diff --git a/build.gradle b/build.gradle |
|
| 12 |
+index 3fda82e..691a1ad 100644 |
|
| 13 |
+--- a/build.gradle |
|
| 14 |
+@@ -6,7 +6,7 @@ buildscript {
|
|
| 15 |
+ } |
|
| 16 |
+ } |
|
| 17 |
+ dependencies {
|
|
| 18 |
+- classpath 'org.yaml:snakeyaml:1.17' |
|
| 19 |
++ classpath 'org.yaml:snakeyaml:1.23' |
|
| 20 |
+ classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1" |
|
| 21 |
+ } |
|
| 22 |
+ } |
|
| 23 |
+diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle |
|
| 24 |
+index e3baf6c..3ca3d18 100644 |
|
| 25 |
+--- a/logstash-core/build.gradle |
|
| 26 |
+@@ -118,15 +118,15 @@ def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property
|
|
| 27 |
+ def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim() |
|
| 28 |
+ |
|
| 29 |
+ dependencies {
|
|
| 30 |
+- compile 'org.apache.logging.log4j:log4j-api:2.9.1' |
|
| 31 |
+- compile 'org.apache.logging.log4j:log4j-core:2.9.1' |
|
| 32 |
+- runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1' |
|
| 33 |
++ compile 'org.apache.logging.log4j:log4j-api:2.11.1' |
|
| 34 |
++ compile 'org.apache.logging.log4j:log4j-core:2.11.1' |
|
| 35 |
++ runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' |
|
| 36 |
+ compile 'commons-codec:commons-codec:1.11' |
|
| 37 |
+ // Jackson version moved to versions.yml in the project root (the JrJackson version is there too) |
|
| 38 |
+ compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
|
|
| 39 |
+ compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
|
|
| 40 |
+ compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
|
|
| 41 |
+- compile 'org.codehaus.janino:janino:3.0.8' |
|
| 42 |
++ compile 'org.codehaus.janino:janino:3.0.11' |
|
| 43 |
+ compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
|
|
| 44 |
+ if (customJRubyDir == "") {
|
|
| 45 |
+ compile "org.jruby:jruby-complete:${jrubyVersion}"
|
|
| 46 |
+@@ -137,9 +137,9 @@ dependencies {
|
|
| 47 |
+ // Do not upgrade this, later versions require GPL licensed code in javac-shaded that is |
|
| 48 |
+ // Apache2 incompatible |
|
| 49 |
+ compile 'com.google.googlejavaformat:google-java-format:1.1' |
|
| 50 |
+- testCompile 'org.apache.logging.log4j:log4j-core:2.9.1:tests' |
|
| 51 |
++ testCompile 'org.apache.logging.log4j:log4j-core:2.11.1:tests' |
|
| 52 |
+ testCompile 'junit:junit:4.12' |
|
| 53 |
+- testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0' |
|
| 54 |
++ testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0' |
|
| 55 |
+ testCompile 'org.elasticsearch:securemock:1.2' |
|
| 56 |
+- testCompile 'org.assertj:assertj-core:3.8.0' |
|
| 57 |
++ testCompile 'org.assertj:assertj-core:3.11.1' |
|
| 58 |
+ } |
|
| 59 |
+diff --git a/versions.yml b/versions.yml |
|
| 60 |
+index d7f2572..85083a0 100644 |
|
| 61 |
+--- a/versions.yml |
|
| 62 |
+@@ -21,4 +21,4 @@ jruby: |
|
| 63 |
+ # bundler evaluates the gemspec via bin/logstash |
|
| 64 |
+ # Ensure Jackson version here is kept in sync with version used by jrjackson gem |
|
| 65 |
+ jrjackson: 0.4.6 |
|
| 66 |
+-jackson: 2.9.5 |
|
| 67 |
++jackson: 2.9.8 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Logstash is a tool for managing events and logs. |
| 2 | 2 |
Name: logstash |
| 3 | 3 |
Version: 6.4.1 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: Apache License Version 2.0 |
| 6 | 6 |
Group: Applications/System |
| 7 | 7 |
Vendor: VMware, Inc. |
| ... | ... |
@@ -11,6 +11,7 @@ Source0: %{name}-%{version}.tar.gz
|
| 11 | 11 |
%define sha1 %{name}-%{version}.tar.gz=8b35bfbe7657af4f61595301b0482f5f1b1460e0
|
| 12 | 12 |
Source1: %{name}.service
|
| 13 | 13 |
Source2: %{name}.conf
|
| 14 |
+Patch0: logstash-update-java-dependencies.patch |
|
| 14 | 15 |
BuildRequires: openjdk |
| 15 | 16 |
BuildRequires: ruby |
| 16 | 17 |
Requires: openjdk |
| ... | ... |
@@ -26,6 +27,7 @@ Logstash is a tool to collect, process, and forward events and log messages. Col |
| 26 | 26 |
|
| 27 | 27 |
%prep |
| 28 | 28 |
%setup -q |
| 29 |
+%patch0 -p1 |
|
| 29 | 30 |
|
| 30 | 31 |
%build |
| 31 | 32 |
export OSS=true |
| ... | ... |
@@ -112,6 +114,8 @@ fi |
| 112 | 112 |
%attr(-,logstash,logstash) /var/log/%{name}
|
| 113 | 113 |
|
| 114 | 114 |
%changelog |
| 115 |
+* Fri Feb 08 2019 Ankit Jain <ankitja@vmware.com> 6.4.1-2 |
|
| 116 |
+- Updated the Java dependencies |
|
| 115 | 117 |
* Wed Jan 23 2019 Siju Maliakkal <smaliakkal@vmware.com> 6.4.1-1 |
| 116 | 118 |
- Upgrade to 6.4.1 |
| 117 | 119 |
* Fri Nov 09 2018 Tapas Kundu <tkundu@vmware.com> 6.4.0-2 |