Some polishing

Author: breskeby

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

@@ -12,7 +12,6 @@
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.Directory;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSet;
@@ -38,8 +37,7 @@ void impl(String implName, Project implProject) {
         String projectName = implProject.getName();
         String capitalName = capitalize(projectName);
 
-        Dependency implDependency = project.getDependencies().create(implProject);
-        Configuration implConfig = project.getConfigurations().detachedConfiguration(implDependency);
+        Configuration implConfig = project.getConfigurations().detachedConfiguration(project.getDependencies().create(implProject));
         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(dep);
-        return detachedConfiguration;
+        return project.getConfigurations().detachedConfiguration(dep);
     }
 
     public void copyModule(TaskProvider<? extends AbstractCopyTask> copyTask, Project module) {

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

@@ -296,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(bundleDependency);
-            return detachedConfiguration;
+            return project.getConfigurations().detachedConfiguration(bundleDependency);
         });
 
         Provider<File> fileProvider = configuration.getElements()

gradle/verification-metadata.xml

@@ -949,16 +949,6 @@
             <sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.10.1">
-         <artifact name="gradle-ospackage-plugin-11.10.1.jar">
-            <sha256 value="8f1daf5885f1a8f6bcab00bf9b52cf484d87da7839e9bbd327a94af27df5dacc" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.11.0">
-         <artifact name="gradle-ospackage-plugin-11.11.0.jar">
-            <sha256 value="7399d3cfeffc3a05f2004c352a1205ba3356e730dca5a5f65d96d920254217f0" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.11.1">
          <artifact name="gradle-ospackage-plugin-11.11.1.jar">
             <sha256 value="34027ac840adb81b80de43082ce335a6518875217a38ac0204d5a84dc669b7ac" origin="Generated by Gradle"/>