Skip to content

Commit 49d6eb4

Browse files
committed
Fix fix
1 parent 5f6e5fc commit 49d6eb4

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleInternalPluginFuncTest.groovy

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@ abstract class AbstractGradleInternalPluginFuncTest extends AbstractJavaGradleFu
2020
plugins {
2121
id 'elasticsearch.java-toolchain'
2222
}
23+
24+
toolchainManagement {
25+
jvm {
26+
javaRepositories {
27+
repository('bundledOracleOpendJdk') {
28+
resolverClass = org.elasticsearch.gradle.internal.toolchain.OracleOpenJdkToolchainResolver
29+
}
30+
repository('adoptiumJdks') {
31+
resolverClass = org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
32+
}
33+
repository('archivedOracleJdks') {
34+
resolverClass = org.elasticsearch.gradle.internal.toolchain.ArchivedOracleJdkToolchainResolver
35+
}
36+
}
37+
}
38+
}
2339
""" + settingsFile.text
2440

2541
buildFile << """

build-tools/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,7 @@ abstract class AbstractGradleFuncTest extends Specification {
5050
def setup() {
5151
projectDir = testProjectDir.root
5252
settingsFile = testProjectDir.newFile('settings.gradle')
53-
settingsFile << """
54-
55-
import org.elasticsearch.gradle.internal.toolchain.OracleOpenJdkToolchainResolver
56-
import org.elasticsearch.gradle.internal.toolchain.ArchivedOracleJdkToolchainResolver
57-
import org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
58-
59-
plugins {
60-
id 'elasticsearch.java-toolchain'
61-
}
62-
63-
rootProject.name = 'hello-world'
64-
65-
toolchainManagement {
66-
jvm {
67-
javaRepositories {
68-
repository('bundledOracleOpendJdk') {
69-
resolverClass = OracleOpenJdkToolchainResolver
70-
}
71-
repository('adoptiumJdks') {
72-
resolverClass = AdoptiumJdkToolchainResolver
73-
}
74-
repository('archivedOracleJdks') {
75-
resolverClass = ArchivedOracleJdkToolchainResolver
76-
}
77-
}
78-
}
79-
}
80-
81-
"""
53+
settingsFile << "rootProject.name = 'hello-world'\n"
8254
buildFile = testProjectDir.newFile('build.gradle')
8355
propertiesFile = testProjectDir.newFile('gradle.properties')
8456
propertiesFile <<

0 commit comments

Comments
 (0)