From eb38b1179807a77227c4ed72e55bb97ecae86b82 Mon Sep 17 00:00:00 2001
From: Manu Sridharan <msridhar@gmail.com>
Date: Sat, 25 Jul 2026 17:09:46 -0700
Subject: [PATCH] Update to latest Shadow plugin

---
 gradle/libs.versions.toml                         | 2 +-
 jar-infer/jar-infer-cli/build.gradle              | 5 ++++-
 jdk-annotations/astubx-generator-cli/build.gradle | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 70c02fb607..f800d7cb21 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ android-gradle-plugin = "9.3.0"
 gradle-maven-publish-plugin = "0.34.0"
 spotless = "8.4.0"
 errorprone-plugin = "5.1.0"
-shadow = "8.3.8"
+shadow = "9.6.1"
 jmh = "0.7.3"
 versions-plugin = "0.53.0"
 shellcheck = "1.5.0"
diff --git a/jar-infer/jar-infer-cli/build.gradle b/jar-infer/jar-infer-cli/build.gradle
index c583ee9714..17e3710cdf 100644
--- a/jar-infer/jar-infer-cli/build.gradle
+++ b/jar-infer/jar-infer-cli/build.gradle
@@ -37,6 +37,9 @@ jar {
 
 shadowJar {
     mergeServiceFiles()
+    filesMatching("META-INF/services/**") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
     configurations = [
         project.configurations.runtimeClasspath
     ]
@@ -68,7 +71,7 @@ tasks.withType(PublishToMavenLocal) {
 publishing {
     publications {
         shadow(MavenPublication) { publication ->
-            project.shadow.component(publication)
+            from components.shadow
             // Since we are skipping the default maven publication, we append the `:sources` and
             // `:javadoc` artifacts here. They are also required for Maven Central validation.
             afterEvaluate {
diff --git a/jdk-annotations/astubx-generator-cli/build.gradle b/jdk-annotations/astubx-generator-cli/build.gradle
index 47a3aca9a6..95e5912324 100644
--- a/jdk-annotations/astubx-generator-cli/build.gradle
+++ b/jdk-annotations/astubx-generator-cli/build.gradle
@@ -28,6 +28,9 @@ jar{
 
 shadowJar {
     mergeServiceFiles()
+    filesMatching("META-INF/services/**") {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
     configurations = [
         project.configurations.runtimeClasspath
     ]