Skip to content

Commit 9dc8160

Browse files
committed
Add version.properties files for the tests
This file is needed now during the tests as it is no longer fully static during full JVM execution.
1 parent c7f1f62 commit 9dc8160

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,17 @@ abstract class AbstractGitAwareGradleFuncTest extends AbstractGradleFuncTest {
2727
execute("git clone ${remoteGitRepo.absolutePath} cloned", testProjectDir.root)
2828
buildFile = new File(testProjectDir.root, 'cloned/build.gradle')
2929
settingsFile = new File(testProjectDir.root, 'cloned/settings.gradle')
30+
versionPropertiesFile = new File(testProjectDir.root, 'cloned/build-tools-internal/version.properties')
31+
versionPropertiesFile.text = """
32+
elasticsearch = 9.1.0
33+
lucene = 10.2.2
34+
35+
bundled_jdk_vendor = openjdk
36+
bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90
37+
minimumJdkVersion = 21
38+
minimumRuntimeJava = 21
39+
minimumCompilerJava = 21
40+
"""
3041
}
3142

3243
File setupGitRemote() {

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ abstract class AbstractGradleFuncTest extends Specification {
4444
File buildFile
4545
File propertiesFile
4646
File projectDir
47+
File versionPropertiesFile
4748

4849
protected boolean configurationCacheCompatible = true
4950
protected boolean buildApiRestrictionsDisabled = false
@@ -54,6 +55,18 @@ abstract class AbstractGradleFuncTest extends Specification {
5455
settingsFile << "rootProject.name = 'hello-world'\n"
5556
buildFile = testProjectDir.newFile('build.gradle')
5657
propertiesFile = testProjectDir.newFile('gradle.properties')
58+
File buildToolsDir = testProjectDir.newFolder("build-tools-internal")
59+
versionPropertiesFile = new File(buildToolsDir, 'version.properties')
60+
versionPropertiesFile.text = """
61+
elasticsearch = 9.1.0
62+
lucene = 10.2.2
63+
64+
bundled_jdk_vendor = openjdk
65+
bundled_jdk = 24+36@1f9ff9062db4449d8ca828c504ffae90
66+
minimumJdkVersion = 21
67+
minimumRuntimeJava = 21
68+
minimumCompilerJava = 21
69+
"""
5770
propertiesFile <<
5871
"org.gradle.java.installations.fromEnv=JAVA_HOME,RUNTIME_JAVA_HOME,JAVA15_HOME,JAVA14_HOME,JAVA13_HOME,JAVA12_HOME,JAVA11_HOME,JAVA8_HOME"
5972

0 commit comments

Comments
 (0)