未验证 提交 2460eb6f 编写于 作者: K Kirs 提交者: GitHub

[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: Ncaishunfeng <534328519@qq.com>

* Add Alibaba Druid to NOTICE file (#6488)
Co-authored-by: Nwind <caishunfeng@users.noreply.github.com>
Co-authored-by: Ncaishunfeng <534328519@qq.com>
上级 f8b68dcc
......@@ -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));
......
......@@ -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
......
......@@ -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>
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册