From 6ba227d3532381a6e1f1957be032f906413104d4 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Fri, 17 May 2024 11:04:35 +0200
Subject: [PATCH 1/2] Fix deprecations for Gradle 8.7

---
 build.gradle | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 70d11df..d104f57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,28 @@
 import java.nio.file.Files
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
 
+buildscript {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    // dependencies {
+    //     classpath 'com.github.johnrengelman:shadow:8.1.1'
+    // }
+}
+
+plugins {
+  id 'com.github.johnrengelman.shadow' version '8.1.1'
+  id 'java'
+}
+
 ext {
-  snakeYamlVersion = '2.2'
+    snakeYamlVersion = '2.2'
+    shadowGradlePluginVersion = '8.1.1'
 }
 
-apply plugin: 'java'
+
 apply from: LOGSTASH_CORE_PATH + "/../rubyUtils.gradle"
 
 // ===========================================================================
@@ -24,29 +41,19 @@ pluginInfo.pluginClass     = "JavaInputExample"
 pluginInfo.pluginName      = "java_input_example" // must match the @LogstashPlugin annotation in the main plugin class
 // ===========================================================================
 
-sourceCompatibility = 11
-targetCompatibility = 11
-
-buildscript {
-    repositories {
-        mavenCentral()
-        gradlePluginPortal()
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.github.johnrengelman:shadow:8.1.1'
-    }
+java {
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
 }
 
+
 repositories {
     mavenCentral()
 }
 
-apply plugin: 'com.github.johnrengelman.shadow'
 
 shadowJar {
-    archiveClassifier = null
+    archiveClassifier.set('')
 }
 
 dependencies {

From 0a11d178b78a0872b6e0406fc876e28b3675b71c Mon Sep 17 00:00:00 2001
From: Andrea Selva <selva.andre@gmail.com>
Date: Tue, 21 May 2024 11:22:29 +0200
Subject: [PATCH 2/2] Remove commented code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
---
 build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index d104f57..9611ece 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,10 +6,6 @@ buildscript {
         mavenCentral()
         gradlePluginPortal()
     }
-
-    // dependencies {
-    //     classpath 'com.github.johnrengelman:shadow:8.1.1'
-    // }
 }
 
 plugins {