Author: burn
Date: Tue May 24 17:44:15 2016
New Revision: 1745382
URL: http://svn.apache.org/viewvc?rev=1745382&view=rev
Log:
UIMA-4944 Avoid JDK level check for IBM Java as old JDKs have worked well
Modified:
uima/sandbox/uima-ducc/trunk/src/main/config/cassandra-env.sh
Modified: uima/sandbox/uima-ducc/trunk/src/main/config/cassandra-env.sh
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/config/cassandra-env.sh?rev=1745382&r1=1745381&r2=1745382&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/config/cassandra-env.sh (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/config/cassandra-env.sh Tue May 24
17:44:15 2016
@@ -135,7 +135,7 @@ if [ "$JVM_VERSION" \< "1.7" ] ; then
exit 1;
fi
-if [ "$JVM_VERSION" \< "1.8" ] && [ "$JVM_PATCH_VERSION" -lt "25" ] ; then
+if [ "$JVM_VENDOR" != "IBM" ] && [ "$JVM_VERSION" \< "1.8" ] && [
"$JVM_PATCH_VERSION" -lt "25" ] ; then
echo "Cassandra 2.0 and later require Java 7u25 or later."
exit 1;
fi
