From a64b9f92875d897fa59abdfe481b6221540ab5c4 Mon Sep 17 00:00:00 2001 From: lijian Date: Tue, 18 Aug 2015 16:53:36 +0800 Subject: [PATCH] syn alibaba/druid/master --- pom.xml | 1112 ++++++++--------- .../com/alibaba/druid/pool/MaxWaitTest.java | 1 + 2 files changed, 547 insertions(+), 566 deletions(-) diff --git a/pom.xml b/pom.xml index f97e902434..40c9659444 100644 --- a/pom.xml +++ b/pom.xml @@ -1,302 +1,292 @@ - 4.0.0 - - - com.alibaba - druid - 1.0.15-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + - jar - druid - An JDBC datasource implementation. - https://github.com/alibaba/druid - 2013 + com.alibaba + druid + 1.0.16-SNAPSHOT - - 3.2.3.RELEASE - 4.11 + jar + druid + An JDBC datasource implementation. + https://github.com/alibaba/druid + 2013 - true - true + + 3.2.3.RELEASE + 4.11 - UTF-8 - 1.6 - + true + true - - - local-file - file://${basedir}/lib/ - default - - + UTF-8 + 1.6 + - - - - wenshao - wenshao - szujobs@hotmail.com - - - kiki - kiki - little.fierydragon@gmail.com - - - yako - yako - yakolyh@gmail.com - - + + + local-file + file://${basedir}/lib/ + default + + - - https://wenshao@github.com/alibaba/druid.git - scm:git:https://wenshao@github.com/alibaba/druid.git - + + + + wenshao + wenshao + szujobs@hotmail.com + + + kiki + kiki + little.fierydragon@gmail.com + + + yako + yako + yakolyh@gmail.com + + - - Alibaba Group - http://code.alibabatech.com/ - + + https://wenshao@github.com/alibaba/druid.git + scm:git:https://wenshao@github.com/alibaba/druid.git + - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - + + Alibaba Group + http://code.alibabatech.com/ + - - Jira - http://code.alibabatech.com/jira/browse/DRUID - - - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-2 - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - UTF-8 - ${jdk.version} - ${jdk.version} - true - - + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - - **/bvt/**/*.java - - true - - + + Jira + http://code.alibabatech.com/jira/browse/DRUID + + + + + org.apache.maven.wagon + wagon-webdav + 1.0-beta-2 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + UTF-8 + ${jdk.version} + ${jdk.version} + + - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - true - - + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + + **/bvt/**/*.java + + + - - maven-javadoc-plugin - 2.9 - - - attach-javadoc - - jar - - - - - ${javadoc.skip} - public - UTF-8 - UTF-8 - UTF-8 - - http://docs.oracle.com/javase/6/docs/api - - - + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + true + + - - maven-gpg-plugin - 1.4 - - ${gpg.skip} - - - - sign-artifacts - verify - - sign - - - - + + maven-javadoc-plugin + 2.9 + + + attach-javadoc + + jar + + + + + ${javadoc.skip} + public + UTF-8 + UTF-8 + UTF-8 + + http://docs.oracle.com/javase/6/docs/api + + + - - - - false - com.mycila.maven-license-plugin - maven-license-plugin - 1.10.b1 - -
${basedir}/doc/license.txt
- true - true - true - - - - - SLASHSTAR_STYLE - - - src/main/java/**/*.java - - UTF-8 - - - - check-headers - verify - - check - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - true - - - ${buildNumber} - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.1 - - - validate - - create - - - - - {0,date,yyyy-MM-dd HH:mm:ss} - - timestamp - - false - true - - - - + + maven-gpg-plugin + 1.4 + + ${gpg.skip} + + + + sign-artifacts + verify + + sign + + + + - - - default-profile - - true - - ${env.JAVA_HOME}/lib/jconsole.jar - - - - ${env.JAVA_HOME}/lib/tools.jar - ${env.JAVA_HOME}/lib/jconsole.jar - + + + + false + com.mycila.maven-license-plugin + maven-license-plugin + 1.10.b1 + +
${basedir}/doc/license.txt
+ true + true + true + + + + + SLASHSTAR_STYLE + + + src/main/java/**/*.java + + UTF-8 + + + + check-headers + verify + + check + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + + + ${buildNumber} + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.1 + + + validate + + create + + + + + {0,date,yyyy-MM-dd HH:mm:ss} + + timestamp + + false + true + + + + - - - com.alibaba - jconsole - 1.6.0 - system - ${jconsolejar} - true - - - com.alibaba - tools - 1.6.0 - system - ${toolsjar} - true - - - - - mac-profile - - false - - ${java.home}/../Classes/jconsole.jar - - - - - + + + default-profile + + true + + ${env.JAVA_HOME}/lib/jconsole.jar + + + + ${env.JAVA_HOME}/lib/tools.jar + ${env.JAVA_HOME}/lib/jconsole.jar + + + + + com.alibaba + jconsole + 1.6.0 + system + ${jconsolejar} + true + + + com.alibaba + tools + 1.6.0 + system + ${toolsjar} + true + + + + + mac-profile + + false + + ${java.home}/../Classes/jconsole.jar + + + + + com.alibaba + jconsole + 1.6.0 + system + ${java.home}/../Classes/jconsole.jar + + + mac-profile-oracle-jdk @@ -324,303 +314,293 @@ - + - - - javax.transaction - jta - 1.1 - provided - true - - - - javax.servlet - servlet-api - 2.5 - provided - true - - - commons-logging - commons-logging - 1.1.1 - provided - true - - - - org.springframework - spring-core - ${spring.version} - provided - true - - - org.springframework - spring-beans - ${spring.version} - provided - true - - - org.springframework - spring-orm - ${spring.version} - provided - true - - - org.springframework - spring-webmvc - ${spring.version} - provided - true - - - org.springframework - spring-test - ${spring.version} - test - - - - org.springframework - spring-ibatis - 2.0.8 - provided - true - - - org.mybatis - mybatis - 3.3.0 - provided - true - - - org.mybatis - mybatis-spring - 1.2.2 - provided - true - - - - log4j - log4j - 1.2.17 - provided - - - org.slf4j - slf4j-api - 1.6.1 - provided - - - org.slf4j - slf4j-log4j12 - 1.6.1 - provided - - - org.apache.logging.log4j - log4j-api - 2.3 - provided - - - org.apache.logging.log4j - log4j-core - 2.3 - provided - - - - mysql - mysql-connector-java - 5.1.35 - provided - - - net.sourceforge.jtds - jtds - 1.3.0 - provided - - - - postgresql - postgresql - 9.1-901-1.jdbc4 - provided - - - - - - - - + - cn.guoyukun.jdbc - oracle-ojdbc6 - 11.2.0.3.0 + javax.transaction + jta + 1.1 + provided + true - - - org.quartz-scheduler - quartz - 2.2.1 - provided - true - - - - junit - junit - ${junit.version} - test - - - org.apache.derby - derby - 10.9.1.0 - test - + + javax.servlet + servlet-api + 2.5 + provided + true + + + commons-logging + commons-logging + 1.1.1 + provided + true + - - commons-dbcp - commons-dbcp - 1.4 - test - - - com.jolbox - bonecp - 0.7.1.RELEASE - test - - - com.jolbox - bonecp-spring - 0.7.1.RELEASE - test - - - com.cloudhopper.proxool - proxool - 0.9.1 - test - - - com.cloudhopper.proxool + + org.springframework + spring-core + ${spring.version} + provided + true + + + org.springframework + spring-beans + ${spring.version} + provided + true + + + org.springframework + spring-orm + ${spring.version} + provided + true + + + org.springframework + spring-webmvc + ${spring.version} + provided + true + + + org.springframework + spring-test + ${spring.version} + test + + + + org.springframework + spring-ibatis + 2.0.8 + provided + true + + + org.mybatis + mybatis + 3.3.0 + provided + true + + + org.mybatis + mybatis-spring + 1.2.2 + provided + true + + + + log4j + log4j + 1.2.17 + provided + + + org.slf4j + slf4j-api + 1.6.1 + provided + + + org.slf4j + slf4j-log4j12 + 1.6.1 + provided + + + org.apache.logging.log4j + log4j-api + 2.3 + provided + + + org.apache.logging.log4j + log4j-core + 2.3 + provided + + + + mysql + mysql-connector-java + 5.1.35 + provided + + + net.sourceforge.jtds + jtds + 1.3.0 + provided + + + + postgresql + postgresql + 9.1-901-1.jdbc4 + provided + + + + com.oracle + ojdbc6 + 11.2.0.3 + provided + + + + org.quartz-scheduler + quartz + 2.2.1 + provided + true + + + + + junit + junit + ${junit.version} + test + + + org.apache.derby + derby + 10.9.1.0 + test + + + + commons-dbcp + commons-dbcp + 1.4 + test + + + com.jolbox + bonecp + 0.7.1.RELEASE + test + + + com.jolbox + bonecp-spring + 0.7.1.RELEASE + test + + + proxool + proxool + 0.9.1 + test + + + proxool proxool-cglib - 0.9.1 - test - + 0.9.1 + test + - - c3p0 - c3p0 - 0.9.1.2 - test - + + c3p0 + c3p0 + 0.9.1.2 + test + - - org.apache.tomcat - tomcat-jdbc - 8.0.12 - test - + + org.apache.tomcat + tomcat-jdbc + 8.0.12 + test + - - org.apache.ibatis - ibatis-sqlmap - 2.3.4.726 - provided - + + org.apache.ibatis + ibatis-sqlmap + 2.3.4.726 + provided + - - com.h2database - h2 - 1.3.170 - provided - + + com.h2database + h2 + 1.3.170 + provided + - - org.hibernate - hibernate-core - 4.1.9.Final - provided - + + org.hibernate + hibernate-core + 4.1.9.Final + provided + - - org.nutz - nutz - 1.b.52 - test - - - - com.taobao.tbdatasource - tbdatasource - 3.0.1.5.taobaocode - - - jboss - jboss-j2ee - - - - - - org.javasimon - javasimon-spring - 3.3.0 - test - - - org.javasimon - javasimon-jdbc4 - 3.3.0 - test - - - org.javasimon - javasimon-javaee - 3.3.0 - test - - - com.google.guava - guava - 14.0.1 - test - - + + org.nutz + nutz + 1.b.52 + test + - - - releases - gozap构件发布版仓库 - http://repo.gozap.com/repos/content/repositories/gozap/ - - - snapshots - gozap构件快照版仓库 - http://repo.gozap.com/repos/content/repositories/snapshots - - + + com.taobao.tbdatasource + tbdatasource + 2.0.2 + test + + + jboss + jboss-j2ee + + + + + org.javasimon + javasimon-spring + 3.3.0 + test + + + org.javasimon + javasimon-jdbc4 + 3.3.0 + test + + + org.javasimon + javasimon-javaee + 3.3.0 + test + + + com.google.guava + guava + 14.0.1 + test + + + + com.aliyun.odps + odps-sdk-udf + 0.17.3 + provided + true + + + javax.validation + validation-api + + + + diff --git a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java index f5e5f8148b..00a742374f 100644 --- a/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java +++ b/src/test/java/com/alibaba/druid/pool/MaxWaitTest.java @@ -19,6 +19,7 @@ import java.sql.Connection; import java.sql.Statement; import java.util.concurrent.CountDownLatch; +import EDU.oswego.cs.dl.util.concurrent.CountDown; import junit.framework.TestCase; public class MaxWaitTest extends TestCase {