Repository: cassandra Updated Branches: refs/heads/trunk 4a748f315 -> 894541304
Require java 8u40 Patch by pthompson; reviewed by jmckenzie for CASSANDRA-9416 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0997ad6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0997ad6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0997ad6f Branch: refs/heads/trunk Commit: 0997ad6fff9896df34ba1e3425559f689d96933b Parents: 2a656e6 Author: Philip Thompson <[email protected]> Authored: Tue Aug 11 10:08:27 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Tue Aug 11 10:08:27 2015 -0400 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 6 ++++++ conf/cassandra-env.sh | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0997ad6f/conf/cassandra-env.ps1 ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1 index 91db18b..1a43eb7 100644 --- a/conf/cassandra-env.ps1 +++ b/conf/cassandra-env.ps1 @@ -333,6 +333,12 @@ 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)) + { + echo "Cassandra 3.0 and later require Java 8u40 or later." + exit + } + # enable assertions. disabling this in production will give a modest # performance benefit (around 5%). $env:JVM_OPTS = "$env:JVM_OPTS -ea" http://git-wip-us.apache.org/repos/asf/cassandra/blob/0997ad6f/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 1bb2e15..fd348fe 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -80,12 +80,12 @@ JVM_VERSION=${jvmver%_*} JVM_PATCH_VERSION=${jvmver#*_} if [ "$JVM_VERSION" \< "1.8" ] ; then - echo "Cassandra 3.0 and later require Java 8u20 or later." + echo "Cassandra 3.0 and later require Java 8u40 or later." exit 1; fi -if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "20" ] ; then - echo "Cassandra 3.0 and later require Java 8u20 or later." +if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" \< "40" ] ; then + echo "Cassandra 3.0 and later require Java 8u40 or later." exit 1; fi
