CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-27 21:01:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into codegen-version

Browse Source
This commit is contained in:
Timo Westkämper 2014-09-19 07:12:17 +03:00
commit 103261972d
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
querydsl-core/src/test/java/com/mysema/testutil/Runner.java
View File

@ -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());
}

5
querydsl-jpa/src/test/java/com/mysema/query/suites/H2BatooTest.java
View File

@ -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 {}

10
querydsl-root/pom.xml
View File

@ -38,8 +38,8 @@
<sqlite.version>3.7.2</sqlite.version>
<teradata.version>13.10.00.35</teradata.version>
<firebird.version>2.2.5</firebird.version>
<guava.version>14.0</guava.version>
<guava.version>18.0</guava.version>
<codegen.version>0.6.4</codegen.version>
<mysema.lang.version>0.2.4</mysema.lang.version>
<cglib.version>2.2.2</cglib.version>
@ -373,7 +373,11 @@
</repository>
<repository>
<id>opengeo</id>
<url>http://repo.opengeo.org</url>
<url>http://download.osgeo.org/webdav/geotools</url>
</repository>
<repository>
<id>mapfish</id>
<url>http://dev.mapfish.org/maven/repository/repository</url>
</repository>
<repository>
<id>nexus</id>

4
querydsl-sql-codegen/pom.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
@ -219,4 +219,4 @@
</plugins>
</build>
</project>
</project>

4
querydsl-sql/pom.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
@ -331,4 +331,4 @@
</repository>
</repositories>
</project>
</project>