Skip to content

Commit 6fa7176

Browse files
committed
don't overload configuration names
1 parent b3979f1 commit 6fa7176

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesPlugin.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,16 @@ public void apply(Project project) {
9191
.register("copyYamlTestsTask", CopyRestTestsTask.class, task -> {
9292
task.includeCore.set(extension.restTests.getIncludeCore());
9393
task.includeXpack.set(extension.restTests.getIncludeXpack());
94-
task.coreConfig = project.getConfigurations().maybeCreate("restTests");
94+
task.coreConfig = project.getConfigurations().create("restTestConfig");
95+
project.getConfigurations().maybeCreate("restTests");
96+
project.getConfigurations().maybeCreate("restXpackTests");
9597
if (BuildParams.isInternal()) {
9698
// core
9799
Dependency restTestdependency = project.getDependencies()
98100
.project(Map.of("path", ":rest-api-spec", "configuration", "restTests"));
99101
project.getDependencies().add(task.coreConfig.getName(), restTestdependency);
100102
// x-pack
101-
task.xpackConfig = project.getConfigurations().maybeCreate("restXpackTests");
103+
task.xpackConfig = project.getConfigurations().create("restXpackTest");
102104
Dependency restXPackTestdependency = project.getDependencies()
103105
.project(Map.of("path", ":x-pack:plugin", "configuration", "restXpackTests"));
104106
project.getDependencies().add(task.xpackConfig.getName(), restXPackTestdependency);
@@ -121,13 +123,15 @@ public void apply(Project project) {
121123
task.includeCore.set(extension.restApi.getIncludeCore());
122124
task.includeXpack.set(extension.restApi.getIncludeXpack());
123125
task.dependsOn(copyRestYamlTestTask);
124-
task.coreConfig = project.getConfigurations().maybeCreate("restSpecs");
126+
task.coreConfig = project.getConfigurations().create("restSpec"); // name chosen for passivity
127+
project.getConfigurations().maybeCreate("restSpecs");
128+
project.getConfigurations().maybeCreate("restXpackSpecs");
125129
if (BuildParams.isInternal()) {
126130
Dependency restSpecDependency = project.getDependencies()
127131
.project(Map.of("path", ":rest-api-spec", "configuration", "restSpecs"));
128132
project.getDependencies().add(task.coreConfig.getName(), restSpecDependency);
129133

130-
task.xpackConfig = project.getConfigurations().maybeCreate("restXpackSpecs");
134+
task.xpackConfig = project.getConfigurations().create("restXpackSpec");
131135
Dependency restXpackSpecDependency = project.getDependencies()
132136
.project(Map.of("path", ":x-pack:plugin", "configuration", "restXpackSpecs"));
133137
project.getDependencies().add(task.xpackConfig.getName(), restXpackSpecDependency);

0 commit comments

Comments
 (0)