[dolphinscheduler] branch 2.0-prepare updated: [cherry-pick #6484 #6488][MasterServer] upgrade the druid and mysql connector version (#6494)

[leonbao]

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch 2.0-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/2.0-prepare by this push:
     new 2460eb6  [cherry-pick #6484 #6488][MasterServer] upgrade the druid and 
mysql connector version (#6494)
2460eb6 is described below

commit 2460eb6fb9789620d55888267a02bd3273f209fa
Author: Kirs <acm_mas...@163.com>
AuthorDate: Mon Oct 11 16:41:10 2021 +0800

    [cherry-pick #6484 #6488][MasterServer] upgrade the druid and mysql 
connector version (#6494)
    
    * [DS-6483][MasterServer] upgrade the druid and mysql connector version 
(#6484)
    
    * [DS-6483][MasterServer] upgrade the druid and mysql connector version
    
    * remove mysql connector in known-dependencies.txt
    
    * change mysql connector version to 8.0.16
    
    Co-authored-by: caishunfeng <534328...@qq.com>
    
    * Add Alibaba Druid to NOTICE file (#6488)
    
    Co-authored-by: wind <caishunf...@users.noreply.github.com>
    Co-authored-by: caishunfeng <534328...@qq.com>
---
 .../dolphinscheduler/dao/datasource/SpringConnectionFactory.java  | 2 +-
 dolphinscheduler-dist/release-docs/NOTICE                         | 8 ++++++++
 pom.xml                                                           | 4 ++--
 tools/dependencies/known-dependencies.txt                         | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
index ca4a7e2..1865c78 100644
--- 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
+++ 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java
@@ -91,7 +91,7 @@ public class SpringConnectionFactory {
         
druidDataSource.setPoolPreparedStatements(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_POOL_PREPARED_STATEMENTS,
 true));
         
druidDataSource.setTestWhileIdle(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_WHILE_IDLE,
 true));
         
druidDataSource.setTestOnBorrow(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_ON_BORROW,
 true));
-        
druidDataSource.setTestOnReturn(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_ON_RETURN,
 true));
+        
druidDataSource.setTestOnReturn(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_ON_RETURN,
 false));
         
druidDataSource.setKeepAlive(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_KEEP_ALIVE,
 true));
 
         
druidDataSource.setMinIdle(PropertyUtils.getInt(Constants.SPRING_DATASOURCE_MIN_IDLE,
 5));
diff --git a/dolphinscheduler-dist/release-docs/NOTICE 
b/dolphinscheduler-dist/release-docs/NOTICE
index 11f5a94..2e63869 100644
--- a/dolphinscheduler-dist/release-docs/NOTICE
+++ b/dolphinscheduler-dist/release-docs/NOTICE
@@ -674,6 +674,14 @@ http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html
 
 ========================================================================
 
+Alibaba Druid NOTICE
+
+========================================================================
+
+Alibaba Druid
+Copyright 1999-2021 Alibaba Group Holding Ltd.
+
+========================================================================
 
 AWS SDK for Java NOTICE
 
diff --git a/pom.xml b/pom.xml
index 5d49a97..5c3cc6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,14 +70,14 @@
         <mybatis-plus.version>3.2.0</mybatis-plus.version>
         <mybatis.spring.version>2.0.1</mybatis.spring.version>
         <cron.utils.version>5.0.5</cron.utils.version>
-        <druid.version>1.1.22</druid.version>
+        <druid.version>1.2.4</druid.version>
         <h2.version>1.4.200</h2.version>
         <commons.codec.version>1.11</commons.codec.version>
         <commons.logging.version>1.1.1</commons.logging.version>
         <httpclient.version>4.4.1</httpclient.version>
         <httpcore.version>4.4.1</httpcore.version>
         <junit.version>4.12</junit.version>
-        <mysql.connector.version>5.1.34</mysql.connector.version>
+        <mysql.connector.version>8.0.16</mysql.connector.version>
         <slf4j.api.version>1.7.5</slf4j.api.version>
         <slf4j.log4j12.version>1.7.5</slf4j.log4j12.version>
         <commons.collections.version>3.2.2</commons.collections.version>
diff --git a/tools/dependencies/known-dependencies.txt 
b/tools/dependencies/known-dependencies.txt
index 8a77f51..b19e8b9 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -56,7 +56,7 @@ datanucleus-core-4.1.6.jar
 datanucleus-rdbms-4.1.7.jar
 derby-10.14.2.0.jar
 error_prone_annotations-2.1.3.jar
-druid-1.1.22.jar
+druid-1.2.4.jar
 gson-2.8.6.jar
 guava-24.1-jre.jar
 guava-retrying-2.0.0.jar