Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #243 from wenshao/master

Browse Source 
0.2.10
This commit is contained in:
温高铁
2012-12-23 19:04:46 -08:00
parent 8c9fdf8d7e fcab477c65
commit 970f82e42e
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+12 -19
View File
@@ -4,7 +4,7 @@
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>0.2.10-SNAPSHOT</version>
<version>0.2.10</version>
<packaging>jar</packaging>
<name>druid</name>
@@ -131,7 +131,6 @@
</execution>
</executions>
<configuration>
<skip>true</skip>
<show>public</show>
<charset>UTF-8</charset>
<encoding>UTF-8</encoding>
@@ -343,6 +342,13 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-ibatis</artifactId>
@@ -433,16 +439,10 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>3.1.2.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.8.2.2</version>
<version>10.9.1.0</version>
<scope>test</scope>
</dependency>
@@ -487,7 +487,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>7.0.33</version>
<version>7.0.34</version>
<scope>test</scope>
</dependency>
@@ -508,7 +508,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>4.1.8.Final</version>
<version>4.1.9.Final</version>
<scope>provided</scope>
</dependency>
@@ -519,17 +519,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-dbutils</groupId>
<artifactId>commons-dbutils</artifactId>
<version>1.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz</artifactId>
<version>1.b.46</version>
<version>1.b.47</version>
<scope>test</scope>
</dependency>
<dependency>
src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class WrapImplTest extends TestCase {
Assert.assertEquals(url, dataSource.getUrl());
Assert.assertEquals("jdbc:derby:classpath:petstore-db", dataSource.getRawUrl());
Assert.assertEquals(10, dataSource.getRawDriverMajorVersion());
Assert.assertEquals(8, dataSource.getRawDriverMinorVersion());
Assert.assertEquals(9, dataSource.getRawDriverMinorVersion());
Assert.assertFalse(connection.isWrapperFor(com.mysql.jdbc.Connection.class));
Assert.assertTrue(connection.isWrapperFor(ConnectionProxyImpl.class));