Skip to content

Commit 9a35cb0

Browse files
committed
Bring back getJavaDetails used when configuring fips
1 parent 2f73df8 commit 9a35cb0

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ public interface BuildParameterExtension {
4646

4747
Provider<? extends Action<JavaToolchainSpec>> getJavaToolChainSpec();
4848

49+
Provider<String> getRuntimeJavaDetails();
50+
4951
Provider<String> getGitRevision();
5052

5153
Provider<String> getGitOrigin();

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public DefaultBuildParameterExtension(
6969
this.runtimeJavaHome = cache(providers, runtimeJava.getJavahome());
7070
this.javaToolChainSpec = cache(providers, javaToolChainSpec);
7171
this.runtimeJavaVersion = cache(providers, runtimeJava.getJavaVersion());
72-
// this.runtimeJavaVersion = runtimeJava.getJavaVersion();
7372
this.runtimeJavaDetails = cache(providers, runtimeJava.getVendorDetails());
7473
this.javaVersions = javaVersions;
7574
this.minimumCompilerVersion = minimumCompilerVersion;
@@ -152,6 +151,11 @@ public Provider<? extends Action<JavaToolchainSpec>> getJavaToolChainSpec() {
152151
return javaToolChainSpec;
153152
}
154153

154+
@Override
155+
public Provider<String> getRuntimeJavaDetails() {
156+
return runtimeJavaDetails;
157+
}
158+
155159
@Override
156160
public Provider<String> getGitRevision() {
157161
return gitRevision;

0 commit comments

Comments
 (0)