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

Fix DRA dependenciesInfo task dependency resolution (#129209)

Browse source
This commit is contained in:
Rene Groeschke 2025-06-10 20:06:24 +02:00 • committed by GitHub
parent 1d9b0a6009
commit 1e13409049
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoPlugin.java
View file

@ -15,9 +15,13 @@ import org.gradle.api.Plugin;
import org.gradle.api.Project; import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Configuration;
import org.gradle.api.attributes.Category; import org.gradle.api.attributes.Category;
import org.gradle.api.attributes.Usage;
import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.plugins.JavaPlugin;
public class DependenciesInfoPlugin implements Plugin<Project> { public class DependenciesInfoPlugin implements Plugin<Project> {
public static String USAGE_ATTRIBUTE = "DependenciesInfo";
@Override @Override
public void apply(final Project project) { public void apply(final Project project) {
project.getPlugins().apply(CompileOnlyResolvePlugin.class); project.getPlugins().apply(CompileOnlyResolvePlugin.class);
@ -43,6 +47,9 @@ public class DependenciesInfoPlugin implements Plugin<Project> {
) )
); );
dependenciesInfoFilesConfiguration.attributes(
attributes -> attributes.attribute(Usage.USAGE_ATTRIBUTE, project.getObjects().named(Usage.class, USAGE_ATTRIBUTE))
);
project.getArtifacts().add("dependenciesInfoFiles", depsInfo); project.getArtifacts().add("dependenciesInfoFiles", depsInfo);
} }

3
distribution/build.gradle
View file

@ -31,6 +31,9 @@ configurations {
attributes { attributes {
attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.DOCUMENTATION)) attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.DOCUMENTATION))
} }
attributes {
attribute(Usage.USAGE_ATTRIBUTE, project.getObjects().named(Usage.class, DependenciesInfoPlugin.USAGE_ATTRIBUTE))
}
} }
featuresMetadata { featuresMetadata {
attributes { attributes {