From d12e8b3e42244049d70964c5d5f6e1be43270280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Sun, 13 Mar 2016 09:04:53 +0800 Subject: [PATCH 1/2] fixed java doc error --- .../java/com/alibaba/druid/pool/DruidDataSourceConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceConverter.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceConverter.java index 6d799e64ac..d14712441a 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceConverter.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceConverter.java @@ -25,7 +25,7 @@ import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; /** - * 支持simple-jndi
+ * 支持simple-jndi *

配置示例:

*
 pgDruidTest/converter=com.alibaba.druid.pool.DruidDataSourceConverter
@@ -45,7 +45,7 @@ pgDruidTest/logabandoned=false
 pgDruidTest/filters=stat,config,log4j
 pgDruidTest/connectionProperties=druid.log.stmt.executableSql=true
    
- * date: 2016年1月31日 下午12:54:10
+ * date: 2016年1月31日 下午12:54:10 * @author jinjuma@yeah.net */ public class DruidDataSourceConverter implements Converter { From 26c5d414b1821fd66676a1a1e8ab3d8e173dfb45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Sun, 13 Mar 2016 09:05:13 +0800 Subject: [PATCH 2/2] 1.0.18 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e7af4d7532..0603535084 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ --> com.alibaba druid - 1.0.18-SNAPSHOT + 1.0.18 jar druid @@ -22,8 +22,8 @@ 4.2.5.RELEASE 4.12 - true - true + false + false UTF-8 1.6