From 3248317eac3ffafdb5f83c898d6e07780c39511a Mon Sep 17 00:00:00 2001
From: Joao Duarte <jsvduarte@gmail.com>
Date: Tue, 9 Jun 2020 15:23:35 +0100
Subject: [PATCH] upgrade google-java-format to 1.8

---
 logstash-core/build.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle
index 7555176cd..53f0b359d 100644
--- a/logstash-core/build.gradle
+++ b/logstash-core/build.gradle
@@ -171,10 +171,7 @@ dependencies {
         api files(customJRubyDir + "/maven/jruby-complete/target/jruby-complete-${customJRubyVersion}.jar")
     }
     implementation group: 'com.google.guava', name: 'guava', version: '24.1.1-jre'
-    // WARNING: DO NOT UPGRADE "google-java-format"
-    // later versions require GPL licensed code in javac-shaded that is
-    // Apache2 incompatible
-    implementation('com.google.googlejavaformat:google-java-format:1.1') {
+    implementation('com.google.googlejavaformat:google-java-format:1.8') {
         exclude group: 'com.google.guava', module: 'guava'
     }
     implementation 'org.javassist:javassist:3.26.0-GA'