Revert workaround from rc1

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/EmbeddedProviderExtension.java

@@ -39,8 +39,7 @@ void impl(String implName, Project implProject) {
         String capitalName = capitalize(projectName);
 
         Dependency implDependency = project.getDependencies().create(implProject);
-        Configuration implConfig = project.getConfigurations().detachedConfiguration();
-        implConfig.getDependencies().add(implDependency);
+        Configuration implConfig = project.getConfigurations().detachedConfiguration(implDependency);
         implConfig.attributes(attrs -> {
             attrs.attribute(ARTIFACT_TYPE_ATTRIBUTE, DIRECTORY_TYPE);
             attrs.attribute(EmbeddedProviderPlugin.IMPL_ATTR, true);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/ElasticsearchDistributionExtension.java

@@ -34,8 +34,7 @@ public ElasticsearchDistributionExtension(Project project) {
     private Configuration moduleZip(Project module) {
         var moduleConfigurationCoords = Map.of("path", module.getPath(), "configuration", EXPLODED_BUNDLE_CONFIG);
         var dep = project.getDependencies().project(moduleConfigurationCoords);
-        Configuration detachedConfiguration = project.getConfigurations().detachedConfiguration();
-        detachedConfiguration.getDependencies().add(dep);
+        Configuration detachedConfiguration = project.getConfigurations().detachedConfiguration(dep);
         return detachedConfiguration;
     }
 

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java

@@ -247,8 +247,7 @@ public void setTestDistribution(TestDistribution distribution) {
 
     private void registerExtractedConfig(Provider<RegularFile> pluginProvider) {
         Dependency pluginDependency = this.project.getDependencies().create(project.files(pluginProvider));
-        Configuration extractedConfig = project.getConfigurations().detachedConfiguration();
-        extractedConfig.getDependencies().add(pluginDependency);
+        Configuration extractedConfig = project.getConfigurations().detachedConfiguration(pluginDependency);
         extractedConfig.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
         extractedConfig.getAttributes().attribute(BUNDLE_ATTRIBUTE, true);
         pluginAndModuleConfiguration.from(extractedConfig);
@@ -297,8 +296,7 @@ Collection<Configuration> getPluginAndModuleConfigurations() {
     private Provider<RegularFile> maybeCreatePluginOrModuleDependency(String path, String consumingConfiguration) {
         var configuration = pluginAndModuleConfigurations.computeIfAbsent(path, key -> {
             var bundleDependency = this.project.getDependencies().project(Map.of("path", path, "configuration", consumingConfiguration));
-            Configuration detachedConfiguration = project.getConfigurations().detachedConfiguration();
-            detachedConfiguration.getDependencies().add(bundleDependency);
+            Configuration detachedConfiguration = project.getConfigurations().detachedConfiguration(bundleDependency);
             return detachedConfiguration;
         });