diff --git a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java index 0ccb05e722447..1b5dad2f3a3ec 100644 --- a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java +++ b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java @@ -12,7 +12,6 @@ import groovy.util.Node; import nmcp.NmcpPlugin; -import com.github.jengelman.gradle.plugins.shadow.ShadowExtension; import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin; import org.elasticsearch.gradle.internal.conventions.info.GitInfo; @@ -173,8 +172,7 @@ private void addNameAndDescriptionToPom(Project project, NamedDomainObjectSet relocators = context.getRelocators(); - ShadowStats stats = context.getStats(); + Set relocators = context.getRelocators(); if (className != null && className.length() > 0 && relocators != null) { for (Relocator relocator : relocators) { if (relocator.canRelocateClass(className)) { - RelocateClassContext relocateClassContext = new RelocateClassContext(className, stats); + RelocateClassContext relocateClassContext = new RelocateClassContext(className); return relocator.relocateClass(relocateClassContext); } } @@ -111,8 +109,6 @@ public boolean hasTransformedResource() { @Override public void modifyOutputStream(ZipOutputStream os, boolean preserveFileTimestamps) { ZipEntry entry = new ZipEntry(resource); - entry.setTime(TransformerContext.getEntryTimestamp(preserveFileTimestamps, entry.getTime())); - try { // Write the content back to the XML file TransformerFactory transformerFactory = TransformerFactory.newInstance(); diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java index 5d7386e2c2150..7120a5f907ddb 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/DependenciesUtils.java @@ -66,7 +66,7 @@ public static FileCollection thirdPartyDependenciesView(Configuration configurat .stream() .filter(dep -> dep instanceof ResolvedDependencyResult) .map(dep -> (ResolvedDependencyResult) dep) - .filter(dep -> dep.getResolvedVariant().getDisplayName() == ShadowBasePlugin.COMPONENT_NAME) + .filter(dep -> dep.getResolvedVariant().getDisplayName() == ShadowBasePlugin.SHADOW) .filter(dep -> dep.getSelected() instanceof ResolvedComponentResult) .map(dep -> dep.getSelected().getId()) .collect(Collectors.toSet()) diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 01a64982a1f60..f4f8fd1bca8ea 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -40,7 +40,7 @@ mockito-core = "org.mockito:mockito-core:1.9.5" nmcp = { group = "com.gradleup.nmcp", name = "nmcp", version.ref="nmcp" } 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:8.3.5" +shadow-plugin = "com.gradleup.shadow:shadow-gradle-plugin:9.0.1" 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" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index e8be371431655..b3413a72885cc 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -451,6 +451,11 @@ + + + + + @@ -918,9 +923,9 @@ - - - + + + @@ -1443,6 +1448,11 @@ + + + + + @@ -3068,6 +3078,11 @@ + + + + + @@ -3093,6 +3108,11 @@ + + + + + @@ -3228,6 +3248,11 @@ + + + + + @@ -3238,6 +3263,11 @@ + + + + + @@ -3308,6 +3338,11 @@ + + + + + @@ -3741,6 +3776,11 @@ + + + + + @@ -4696,6 +4736,11 @@ + + + + + @@ -4951,6 +4996,11 @@ + + + + + diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index b716659648cf1..4c8e145f19551 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -148,6 +148,7 @@ tasks.named("shadowJar").configure { relocate("org.apache.hadoop", "fixture.hdfs3.org.apache.hadoop") { exclude "org.apache.hadoop.hdfs.protocol.ClientProtocol" exclude "org.apache.hadoop.ipc.StandbyException" + exclude "org.apache.hadoop.application-classloader.properties" } configurations.add(project.configurations.hdfs3) } @@ -156,6 +157,7 @@ def hdfs2Jar = tasks.register("hdfs2jar", ShadowJar) { relocate("org.apache.hadoop", "fixture.hdfs2.org.apache.hadoop") { exclude "org.apache.hadoop.hdfs.protocol.ClientProtocol" exclude "org.apache.hadoop.ipc.StandbyException" + exclude "org.apache.hadoop.application-classloader.properties" } archiveClassifier.set("hdfs2") from sourceSets.main.output @@ -173,6 +175,10 @@ tasks.withType(ShadowJar).configureEach { exclude(dependency('com.fasterxml.jackson.core:.*:.*')) } + filesMatching("META-INF/services/**") { + duplicatesStrategy = DuplicatesStrategy.INCLUDE // Or something else. + } + transform(org.elasticsearch.gradle.internal.shadow.XmlClassRelocationTransformer.class) { resource = "core-default.xml" enabled = true