Update shadow plugin for Gradle 9.0 compatibility

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/shadow/XmlClassRelocationTransformer.java

@@ -10,11 +10,11 @@
 package org.elasticsearch.gradle.internal.shadow;
 
 //import com.github.jengelman.gradle.plugins.shadow.ShadowStats;
-import com.github.jengelman.gradle.plugins.shadow.relocation.RelocateClassContext;
+
 import com.github.jengelman.gradle.plugins.shadow.relocation.RelocateClassContext;
 import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator;
-import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext;
 import com.github.jengelman.gradle.plugins.shadow.transformers.ResourceTransformer;
+import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.tools.zip.ZipEntry;
@@ -27,7 +27,6 @@
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.List;
 import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -74,7 +73,6 @@ public void transform(TransformerContext context) {
 
     private static String getRelocatedClass(String className, TransformerContext context) {
         Set<Relocator> relocators = context.getRelocators();
-//        ShadowStats stats = context.getStats();
         if (className != null && className.length() > 0 && relocators != null) {
             for (Relocator relocator : relocators) {
                 if (relocator.canRelocateClass(className)) {
@@ -113,7 +111,9 @@ public boolean hasTransformedResource() {
     @Override
     public void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) {
         ZipEntry entry = new ZipEntry(resource);
-        entry.setTime(TransformerContext.getEntryTimestamp(preserveFileTimestamps, entry.getTime()));
+        if (preserveFileTimestamps) {
+            entry.setTime(entry.getTime());
+        }
 
         try {
             // Write the content back to the XML file

gradle/build.versions.toml

@@ -38,7 +38,7 @@ maven-model = "org.apache.maven:maven-model:3.6.2"
 mockito-core = "org.mockito:mockito-core:1.9.5"
 nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3"
 reflections = "org.reflections:reflections:0.9.12"
-shadow-plugin = "com.gradleup.shadow:shadow-gradle-plugin:9.0.0-beta12"
+shadow-plugin = "com.gradleup.shadow:shadow-gradle-plugin:9.0.0-beta15"
 snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.0" } }
 spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
 spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }

gradle/verification-metadata.xml

@@ -878,44 +878,9 @@
             </sha256>
          </artifact>
       </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="8.3.5">
-         <artifact name="shadow-gradle-plugin-8.3.5.jar">
-            <sha256 value="54e08dd20a82775e3317a4725a1a5e4ec8b1b1c0f346de702a49d9ed4815b735" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta1">
-         <artifact name="shadow-gradle-plugin-9.0.0-beta1.jar">
-            <sha256 value="43dc8ff22a743bcb0a7066a49e6daae5012a7504f831b026cefa8e9af705c65f" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta10">
-         <artifact name="shadow-gradle-plugin-9.0.0-beta10.jar">
-            <sha256 value="ba80f3262a36bb5961d99353e0dda0175891d58dafdda6f23ef50c8c0fad3dc8" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta12">
-         <artifact name="shadow-gradle-plugin-9.0.0-beta12.jar">
-            <sha256 value="e4c9dd1624811182a10acd8ab21c4a1443ea861fc3abb36bfa18d66b3974f050" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta13">
-         <artifact name="shadow-gradle-plugin-9.0.0-beta13.jar">
-            <sha256 value="ad780bd6d9f70b42aa497a0fb0eb432283ead96ed973c55f2bd6396a66892c23" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta5">
-         <artifact name="shadow-gradle-plugin-9.0.0-beta5.jar">
-            <sha256 value="d036170aa3e86f11e1c46be2e32229f084848cb53dc27c866e02bde9c7778b57" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta8">
-         <artifact name="shadow-gradle-plugin-9.0.0-beta8.jar">
-            <sha256 value="d2fd9d70a68268267e33bfcdad23a8bc98e83255640c46e65b4c9af331221d2d" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta9">
-         <artifact name="shadow-gradle-plugin-9.0.0-beta9.jar">
-            <sha256 value="fa3cbf876f3c0474aae790b62445406addf4817fccb3dbe01a6dbc3896834f11" origin="Generated by Gradle"/>
+      <component group="com.gradleup.shadow" name="shadow-gradle-plugin" version="9.0.0-beta15">
+         <artifact name="shadow-gradle-plugin-9.0.0-beta15.jar">
+            <sha256 value="fbf17c89d13462d6caa97616c7e6428d96e424fe20c669790dd35c4c961bc053" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.h2database" name="h2" version="1.4.197">

x-pack/plugin/security/lib/nimbus-jose-jwt-modified/build.gradle

@@ -20,6 +20,7 @@ tasks.named('shadowJar').configure {
     // The original library uses this and it gets stripped by shadowJar
     attributes 'Automatic-Module-Name': 'com.nimbusds.jose.jwt'
   }
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 ['jarHell', 'thirdPartyAudit', 'forbiddenApisMain', 'splitPackagesAudit', 'licenseHeaders'].each {