honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 01:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lift build date to global build info (#45166)

Browse Source 
This commit adds the build date to global build info mainly so that it
is accessible as an extension property.
This commit is contained in:
Jason Tedor 2019-08-03 14:48:14 -04:00
parent d78ecd9c09
commit 78aaf1b2d5
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View File

@ -717,7 +717,7 @@ class BuildPlugin implements Plugin<Project> {
'X-Compile-Elasticsearch-Version': VersionProperties.elasticsearch,
'X-Compile-Lucene-Version': VersionProperties.lucene,
'X-Compile-Elasticsearch-Snapshot': VersionProperties.isElasticsearchSnapshot(),
'Build-Date': ZonedDateTime.now(ZoneOffset.UTC),
'Build-Date': ext.get('buildDate'),
'Build-Java-Version': compilerJavaVersion)
}

3
buildSrc/src/main/java/org/elasticsearch/gradle/info/GenerateGlobalBuildInfoTask.java
View File

@ -102,7 +102,7 @@ public class GenerateGlobalBuildInfoTask extends DefaultTask {
}
@Input
public String gitRevision() {
public String getGitRevision() {
return gitRevision;
}
@ -148,7 +148,6 @@ public class GenerateGlobalBuildInfoTask extends DefaultTask {
JavaVersion runtimeJavaVersionEnum = JavaVersion.current();
File gradleJavaHome = Jvm.current().getJavaHome();
boolean inFipsJvm = false;
final String gitRevision = gitRevision();
try {
if (Files.isSameFile(compilerJavaHome.toPath(), gradleJavaHome.toPath()) == false) {

3
buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java
View File

@ -16,6 +16,8 @@ import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UncheckedIOException;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@ -95,6 +97,7 @@ public class GlobalBuildInfoPlugin implements Plugin<Project> {
ext.set("minimumRuntimeVersion", minimumRuntimeVersion);
ext.set("gradleJavaVersion", Jvm.current().getJavaVersion());
ext.set("gitRevision", gitRevision);
ext.set("buildDate", ZonedDateTime.now(ZoneOffset.UTC));
});
}