Author: ravi
Date: Wed Dec 28 10:40:18 2016
New Revision: 1776259
URL: http://svn.apache.org/viewvc?rev=1776259&view=rev
Log:
Patch by Chanaka Fernando for SYNAPSE-1078
Modified:
synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh
Modified: synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh?rev=1776259&r1=1776258&r2=1776259&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh (original)
+++ synapse/trunk/java/modules/distribution/src/main/bin/synapse.sh Wed Dec 28
10:40:18 2016
@@ -97,16 +97,18 @@ done
SYNAPSE_CLASSPATH=$SYNAPSE_HOME/repository/conf:$JAVA_HOME/lib/tools.jar:$SYNAPSE_CLASSPATH:$CLASSPATH
# use proper bouncy castle version for the JDK
-jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
+#jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5`
+jdk_16=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.6`
+jdk_17=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.7`
-if [ "$jdk_15" ]; then
- echo " Using Bouncy castle JAR for Java 1.5"
+if [ "$jdk_16" -o "$jdk_17" ]; then
+# echo " Using Bouncy castle JAR for Java 1.5"
for f in $SYNAPSE_HOME/lib/bcprov-jdk15*.jar
do
SYNAPSE_CLASSPATH=$f:$SYNAPSE_CLASSPATH
done
else
- echo " [Warn] Synapse is tested only with Java 5"
+ echo " [Warn] Synapse is tested only with Java 1.6 and 1.7"
fi
# For Cygwin, switch paths to Windows format before running java
