github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Gradle] Update shadow plugin (#116826) (#116876)

Browse source 
- The shadow plugin has changed ownership and plugin id.
- Make some formatting of poms more reproducible

(cherry picked from commit def490ef85)
This commit is contained in:
Rene Groeschke 2024-11-16 15:06:40 +01:00 • committed by GitHub
parent cc13f38b43
commit 28b2f5248f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 135 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build-conventions/build.gradle
View file

@ -12,9 +12,6 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
buildscript {
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
}
}
@ -70,10 +67,6 @@ gradlePlugin {
}
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
gradlePluginPortal()
}

43
build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java
View file

@ -9,15 +9,19 @@
package org.elasticsearch.gradle.internal.conventions;
import org.elasticsearch.gradle.internal.conventions.precommit.PomValidationPrecommitPlugin;
import groovy.util.Node;
import com.github.jengelman.gradle.plugins.shadow.ShadowExtension;
import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin;
import groovy.util.Node;
import org.elasticsearch.gradle.internal.conventions.util.Util;
import org.elasticsearch.gradle.internal.conventions.info.GitInfo;
import org.elasticsearch.gradle.internal.conventions.precommit.PomValidationPrecommitPlugin;
import org.elasticsearch.gradle.internal.conventions.util.Util;
import org.gradle.api.Action;
import org.gradle.api.NamedDomainObjectSet;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.XmlProvider;
import org.gradle.api.file.ProjectLayout;
import org.gradle.api.plugins.BasePlugin;
@ -35,11 +39,12 @@ import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.bundling.Jar;
import org.gradle.initialization.layout.BuildLayout;
import org.gradle.language.base.plugins.LifecycleBasePlugin;
import org.w3c.dom.Element;
import javax.inject.Inject;
import java.io.File;
import java.util.Map;
import java.util.concurrent.Callable;
import javax.inject.Inject;
public class PublishPlugin implements Plugin<Project> {
@ -113,19 +118,22 @@ public class PublishPlugin implements Plugin<Project> {
var archivesBaseName = providerFactory.provider(() -> getArchivesBaseName(extensions));
var projectVersion = providerFactory.provider(() -> project.getVersion());
var generateMavenPoms = project.getTasks().withType(GenerateMavenPom.class);
generateMavenPoms.configureEach(
pomTask -> pomTask.setDestination(
generateMavenPoms.configureEach(pomTask -> {
pomTask.setDestination(
(Callable<String>) () -> String.format(
"%s/distributions/%s-%s.pom",
projectLayout.getBuildDirectory().get().getAsFile().getPath(),
archivesBaseName.get(),
projectVersion.get()
)
)
);
);
pomTask.doFirst(t -> pomTask.getPom().withXml(xml -> formatDependencies(xml)));
});
var publishing = extensions.getByType(PublishingExtension.class);
final var mavenPublications = publishing.getPublications().withType(MavenPublication.class);
addNameAndDescriptiontoPom(project, mavenPublications);
addNameAndDescriptionToPom(project, mavenPublications);
mavenPublications.configureEach(publication -> {
// Add git origin info to generated POM files for internal builds
publication.getPom().withXml(xml -> addScmInfo(xml, gitInfo.get()));
@ -135,11 +143,26 @@ public class PublishPlugin implements Plugin<Project> {
});
}
private void addNameAndDescriptiontoPom(Project project, NamedDomainObjectSet<MavenPublication> mavenPublications) {
/**
* just ensure we put dependencies to the end. more a cosmetic thing than anything else
* */
private void formatDependencies(XmlProvider xml) {
Element rootElement = xml.asElement();
var dependencies = rootElement.getElementsByTagName("dependencies");
if (dependencies.getLength() == 1 && dependencies.item(0) != null) {
org.w3c.dom.Node item = dependencies.item(0);
rootElement.removeChild(item);
rootElement.appendChild(item);
}
}
private void addNameAndDescriptionToPom(Project project, NamedDomainObjectSet<MavenPublication> mavenPublications) {
var name = project.getName();
var description = providerFactory.provider(() -> project.getDescription() != null ? project.getDescription() : "");
mavenPublications.configureEach(p -> p.getPom().withXml(xml -> {
var root = xml.asNode();
// Node versionNode = root.get("version");
// versionNode.plus(1, "name", name);
root.appendNode("name", name);
root.appendNode("description", description.get());
}));

3
build-tools-internal/build.gradle
View file

@ -258,9 +258,6 @@ tasks.named('licenseHeaders').configure {
*****************************************************************************/
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
gradlePluginPortal()
}

3
build-tools-internal/settings.gradle
View file

@ -1,8 +1,5 @@
pluginManagement {
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
gradlePluginPortal()
}

2
build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchJavadocPluginFuncTest.groovy
View file

@ -73,7 +73,7 @@ class ElasticsearchJavadocPluginFuncTest extends AbstractGradleFuncTest {
buildFile << """
plugins {
id 'elasticsearch.java-doc'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'com.gradleup.shadow'
id 'java'
}
group = 'org.acme.depending'

19
build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy
View file

@ -96,7 +96,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
plugins {
id 'elasticsearch.java'
id 'elasticsearch.publish'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}
repositories {
@ -117,7 +117,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
}
version = "1.0"
group = 'org.acme'
description = 'some description'
description = 'shadowed project'
"""
when:
@ -137,7 +137,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
<artifactId>hello-world</artifactId>
<version>1.0</version>
<name>hello-world</name>
<description>some description</description>
<description>shadowed project</description>
<url>unknown</url>
<scm>
<url>unknown</url>
@ -186,7 +186,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
plugins {
id 'elasticsearch.java'
id 'elasticsearch.publish'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}
dependencies {
@ -206,7 +206,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
group = 'org.acme'
}
description = 'some description'
description = 'with shadowed dependencies'
"""
when:
@ -226,7 +226,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
<artifactId>hello-world</artifactId>
<version>1.0</version>
<name>hello-world</name>
<description>some description</description>
<description>with shadowed dependencies</description>
<url>unknown</url>
<scm>
<url>unknown</url>
@ -277,13 +277,13 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
plugins {
id 'elasticsearch.internal-es-plugin'
id 'elasticsearch.publish'
id 'com.github.johnrengelman.shadow'
id 'com.gradleup.shadow'
}
esplugin {
name = 'hello-world-plugin'
classname 'org.acme.HelloWorldPlugin'
description = "custom project description"
description = "shadowed es plugin"
}
publishing {
@ -324,7 +324,7 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
<artifactId>hello-world-plugin</artifactId>
<version>1.0</version>
<name>hello-world</name>
<description>custom project description</description>
<description>shadowed es plugin</description>
<url>unknown</url>
<scm>
<url>unknown</url>
@ -353,7 +353,6 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
<url>https://www.elastic.co</url>
</developer>
</developers>
<dependencies/>
</project>"""
)
}

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaPlugin.java
View file

@ -82,7 +82,7 @@ public class ElasticsearchJavaPlugin implements Plugin<Project> {
}
});
});
project.getPluginManager().withPlugin("com.github.johnrengelman.shadow", p -> {
project.getPluginManager().withPlugin("com.gradleup.shadow", p -> {
project.getTasks().withType(ShadowJar.class).configureEach(shadowJar -> {
/*
* Replace the default "-all" classifier with null

2
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java
View file

@ -193,7 +193,7 @@ public abstract class ElasticsearchTestBasePlugin implements Plugin<Project> {
* If this project builds a shadow JAR than any unit tests should test against that artifact instead of
* compiled class output and dependency jars. This better emulates the runtime environment of consumers.
*/
project.getPluginManager().withPlugin("com.github.johnrengelman.shadow", p -> {
project.getPluginManager().withPlugin("com.gradleup.shadow", p -> {
if (test.getName().equals(JavaPlugin.TEST_TASK_NAME)) {
// Remove output class files and any other dependencies from the test classpath, since the shadow JAR includes these
SourceSetContainer sourceSets = project.getExtensions().getByType(SourceSetContainer.class);

6
build-tools/build.gradle
View file

@ -9,9 +9,6 @@
buildscript {
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
}
}
@ -117,9 +114,6 @@ configurations {
}
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
gradlePluginPortal()
}

2
build-tools/src/main/java/org/elasticsearch/gradle/plugin/BasePluginBuildPlugin.java
View file

@ -167,7 +167,7 @@ public class BasePluginBuildPlugin implements Plugin<Project> {
copySpec.exclude("plugin-security.codebases");
});
bundleSpec.from(
(Callable<TaskProvider<Task>>) () -> project.getPluginManager().hasPlugin("com.github.johnrengelman.shadow")
(Callable<TaskProvider<Task>>) () -> project.getPluginManager().hasPlugin("com.gradleup.shadow")
? project.getTasks().named("shadowJar")
: project.getTasks().named("jar")
);

4
build.gradle
View file

@ -29,10 +29,6 @@ import static org.elasticsearch.gradle.util.GradleUtils.maybeConfigure
buildscript {
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
}
}

2
gradle/build.versions.toml
View file

@ -39,7 +39,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.github.breskeby:shadow:3b035f2"
shadow-plugin = "com.gradleup.shadow:shadow-gradle-plugin:8.3.5"
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" }

90
gradle/verification-metadata.xml
View file

@ -409,21 +409,16 @@
<sha256 value="b2bd29c31fda49a9b28a22b9e5c2b26443bcfa99c1a28eab70ab9c7d349b5002" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.woodstox" name="woodstox-core" version="6.5.1">
<artifact name="woodstox-core-6.5.1.jar">
<sha256 value="c928d60665c6415fb1c39775cf95cfc44f7f4580cf5ab01b1c380ebffd76887f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.fasterxml.woodstox" name="woodstox-core" version="6.7.0">
<artifact name="woodstox-core-6.7.0.jar">
<sha256 value="81cdeef50567735bda9f6b4aabe0cc0a3f6c04f15569192bc6505393d2612c25" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.breskeby" name="shadow" version="3b035f2">
<artifact name="shadow-3b035f2.jar">
<sha256 value="fb53bbff0eeb6835ad0712d22d945ad49524922956dd1d89bd487344d228f339" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.breskeby.shadow" name="shadow" version="3b035f2">
<artifact name="shadow-3b035f2.jar">
<sha256 value="9c3ca9918ae9fc42bc7e4d5f5259ec902ca6f1be06aaa6e66e94c21dcef4a617" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.github.docker-java" name="docker-java-api" version="3.3.4">
<artifact name="docker-java-api-3.3.4.jar">
<sha256 value="650710c70160c1c651e4586a07e55c5f564436cf1f28d83737265ceb5d67696f" origin="Generated by Gradle"/>
@ -794,6 +789,11 @@
<sha256 value="0adf32afef4ae46a131367e393d18a5d9529750dfd1432287797a64b2c36c7ef" origin="Generated by Gradle"/>
</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.h2database" name="h2" version="1.4.197">
<artifact name="h2-1.4.197.jar">
<sha256 value="37f5216e14af2772930dff9b8734353f0a80e89ba3f33e065441de6537c5e842" origin="Generated by Gradle"/>
@ -1231,6 +1231,11 @@
<sha256 value="a58af12ee1b68cfd2ebb0c27caef164f084381a00ec81a48cc275fd7ea54e154" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.17.0">
<artifact name="commons-io-2.17.0.jar">
<sha256 value="4aa4ca48f3dfd30b78220b7881d8cb93eac4093ec94361b6befa9487998a550b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-io" name="commons-io" version="2.2">
<artifact name="commons-io-2.2.jar">
<sha256 value="675f60bd11a82d481736591fe4054c66471fa5463d45616652fd71585792ba87" origin="Generated by Gradle"/>
@ -1917,6 +1922,11 @@
<sha256 value="befbfc79e744e9892cfa7db96df3b6e82dc17d2571af42aa427976fc22299838" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant" version="1.10.15">
<artifact name="ant-1.10.15.jar">
<sha256 value="763acda4a69588c9ea8817a952851ff0c2fc4bffa1d081c2565dc407f29d5794" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant-launcher" version="1.10.11">
<artifact name="ant-launcher-1.10.11.jar">
<sha256 value="dab530df7a980b5ac8fd7e8d208243ae0d3ebd6de09b1aa2ce756360cc2ed256" origin="Generated by Gradle"/>
@ -1932,6 +1942,11 @@
<sha256 value="cd7695b3bfb6964ab71b6a0b31dad60005ae77fe502132364679aacf08f77970" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.ant" name="ant-launcher" version="1.10.15">
<artifact name="ant-launcher-1.10.15.jar">
<sha256 value="5c8551990307a032336d98ddaed549a39a689f07d4d4c6b950601bf22b3d6a1b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.arrow" name="arrow-format" version="16.1.0">
<artifact name="arrow-format-16.1.0.jar">
<sha256 value="ad97e0fc72e193b1de3cbce4818d1ff16e81673fd523d001e8d2774bde40ee6c" origin="Generated by Gradle"/>
@ -2805,6 +2820,11 @@
<sha256 value="2f43eea679ea66f14ca0f13fec2a8600ac124f5a5231dcb4df8393eddcb97550" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-api" version="2.24.1">
<artifact name="log4j-api-2.24.1.jar">
<sha256 value="6e77bb229fc8dcaf09038beeb5e9030b22e9e01b51b458b0183ce669ebcc92ef" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-core" version="2.17.1">
<artifact name="log4j-core-2.17.1.jar">
<sha256 value="c967f223487980b9364e94a7c7f9a8a01fd3ee7c19bdbf0b0f9f8cb8511f3d41" origin="Generated by Gradle"/>
@ -2825,6 +2845,11 @@
<sha256 value="6137df848cdaed9f4d5076f75513c6c85da80b953f4e7acca38098b770763f55" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-core" version="2.24.1">
<artifact name="log4j-core-2.24.1.jar">
<sha256 value="00bcf388472ca80a687014181763b66d777177f22cbbf179fd60e1b1ac9bc9b0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.logging.log4j" name="log4j-jcl" version="2.19.0">
<artifact name="log4j-jcl-2.19.0.jar">
<sha256 value="47f768ffd66107a66f0c2a19445ab1e42ce6719a7f30f9aa9ef96157c83949fd" origin="Generated by Gradle"/>
@ -2960,6 +2985,16 @@
<sha256 value="47d4e1f47ebd26117d47af8fbff471c116c571fd7d7bd6cb199d89f8454e5cf0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.maven" name="maven-api-meta" version="4.0.0-alpha-9">
<artifact name="maven-api-meta-4.0.0-alpha-9.jar">
<sha256 value="32c4f5cadbab680c34952f9cb570457a1383ccec4c9a57b0392607d7191c6949" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.maven" name="maven-api-xml" version="4.0.0-alpha-9">
<artifact name="maven-api-xml-4.0.0-alpha-9.jar">
<sha256 value="29b2628d0f028119715916849c19eed45b32cdc67eb13551798c73afa4aa23d6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.maven" name="maven-artifact" version="3.6.1">
<artifact name="maven-artifact-3.6.1.jar">
<sha256 value="797fa1bcf54d7216e863b8177c04507d09c708eec153626eca473054c0eb56f3" origin="Generated by Gradle"/>
@ -3015,6 +3050,11 @@
<sha256 value="2d669935e1069c2e9566f3cc81dd5da80b170ac64d09597f6ef7de2f1ff1b149" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.maven" name="maven-xml-impl" version="4.0.0-alpha-9">
<artifact name="maven-xml-impl-4.0.0-alpha-9.jar">
<sha256 value="26e702b881d57ae4ee88d02c00940ba64063705ee69205ae8958bf839a8b06b1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.maven.resolver" name="maven-resolver-api" version="1.3.3">
<artifact name="maven-resolver-api-1.3.3.jar">
<sha256 value="eea947a6f7d7f60b0f62db07bf43fccad6cb1ab6b7928cbc5e1c60c2d89d33fa" origin="Generated by Gradle"/>
@ -3388,6 +3428,16 @@
<sha256 value="86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus.plexus" name="plexus-utils" version="4.0.2">
<artifact name="plexus-utils-4.0.2.jar">
<sha256 value="8957274e75fe2c278b1428dd16a0daeee1dd38152cb6eff816177ac28fccb697" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus.plexus" name="plexus-xml" version="4.0.4">
<artifact name="plexus-xml-4.0.4.jar">
<sha256 value="069e78b537108dc6124a67073fc998264791f6b6499e955a38e72bb3e4fe1adf" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.codehaus.woodstox" name="stax2-api" version="4.2.1">
<artifact name="stax2-api-4.2.1.jar">
<sha256 value="678567e48b51a42c65c699f266539ad3d676d4b1a5b0ad7d89ece8b9d5772579" origin="Generated by Gradle"/>
@ -4148,6 +4198,11 @@
<sha256 value="adf46d5e34940bdf148ecdd26a9ee8eea94496a72034ff7141066b3eea5c4e9d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm" version="9.7.1">
<artifact name="asm-9.7.1.jar">
<sha256 value="8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-analysis" version="7.2">
<artifact name="asm-analysis-7.2.jar">
<sha256 value="be922aae60ff1ff1768e8e6544a38a7f92bd0a6d6b0b9791f94955d1bd453de2" origin="Generated by Gradle"/>
@ -4193,6 +4248,11 @@
<sha256 value="389bc247958e049fc9a0408d398c92c6d370c18035120395d4cba1d9d9304b7a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-commons" version="9.7.1">
<artifact name="asm-commons-9.7.1.jar">
<sha256 value="9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-tree" version="7.2">
<artifact name="asm-tree-7.2.jar">
<sha256 value="c063f5a67fa03cdc9bd79fd1c2ea6816cc4a19473ecdfbd9e9153b408c6f2656" origin="Generated by Gradle"/>
@ -4233,6 +4293,11 @@
<sha256 value="62f4b3bc436045c1acb5c3ba2d8ec556ec3369093d7f5d06c747eb04b56d52b1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-tree" version="9.7.1">
<artifact name="asm-tree-9.7.1.jar">
<sha256 value="9929881f59eb6b840e86d54570c77b59ce721d104e6dfd7a40978991c2d3b41f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.ow2.asm" name="asm-util" version="7.2">
<artifact name="asm-util-7.2.jar">
<sha256 value="6e24913b021ffacfe8e7e053d6e0ccc731941148cfa078d4f1ed3d96904530f8" origin="Generated by Gradle"/>
@ -4418,6 +4483,11 @@
<sha256 value="374fe02a09314da6ec8219e005598e760323a1abe4b715cc33ce3e2a9bcda932" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.vafer" name="jdependency" version="2.11">
<artifact name="jdependency-2.11.jar">
<sha256 value="cdda03003fa9551315a4cc3fc163f18495f191b49a8f70a3aae232f049a7fdd0" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.vafer" name="jdependency" version="2.7.0">
<artifact name="jdependency-2.7.0.jar">
<sha256 value="d63efd5746ff408943a7dd7ef85ae9f09aa7fb63bb2b16911427ce6c45b59fd0" origin="Generated by Gradle"/>

2
plugins/repository-hdfs/hadoop-client-api/build.gradle
View file

@ -1,5 +1,5 @@
apply plugin: 'elasticsearch.build'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
dependencies {
implementation "org.apache.hadoop:hadoop-client-api:${project.parent.versions.hadoop}"

3
settings.gradle
View file

@ -4,9 +4,6 @@ import org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
pluginManagement {
repositories {
maven {
url 'https://jitpack.io'
}
mavenCentral()
gradlePluginPortal()
}

2
test/fixtures/hdfs-fixture/build.gradle vendored
View file

@ -8,7 +8,7 @@
*/
apply plugin: 'elasticsearch.java'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

2
x-pack/libs/es-opensaml-security-api/build.gradle
View file

@ -7,7 +7,7 @@
apply plugin: 'elasticsearch.build'
apply plugin: 'elasticsearch.publish'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
dependencies {
implementation "org.opensaml:opensaml-security-api:${versions.opensaml}"

2
x-pack/plugin/security/lib/nimbus-jose-jwt-modified-part1/build.gradle
View file

@ -6,7 +6,7 @@
*/
apply plugin: 'elasticsearch.build'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
// See the build.gradle file in the parent directory for an explanation of this unusual build

2
x-pack/plugin/security/lib/nimbus-jose-jwt-modified-part2/build.gradle
View file

@ -6,7 +6,7 @@
*/
apply plugin: 'elasticsearch.build'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
// See the build.gradle file in the parent directory for an explanation of this unusual build

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

@ -6,7 +6,7 @@
*/
apply plugin: 'elasticsearch.build'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
// See the build.gradle file in the parent directory for an explanation of this unusual build

2
x-pack/plugin/sql/jdbc/build.gradle
View file

@ -1,6 +1,6 @@
apply plugin: 'elasticsearch.build'
apply plugin: 'elasticsearch.publish'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
description = 'JDBC driver for Elasticsearch'

2
x-pack/plugin/sql/sql-cli/build.gradle
View file

@ -8,7 +8,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams
*/
apply plugin: 'elasticsearch.build'
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.gradleup.shadow'
/* We don't use the 'application' plugin because it builds a zip and tgz which
* we don't want. */