From 782f97a60f44da032a44b9be86c9adc2cd18ba0a Mon Sep 17 00:00:00 2001 From: David Roberts Date: Mon, 20 Feb 2017 11:25:19 +0000 Subject: [PATCH] Relax regex for getting C++ build so it works for developers with uncommitted changes Original commit: elastic/x-pack-elasticsearch@a6faea0cc60202868c3301fd4a06080dc67cbbaf --- .../elasticsearch/xpack/ml/job/process/NativeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/NativeController.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/NativeController.java index aca0a8f4ce7..0a89bdc3203 100644 --- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/NativeController.java +++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/process/NativeController.java @@ -76,7 +76,7 @@ public class NativeController { public Map getNativeCodeInfo() throws TimeoutException { String copyrightMessage = cppLogHandler.getCppCopyright(CONTROLLER_CONNECT_TIMEOUT); - Matcher matcher = Pattern.compile("Version (.+) \\(Build ([0-9a-f]+)\\) Copyright ").matcher(copyrightMessage); + Matcher matcher = Pattern.compile("Version (.+) \\(Build ([^)]+)\\) Copyright ").matcher(copyrightMessage); if (matcher.find()) { Map info = new HashMap<>(2); info.put("version", matcher.group(1));