Skip to content

Commit abd6fa1

Browse files
committed
Move BuildParams class to 'minimumRuntime' source set (elastic#49890)
Move BuildParams class to 'minimumRuntime' source set to retain compatibility with build-tools for builds using a Java 8 runtime. Closes elastic#49766 (cherry picked from commit 1059f82)
1 parent 0f02e02 commit abd6fa1

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java renamed to buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ public static JavaVersion getRuntimeJavaVersion() {
8484
return value(runtimeJavaVersion);
8585
}
8686

87-
@ExecutionTime
8887
public static Boolean isInFipsJvm() {
8988
return value(inFipsJvm);
9089
}
@@ -155,6 +154,8 @@ public void reset() {
155154
.filter(f -> Modifier.isStatic(f.getModifiers()))
156155
.forEach(f -> {
157156
try {
157+
// Since we are mutating private static fields from a public static inner class we need to suppress
158+
// accessibility controls here.
158159
f.setAccessible(true);
159160
f.set(null, null);
160161
} catch (IllegalAccessException e) {

0 commit comments

Comments
 (0)