From 18949a9a75c3d3cc72e15b50cabb30db2b85d4bc Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 23 Dec 2012 19:53:07 +0800 Subject: [PATCH 1/3] use hibernate 4.1.9.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index aa6d58e705..b98e19a832 100644 --- a/pom.xml +++ b/pom.xml @@ -508,7 +508,7 @@ org.hibernate hibernate-core - 4.1.8.Final + 4.1.9.Final provided From 8ebe956a711746a335e9717e83b595ce47c21366 Mon Sep 17 00:00:00 2001 From: wenshao Date: Sun, 23 Dec 2012 22:45:45 +0800 Subject: [PATCH 2/3] update dependency version --- pom.xml | 26 +++++++------------ .../alibaba/druid/bvt/proxy/WrapImplTest.java | 2 +- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index b98e19a832..b1f6986875 100644 --- a/pom.xml +++ b/pom.xml @@ -343,6 +343,13 @@ provided true + + org.springframework + spring-test + ${spring.version} + test + + org.springframework spring-ibatis @@ -433,16 +440,10 @@ ${junit.version} test - - org.springframework - spring-test - 3.1.2.RELEASE - test - org.apache.derby derby - 10.8.2.2 + 10.9.1.0 test @@ -487,7 +488,7 @@ org.apache.tomcat tomcat-jdbc - 7.0.33 + 7.0.34 test @@ -519,17 +520,10 @@ test - - commons-dbutils - commons-dbutils - 1.5 - test - - org.nutz nutz - 1.b.46 + 1.b.47 test diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java index ab2eb4f5be..767d205aa1 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java @@ -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)); From fcab477c658e95c2166b085a72e67811c63a45b7 Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 24 Dec 2012 11:03:55 +0800 Subject: [PATCH 3/3] druid 0.2.10 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b1f6986875..3bf61e068d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.alibaba druid - 0.2.10-SNAPSHOT + 0.2.10 jar druid @@ -131,7 +131,6 @@ - true public UTF-8 UTF-8