brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjcorb...@apache.org
Subject [1/4] incubator-brooklyn git commit: Fix java version check
Date Tue, 14 Jul 2015 09:37:16 GMT
Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 31b8471f7 -> 076bf52ee


Fix java version check

- if it is used openjdk java -version returns `openjdk version "1.8.0_45"'
  which wasn't matched correctly previously


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/407c7a1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/407c7a1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/407c7a1a

Branch: refs/heads/master
Commit: 407c7a1a60f4a1f936c54318766f1b3e2b70df82
Parents: 32960be
Author: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Authored: Fri Jun 26 13:13:21 2015 +0300
Committer: Valentin Aitken <valentin.aitken@cloudsoftcorp.com>
Committed: Sun Jun 28 01:43:34 2015 +0300

----------------------------------------------------------------------
 .../java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/407c7a1a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index 08ccfcb..79cef17 100644
--- a/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -336,7 +336,7 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
         log.debug("Checking Java version at {}@{}", getEntity(), getLocation());
         // sed gets stdin like 'java version "1.7.0_45"'
         ProcessTaskWrapper<Integer> versionCommand = Entities.submit(getEntity(), SshTasks.newSshExecTaskFactory(
-                getLocation(), "java -version 2>&1 | grep \"java version\" | sed 's/.*\"\\(.*\\).*\"/\\1/'"));
+                getLocation(), "java -version 2>&1 | grep \" version\" | sed 's/.*\"\\(.*\\).*\"/\\1/'"));
         versionCommand.get();
         String stdOut = versionCommand.getStdout().trim();
         if (!Strings.isBlank(stdOut)) {


Mime
View raw message