Browse Source

Move BuildParams class to 'minimumRuntime' source set (#49890)

Move BuildParams class to 'minimumRuntime' source set to retain compatibility
with build-tools for builds using a Java 8 runtime.

Closes #49766
Mark Vieira 5 years ago
parent
commit
1059f823ac

+ 3 - 1
buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java → buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/BuildParams.java

@@ -84,7 +84,6 @@ public class BuildParams {
         return value(runtimeJavaVersion);
     }
 
-    @ExecutionTime
     public static Boolean isInFipsJvm() {
         return value(inFipsJvm);
     }
@@ -155,6 +154,9 @@ public class BuildParams {
                 .filter(f -> Modifier.isStatic(f.getModifiers()))
                 .forEach(f -> {
                     try {
+                        // Since we are mutating private static fields from a public static inner class we need to suppress
+                        // accessibility controls here.
+                        f.setAccessible(true);
                         f.set(null, null);
                     } catch (IllegalAccessException e) {
                         throw new RuntimeException(e);

+ 0 - 0
buildSrc/src/main/java/org/elasticsearch/gradle/info/JavaHome.java → buildSrc/src/minimumRuntime/java/org/elasticsearch/gradle/info/JavaHome.java