From 11980c59a46ba22a3cab3cf384503503b347f0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 17 Sep 2014 21:47:45 +0300 Subject: [PATCH 1/8] Upgrade Guava version to 18.0 --- querydsl-root/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index 4d2f0c6b6..ff619fac2 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -39,7 +39,7 @@ 13.10.00.35 2.2.5 - 14.0 + 18.0 0.6.3 0.2.4 2.2.2 @@ -373,7 +373,7 @@ opengeo - http://repo.opengeo.org + http://repo.boundlessgeo.com nexus From cca8e9b2647c1d9feeae1ba391ff8676112463ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 17 Sep 2014 21:48:38 +0300 Subject: [PATCH 2/8] Update API usage --- querydsl-core/src/test/java/com/mysema/testutil/Runner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-core/src/test/java/com/mysema/testutil/Runner.java b/querydsl-core/src/test/java/com/mysema/testutil/Runner.java index fb0b05fbd..9b7fd1e59 100644 --- a/querydsl-core/src/test/java/com/mysema/testutil/Runner.java +++ b/querydsl-core/src/test/java/com/mysema/testutil/Runner.java @@ -30,7 +30,7 @@ public final class Runner { System.err.print("- "); // perform timing - Stopwatch stopwatch = new Stopwatch().start(); + Stopwatch stopwatch = Stopwatch.createStarted(); benchmark.run(BENCHMARK); System.err.println(label + " " + stopwatch.stop().toString()); } From b0e11100818d5546e3a218eec8430022d810c732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 17 Sep 2014 21:48:47 +0300 Subject: [PATCH 3/8] Ignore Batoo test --- .../src/test/java/com/mysema/query/suites/H2BatooTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java b/querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java index 36d57e423..612f9da7a 100644 --- a/querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java +++ b/querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java @@ -1,14 +1,15 @@ package com.mysema.query.suites; -import org.junit.BeforeClass; - import com.mysema.query.JPABase; import com.mysema.query.JPASQLBase; import com.mysema.query.Mode; import com.mysema.query.Target; import com.mysema.query.jpa.JPAIntegrationBase; import com.mysema.query.jpa.SerializationBase; +import org.junit.BeforeClass; +import org.junit.Ignore; +@Ignore public class H2BatooTest extends AbstractJPASuite { public static class JPA extends JPABase {} From 759875961094288d9943e10c7fe035bbe636fec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 17 Sep 2014 22:15:01 +0300 Subject: [PATCH 4/8] Fix repo url --- querydsl-root/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index ff619fac2..3ef732dda 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -373,7 +373,7 @@ opengeo - http://repo.boundlessgeo.com + http://repo.boundlessgeo.com/main nexus From d3bd6876644c228aecbf1fa30360450daaac2dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 17 Sep 2014 22:34:49 +0300 Subject: [PATCH 5/8] Bump geodb version --- querydsl-sql/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml index 231e398e1..a804c656f 100644 --- a/querydsl-sql/pom.xml +++ b/querydsl-sql/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -134,7 +134,7 @@ org.opengeo geodb - 0.7 + 0.8 test @@ -331,4 +331,4 @@ - + From 3d4998f19e1ffd9438ba9eef0394a6ee219935ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Wed, 17 Sep 2014 22:43:26 +0300 Subject: [PATCH 6/8] Bump geodb version --- querydsl-sql-codegen/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml index b21c2b31b..c1436ba30 100644 --- a/querydsl-sql-codegen/pom.xml +++ b/querydsl-sql-codegen/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -109,7 +109,7 @@ org.opengeo geodb - 0.7 + 0.8 test @@ -219,4 +219,4 @@ - + From 3a25a2184daebbb77c464cd747d9811aad260512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Thu, 18 Sep 2014 21:47:13 +0300 Subject: [PATCH 7/8] Revert version bump --- querydsl-root/pom.xml | 2 +- querydsl-sql-codegen/pom.xml | 2 +- querydsl-sql/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index 3ef732dda..c04dc763b 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -373,7 +373,7 @@ opengeo - http://repo.boundlessgeo.com/main + http://download.osgeo.org/webdav/geotools nexus diff --git a/querydsl-sql-codegen/pom.xml b/querydsl-sql-codegen/pom.xml index c1436ba30..7225bb16b 100644 --- a/querydsl-sql-codegen/pom.xml +++ b/querydsl-sql-codegen/pom.xml @@ -109,7 +109,7 @@ org.opengeo geodb - 0.8 + 0.7 test diff --git a/querydsl-sql/pom.xml b/querydsl-sql/pom.xml index a804c656f..cb036f271 100644 --- a/querydsl-sql/pom.xml +++ b/querydsl-sql/pom.xml @@ -134,7 +134,7 @@ org.opengeo geodb - 0.8 + 0.7 test From b3d4232ab9f57f0f9ec7e01dde402f3b02238159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Thu, 18 Sep 2014 22:23:02 +0300 Subject: [PATCH 8/8] Add repository --- querydsl-root/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index c04dc763b..2280328e0 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -375,6 +375,10 @@ opengeo http://download.osgeo.org/webdav/geotools + + mapfish + http://dev.mapfish.org/maven/repository/repository + nexus https://maven.nuxeo.org/nexus/content/groups/public