File tree 1 file changed +15
-12
lines changed
1 file changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -5,20 +5,23 @@ import org.elasticsearch.gradle.info.BuildParams
5
5
apply plugin : ' elasticsearch.jdk-download'
6
6
7
7
jdks {
8
- provisioned_runtime {
9
- vendor = VersionProperties . bundledJdkVendor
10
- version = VersionProperties . getBundledJdk(OS . current(). name(). toLowerCase())
11
- platform = OS . current(). name(). toLowerCase()
12
- }
8
+ provisioned_runtime {
9
+ vendor = VersionProperties . bundledJdkVendor
10
+ version = VersionProperties . getBundledJdk(OS . current(). name(). toLowerCase())
11
+ platform = OS . current(). name(). toLowerCase()
12
+ }
13
13
}
14
14
15
15
allprojects {
16
+ if (project. path != " :build-tools" ) {
17
+ // Build tools doesn't support java 8 still used in CI
16
18
project. tasks. withType(Test ). configureEach { Test test ->
17
- if (BuildParams . getIsRuntimeJavaHomeSet()) {
18
- test. executable = " ${ BuildParams.runtimeJavaHome} /bin/java"
19
- } else {
20
- test. dependsOn(rootProject. jdks. provisioned_runtime)
21
- test. executable = rootProject. jdks. provisioned_runtime. getBinJavaPath()
22
- }
19
+ if (BuildParams . getIsRuntimeJavaHomeSet()) {
20
+ test. executable = " ${ BuildParams.runtimeJavaHome} /bin/java"
21
+ } else {
22
+ test. dependsOn(rootProject. jdks. provisioned_runtime)
23
+ test. executable = rootProject. jdks. provisioned_runtime. getBinJavaPath()
24
+ }
23
25
}
24
- }
26
+ }
27
+ }
You can’t perform that action at this time.
0 commit comments