Skip to content

Commit 840bb6c

Browse files
committed
Remove broken code from bad merge
1 parent 221570e commit 840bb6c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.gradle.api.plugins.JavaBasePlugin;
4747
import org.gradle.api.provider.Provider;
4848
import org.gradle.api.specs.Specs;
49+
import org.gradle.api.tasks.Copy;
4950
import org.gradle.api.tasks.TaskProvider;
5051
import org.gradle.api.tasks.testing.Test;
5152

@@ -156,12 +157,6 @@ public void apply(Project project) {
156157
}
157158
}
158159

159-
// setup jdks used by no-jdk tests, and by gradle executing
160-
TaskProvider<Copy> linuxGradleJdk = createJdk(project, "gradle", GRADLE_JDK_VENDOR, GRADLE_JDK_VERSION, "linux", "x64");
161-
TaskProvider<Copy> linuxSystemJdk = createJdk(project, "system", SYSTEM_JDK_VENDOR, SYSTEM_JDK_VERSION, "linux", "x64");
162-
TaskProvider<Copy> windowsGradleJdk = createJdk(project, "gradle", GRADLE_JDK_VENDOR, GRADLE_JDK_VERSION, "windows", "x64");
163-
TaskProvider<Copy> windowsSystemJdk = createJdk(project, "system", SYSTEM_JDK_VENDOR, SYSTEM_JDK_VERSION, "windows", "x64");
164-
165160
project.subprojects(vmProject -> {
166161
vmProject.getPluginManager().apply(VagrantBasePlugin.class);
167162
vmProject.getPluginManager().apply(JdkDownloadPlugin.class);

0 commit comments

Comments
 (0)