diff --git a/client-adapter/launcher/src/main/bin/startup.sh b/client-adapter/launcher/src/main/bin/startup.sh
index 04e0e222..bcdd9a78 100644
--- a/client-adapter/launcher/src/main/bin/startup.sh
+++ b/client-adapter/launcher/src/main/bin/startup.sh
@@ -9,7 +9,10 @@ case "`uname`" in
bin_abs_path=`cd $(dirname $0); pwd`
;;
esac
+
base=${bin_abs_path}/..
+jaas_conf=$base/conf/jaas.conf
+
export LANG=en_US.UTF-8
export BASE=$base
@@ -81,6 +84,9 @@ fi
JAVA_OPTS=" $JAVA_OPTS -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8"
ADAPTER_OPTS="-DappName=canal-adapter"
+if [ -f "$jaas_conf" ]; then
+ ADAPTER_OPTS="$ADAPTER_OPTS -Djava.security.auth.login.config=$jaas_conf"
+fi
for i in $base/lib/*;
do CLASSPATH=$i:"$CLASSPATH";
diff --git a/deployer/src/main/bin/startup.sh b/deployer/src/main/bin/startup.sh
index 8afcafb5..010e0294 100644
--- a/deployer/src/main/bin/startup.sh
+++ b/deployer/src/main/bin/startup.sh
@@ -9,10 +9,14 @@ case "`uname`" in
bin_abs_path=`cd $(dirname $0); pwd`
;;
esac
+
base=${bin_abs_path}/..
+
+jaas_conf=$base/conf/jaas.conf
canal_conf=$base/conf/canal.properties
canal_local_conf=$base/conf/canal_local.properties
logback_configurationFile=$base/conf/logback.xml
+
export LANG=en_US.UTF-8
export BASE=$base
@@ -104,6 +108,9 @@ fi
JAVA_OPTS=" $JAVA_OPTS -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8"
CANAL_OPTS="-DappName=otter-canal -Dlogback.configurationFile=$logback_configurationFile -Dcanal.conf=$canal_conf"
+if [ -f "$jaas_conf" ]; then
+ CANAL_OPTS="$CANAL_OPTS -Djava.security.auth.login.config=$jaas_conf"
+fi
if [ -e $canal_conf -a -e $logback_configurationFile ]
then
diff --git a/pom.xml b/pom.xml
index edd431f9..84a535f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,7 +357,7 @@
com.h2database
h2
- 2.1.210
+ 2.2.224
mysql