diff --git a/pom.xml b/pom.xml
index 864224cb09..7cc882be6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
-
com.alibaba
druid
@@ -21,8 +19,8 @@
2013
- 3.2.3.RELEASE
- 4.11
+ 4.2.5.RELEASE
+ 4.12
true
true
@@ -337,15 +335,15 @@
javax.servlet
- servlet-api
- 2.5
+ javax.servlet-api
+ 3.1.0
provided
true
commons-logging
commons-logging
- 1.1.1
+ 1.2
provided
true
@@ -395,18 +393,17 @@
org.mybatis
mybatis
- 3.3.0
+ 3.3.1
provided
true
org.mybatis
mybatis-spring
- 1.2.2
+ 1.2.4
provided
true
-
log4j
log4j
@@ -416,41 +413,40 @@
org.slf4j
slf4j-api
- 1.6.1
+ 1.7.9
provided
org.slf4j
slf4j-log4j12
- 1.6.1
+ 1.7.9
provided
org.apache.logging.log4j
log4j-api
- 2.3
+ 2.5
provided
org.apache.logging.log4j
log4j-core
- 2.3
+ 2.5
provided
mysql
mysql-connector-java
- 5.1.35
+ 5.1.38
provided
net.sourceforge.jtds
jtds
- 1.3.0
+ 1.3.1
provided
-
postgresql
postgresql
@@ -468,7 +464,7 @@
org.quartz-scheduler
quartz
- 2.2.1
+ 2.2.2
provided
true
@@ -484,7 +480,7 @@
org.apache.derby
derby
- 10.9.1.0
+ 10.12.1.1
test
@@ -494,16 +490,22 @@
1.4
test
+
+ org.apache.commons
+ commons-dbcp2
+ 2.1.1
+ test
+
com.jolbox
bonecp
- 0.7.1.RELEASE
+ 0.8.0.RELEASE
test
com.jolbox
bonecp-spring
- 0.7.1.RELEASE
+ 0.8.0.RELEASE
test
@@ -529,7 +531,7 @@
org.apache.tomcat
tomcat-jdbc
- 8.0.12
+ 8.0.32
test
@@ -543,21 +545,27 @@
com.h2database
h2
- 1.3.170
+ 1.4.191
provided
org.hibernate
hibernate-core
- 4.1.9.Final
+ 5.1.0.Final
+ provided
+
+
+ org.hibernate
+ hibernate-c3p0
+ 5.1.0.Final
provided
org.nutz
nutz
- 1.b.52
+ 1.r.55
test
@@ -577,28 +585,27 @@
org.javasimon
javasimon-spring
- 3.3.0
+ 4.1.1
test
org.javasimon
- javasimon-jdbc4
- 3.3.0
+ javasimon-jdbc41
+ 4.1.1
test
org.javasimon
javasimon-javaee
- 3.3.0
+ 4.1.1
test
com.google.guava
guava
- 14.0.1
+ 19.0
test
-
com.aliyun.odps
odps-sdk-udf
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java
index ff5f1d81ca..5c3a8c15e4 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java b/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java
index a2d7b0294d..a83f34c097 100644
--- a/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java
+++ b/src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java
@@ -19,7 +19,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Map;
-import org.hibernate.service.jdbc.connections.spi.ConnectionProvider;
+import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.Stoppable;
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 19d5c57b53..ac98a8bedd 100644
--- a/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/proxy/WrapImplTest.java
@@ -55,7 +55,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(9, dataSource.getRawDriverMinorVersion());
+ Assert.assertEquals(12, dataSource.getRawDriverMinorVersion());
Assert.assertFalse(connection.isWrapperFor(com.mysql.jdbc.Connection.class));
Assert.assertTrue(connection.isWrapperFor(ConnectionProxyImpl.class));
diff --git a/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java
new file mode 100644
index 0000000000..b9fd10d44c
--- /dev/null
+++ b/src/test/java/com/alibaba/druid/bvt/sql/schemaStat/SchemaStatTest.java
@@ -0,0 +1,23 @@
+package com.alibaba.druid.bvt.sql.schemaStat;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
+
+import junit.framework.TestCase;
+
+public class SchemaStatTest extends TestCase {
+ public void test_schemaStat() throws Exception {
+ String sql = "select id as orderId from t_order order by orderId";
+
+ SQLStatementParser parser = new SQLStatementParser(sql);
+ SQLStatement stmt = parser.parseStatementList().get(0);
+
+ SchemaStatVisitor statVisitor = new SchemaStatVisitor();
+ stmt.accept(statVisitor);
+
+ Assert.assertEquals(1, statVisitor.getColumns().size());
+ }
+}