From 2f2fc20caaca720c9bba22da3a1dcb333c24cebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Tue, 3 Jun 2014 23:00:55 +0300 Subject: [PATCH] Update deps --- querydsl-jpa/pom.xml | 2 +- querydsl-root/pom.xml | 4 ++-- querydsl-sql/pom.xml | 14 ++++++++++---- .../test/java/com/mysema/query/Connections.java | 2 +- .../src/test/java/com/mysema/query/SelectBase.java | 2 ++ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml index aff947918..98b8cd280 100644 --- a/querydsl-jpa/pom.xml +++ b/querydsl-jpa/pom.xml @@ -110,7 +110,7 @@ - postgresql + org.postgresql postgresql ${postgresql.version} test diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index f4f7e8fcc..8f6a73d9a 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -30,9 +30,9 @@ 10.10.1.1 2.3.1 1.3.174 - 9.1-901.jdbc4 + 9.3-1101-jdbc41 11.1.0.7.0 - 5.1.18 + 5.1.30 1.3.1 8.4.0 3.7.2 diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml index 1aaab0d93..cb6cb24af 100644 --- a/querydsl-sql/pom.xml +++ b/querydsl-sql/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -30,7 +30,13 @@ querydsl-spatial ${project.version} provided - + + + com.vividsolutions + jts + 1.10 + provided + joda-time joda-time @@ -79,7 +85,7 @@ test - postgresql + org.postgresql postgresql ${postgresql.version} provided @@ -308,4 +314,4 @@ - + diff --git a/querydsl-sql/src/test/java/com/mysema/query/Connections.java b/querydsl-sql/src/test/java/com/mysema/query/Connections.java index c4ad499d7..200583fc1 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/Connections.java +++ b/querydsl-sql/src/test/java/com/mysema/query/Connections.java @@ -106,7 +106,7 @@ public final class Connections { private static Connection getMySQL() throws SQLException, ClassNotFoundException { Class.forName("com.mysql.jdbc.Driver"); - String url = "jdbc:mysql://localhost:3306/querydsl"; + String url = "jdbc:mysql://localhost:3306/querydsl"; // ?useLegacyDatetimeCode=false return DriverManager.getConnection(url, "querydsl", "querydsl"); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java index 5d95046fa..c135ae010 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java +++ b/querydsl-sql/src/test/java/com/mysema/query/SelectBase.java @@ -326,6 +326,8 @@ public class SelectBase extends AbstractBaseTest { long tsTime = new org.joda.time.LocalTime(ts).getMillisOfDay(); List data = Lists.newArrayList(); + data.add(Constants.date); + data.add(Constants.time); data.add(new java.util.Date(ts)); data.add(new java.util.Date(tsDate)); data.add(new java.util.Date(tsTime));