You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2016/07/27 15:40:20 UTC
[1/3] cassandra git commit: Fix Java Version check for versions > 100
on Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.9 e9e6a0d4e -> 247a56bca
refs/heads/trunk e1393ec54 -> 6284b6dcc
Fix Java Version check for versions > 100 on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/247a56bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/247a56bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/247a56bc
Branch: refs/heads/cassandra-3.9
Commit: 247a56bca72364d43e1b74a35ee31cd40d3bac46
Parents: e9e6a0d
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed Jul 27 11:39:28 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Wed Jul 27 11:39:28 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/247a56bc/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index d7a4867..31c7766 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -281,7 +281,14 @@ Function ParseJVMInfo
}
$pa = $sa[1].Split("_")
- $env:JVM_PATCH_VERSION=$pa[1]
+ $subVersion = $pa[1]
+ # Deal with -b (build) versions
+ if ($subVersion -contains '-')
+ {
+ $patchAndBuild = $subVersion.Split("-")
+ $subVersion = $patchAndBuild[0]
+ }
+ $env:JVM_PATCH_VERSION = $subVersion
}
#-----------------------------------------------------------------------------
@@ -413,7 +420,7 @@ Function SetCassandraEnvironment
$env:JVM_OPTS = "$env:JVM_OPTS -javaagent:""$env:CASSANDRA_HOME\lib\jamm-0.3.0.jar"""
}
- if ($env:JVM_VERSION.CompareTo("1.8.0_40") -eq -1)
+ if ($env:JVM_VERSION.CompareTo("1.8.0") -eq -1 -or [convert]::ToInt32($env:JVM_PATCH_VERSION) -lt 40)
{
echo "Cassandra 3.0 and later require Java 8u40 or later."
exit
[2/3] cassandra git commit: Fix Java Version check for versions > 100
on Windows
Posted by jm...@apache.org.
Fix Java Version check for versions > 100 on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-12278
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/247a56bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/247a56bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/247a56bc
Branch: refs/heads/trunk
Commit: 247a56bca72364d43e1b74a35ee31cd40d3bac46
Parents: e9e6a0d
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed Jul 27 11:39:28 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Wed Jul 27 11:39:28 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/247a56bc/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index d7a4867..31c7766 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -281,7 +281,14 @@ Function ParseJVMInfo
}
$pa = $sa[1].Split("_")
- $env:JVM_PATCH_VERSION=$pa[1]
+ $subVersion = $pa[1]
+ # Deal with -b (build) versions
+ if ($subVersion -contains '-')
+ {
+ $patchAndBuild = $subVersion.Split("-")
+ $subVersion = $patchAndBuild[0]
+ }
+ $env:JVM_PATCH_VERSION = $subVersion
}
#-----------------------------------------------------------------------------
@@ -413,7 +420,7 @@ Function SetCassandraEnvironment
$env:JVM_OPTS = "$env:JVM_OPTS -javaagent:""$env:CASSANDRA_HOME\lib\jamm-0.3.0.jar"""
}
- if ($env:JVM_VERSION.CompareTo("1.8.0_40") -eq -1)
+ if ($env:JVM_VERSION.CompareTo("1.8.0") -eq -1 -or [convert]::ToInt32($env:JVM_PATCH_VERSION) -lt 40)
{
echo "Cassandra 3.0 and later require Java 8u40 or later."
exit
[3/3] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6284b6dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6284b6dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6284b6dc
Branch: refs/heads/trunk
Commit: 6284b6dccea10333735b4e6ad866e90f70d357aa
Parents: e1393ec 247a56b
Author: Josh McKenzie <jm...@apache.org>
Authored: Wed Jul 27 11:40:09 2016 -0400
Committer: Josh McKenzie <jm...@apache.org>
Committed: Wed Jul 27 11:40:09 2016 -0400
----------------------------------------------------------------------
conf/cassandra-env.ps1 | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------