Merge branch '9.0' into backport/9.0/pr-122326

Author: JVerwolf

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackBuild.java

@@ -6,6 +6,7 @@
  */
 package org.elasticsearch.xpack.core.action;
 
+import org.elasticsearch.Build;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.support.ActionFilters;
@@ -23,7 +24,6 @@
 import org.elasticsearch.protocol.xpack.XPackInfoResponse.LicenseInfo;
 import org.elasticsearch.tasks.Task;
 import org.elasticsearch.transport.TransportService;
-import org.elasticsearch.xpack.core.XPackBuild;
 
 import java.util.HashSet;
 import java.util.List;
@@ -58,7 +58,7 @@ protected void doExecute(Task task, XPackInfoRequest request, ActionListener<XPa
 
         XPackInfoResponse.BuildInfo buildInfo = null;
         if (request.getCategories().contains(XPackInfoRequest.Category.BUILD)) {
-            buildInfo = new XPackInfoResponse.BuildInfo(XPackBuild.CURRENT.shortHash(), XPackBuild.CURRENT.date());
+            buildInfo = new XPackInfoResponse.BuildInfo(Build.current().hash(), Build.current().date());
         }
 
         LicenseInfo licenseInfo = null;