Selaa lähdekoodia

Fix resolve all dependencies (#71727)

Rene Groeschke 4 vuotta sitten
vanhempi
commit
6f704045a1

+ 3 - 1
buildSrc/src/main/java/org/elasticsearch/gradle/ResolveAllDependencies.java

@@ -21,6 +21,7 @@ import java.util.Collection;
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.gradle.DistributionDownloadPlugin.DISTRO_EXTRACTED_CONFIG_PREFIX;
+import static org.elasticsearch.gradle.internal.rest.compat.YamlRestCompatTestPlugin.BWC_MINOR_CONFIG_NAME;
 
 public class ResolveAllDependencies extends DefaultTask {
 
@@ -54,6 +55,7 @@ public class ResolveAllDependencies extends DefaultTask {
                 return false;
             }
         }
-        return configuration.getName().startsWith(DISTRO_EXTRACTED_CONFIG_PREFIX) == false;
+        return configuration.getName().startsWith(DISTRO_EXTRACTED_CONFIG_PREFIX) == false
+            && configuration.getName().equals(BWC_MINOR_CONFIG_NAME) == false;
     }
 }

+ 2 - 1
buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java

@@ -50,6 +50,7 @@ public class YamlRestCompatTestPlugin implements Plugin<Project> {
     private static final Path RELATIVE_REST_API_RESOURCES = Path.of("rest-api-spec/src/main/resources");
     private static final Path RELATIVE_REST_XPACK_RESOURCES = Path.of("x-pack/plugin/src/test/resources");
     private static final Path RELATIVE_REST_PROJECT_RESOURCES = Path.of("src/yamlRestTest/resources");
+    public static final String BWC_MINOR_CONFIG_NAME = "bwcMinor";
 
     @Override
     public void apply(Project project) {
@@ -73,7 +74,7 @@ public class YamlRestCompatTestPlugin implements Plugin<Project> {
         GradleUtils.extendSourceSet(project, YamlRestTestPlugin.SOURCE_SET_NAME, SOURCE_SET_NAME);
 
         // copy compatible rest specs
-        Configuration bwcMinorConfig = project.getConfigurations().create("bwcMinor");
+        Configuration bwcMinorConfig = project.getConfigurations().create(BWC_MINOR_CONFIG_NAME);
         Dependency bwcMinor = project.getDependencies().project(Map.of("path", ":distribution:bwc:minor", "configuration", "checkout"));
         project.getDependencies().add(bwcMinorConfig.getName(), bwcMinor);