From cc71e7d7bec4fa9f481718991b6b3b7893af014b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Sun, 27 Jul 2014 18:31:47 +0300 Subject: [PATCH 1/2] Make query classes non-final --- .../main/java/com/mysema/query/collections/CollQuery.java | 2 +- .../src/main/java/com/mysema/query/jdo/JDOQuery.java | 2 +- .../src/main/java/com/mysema/query/jpa/JPASubQuery.java | 2 +- .../java/com/mysema/query/jpa/hibernate/HibernateQuery.java | 2 +- .../com/mysema/query/jpa/hibernate/HibernateSubQuery.java | 2 +- .../mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java | 2 +- .../src/main/java/com/mysema/query/jpa/impl/JPAQuery.java | 2 +- .../src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java | 6 +++--- .../java/com/mysema/query/mongodb/morphia/MorphiaQuery.java | 2 +- .../src/main/java/com/mysema/query/sql/SQLQuery.java | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuery.java b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuery.java index fd88810a2..510b4f05c 100644 --- a/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuery.java +++ b/querydsl-collections/src/main/java/com/mysema/query/collections/CollQuery.java @@ -23,7 +23,7 @@ import com.mysema.query.SimpleQuery; * @author tiwe * */ -public final class CollQuery extends AbstractCollQuery implements Cloneable { +public class CollQuery extends AbstractCollQuery implements Cloneable { /** * Create a new CollQuery instance diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java index b21187c4a..bccabc6ad 100644 --- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java +++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/JDOQuery.java @@ -25,7 +25,7 @@ import com.mysema.query.QueryMetadata; * * @param */ -public final class JDOQuery extends AbstractJDOQuery { +public class JDOQuery extends AbstractJDOQuery { /** * Create a detached JDOQuery instance diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPASubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPASubQuery.java index 1b415bc30..51951e598 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPASubQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPASubQuery.java @@ -21,7 +21,7 @@ import com.mysema.query.QueryMetadata; * @author tiwe * */ -public final class JPASubQuery extends AbstractJPASubQuery { +public class JPASubQuery extends AbstractJPASubQuery { public JPASubQuery() { super(); diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java index 3b2005fc6..db2368a62 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateQuery.java @@ -27,7 +27,7 @@ import com.mysema.query.jpa.JPQLTemplates; * @author tiwe * */ -public final class HibernateQuery extends AbstractHibernateQuery { +public class HibernateQuery extends AbstractHibernateQuery { /** * Creates a detached query diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateSubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateSubQuery.java index 31ccce322..f9da05bc3 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateSubQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/HibernateSubQuery.java @@ -22,7 +22,7 @@ import com.mysema.query.jpa.AbstractJPASubQuery; * @author tiwe * */ -public final class HibernateSubQuery extends AbstractJPASubQuery { +public class HibernateSubQuery extends AbstractJPASubQuery { public HibernateSubQuery() { super(); diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java index 697406976..c5748cafb 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/hibernate/sql/HibernateSQLQuery.java @@ -27,7 +27,7 @@ import org.hibernate.StatelessSession; * @author tiwe * */ -public final class HibernateSQLQuery extends AbstractHibernateSQLQuery { +public class HibernateSQLQuery extends AbstractHibernateSQLQuery { public HibernateSQLQuery(Session session, SQLTemplates sqlTemplates) { super(session, new Configuration(sqlTemplates)); diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java index 008037076..534b3a8c2 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAQuery.java @@ -25,7 +25,7 @@ import com.mysema.query.jpa.JPQLTemplates; * @author tiwe * */ -public final class JPAQuery extends AbstractJPAQuery { +public class JPAQuery extends AbstractJPAQuery { /** * Creates a new detached query diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java index 8b1f61101..c492cdb5c 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/sql/JPASQLQuery.java @@ -13,13 +13,13 @@ */ package com.mysema.query.jpa.sql; +import javax.persistence.EntityManager; + import com.mysema.query.QueryMetadata; import com.mysema.query.jpa.QueryHandler; import com.mysema.query.sql.Configuration; import com.mysema.query.sql.SQLTemplates; -import javax.persistence.EntityManager; - /** * JPASQLQuery is an SQLQuery implementation that uses JPA Native SQL functionality * to execute queries @@ -27,7 +27,7 @@ import javax.persistence.EntityManager; * @author tiwe * */ -public final class JPASQLQuery extends AbstractJPASQLQuery { +public class JPASQLQuery extends AbstractJPASQLQuery { public JPASQLQuery(EntityManager entityManager, SQLTemplates sqlTemplates) { super(entityManager, new Configuration(sqlTemplates)); diff --git a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaQuery.java b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaQuery.java index be3186bf8..b2680f754 100644 --- a/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaQuery.java +++ b/querydsl-mongodb/src/main/java/com/mysema/query/mongodb/morphia/MorphiaQuery.java @@ -32,7 +32,7 @@ import com.mysema.query.types.EntityPath; * @author tiwe * */ -public final class MorphiaQuery extends MongodbQuery { +public class MorphiaQuery extends MongodbQuery { private final EntityCache cache; diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQuery.java index 0de5e70b6..c11e41aee 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQuery.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLQuery.java @@ -23,7 +23,7 @@ import com.mysema.query.QueryMetadata; * * @author tiwe */ -public final class SQLQuery extends AbstractSQLQuery { +public class SQLQuery extends AbstractSQLQuery { /** * Create a detached SQLQuery instance From 6a8080040fde065cf9df60483af3a23fa1a90925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 1 Aug 2014 22:46:26 +0300 Subject: [PATCH 2/2] Bump version --- querydsl-root/pom.xml | 1154 ++++++++++++++++++++--------------------- 1 file changed, 577 insertions(+), 577 deletions(-) diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index 4996e7a98..f7552c568 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -1,579 +1,579 @@ - - - 4.0.0 - com.mysema.querydsl - querydsl-root - 3.4.3.BUILD-SNAPSHOT - Querydsl - parent project for Querydsl modules - ${project.homepage} - - - com.mysema.home - mysema-source - 0.3.1 - - - pom - - 2007 - - - false - UTF-8 - http://www.querydsl.com - http://github.com/querydsl/querydsl - scm:git:git@github.com:querydsl/querydsl.git - - - 10.10.1.1 - 2.3.1 - 1.4.178 - 9.3-1101-jdbc41 - 11.1.0.7.0 - 5.1.30 - 1.3.1 - 8.4.0 - 3.7.2 - 13.10.00.35 - 2.2.5 - - 14.0 - 0.6.2 - 0.2.4 - 2.2.2 - 1.3.2 - 1.6.1 - - - - com.google.common.*;version=${@}, - * - - ${osgi.import.package.root} - - - - - junit - junit - 4.8.1 - test - - - javax.servlet - servlet-api - - - - - - org.easymock - easymock - 3.0 - test - - - cglib - cglib-nodep - - - - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - provided - - - - - - ${project.checkout} - ${project.checkout} - ${project.githubpage} - - - - - tiwe - Timo Westkämper - timo.westkamper@gmail.com - Mysema Ltd - - Project Manager - Architect - - - - sasa - Samppa Saarela - samppa.saarela@mysema.com - Mysema Ltd - - Developer - - - - vema - Vesa Marttila - vesa.marttila@mysema.com - Mysema Ltd - - Developer - - - - laim - Lassi Immonen - lassi.immonen@mysema.com - Mysema Ltd - - Developer - - - - - - - Apache License, Version 2.0 - LICENSE.txt - - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - com.mysema.maven - apt-maven-plugin - 1.1.2 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - - - bundle-manifest - process-classes - - manifest - - true - - - - ${osgi.import.package} - - - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.3.1 - - - check - verify - - enforce - - - - - - com/mysema/query/SearchResults - - BACKWARD_COMPATIBLE_USER - true - true - - - - - - - - org.semver - enforcer-rule - 0.9.24 - - - - - maven-assembly-plugin - - - ../querydsl-root/src/main/assembly.xml - - ../querydsl-root/target/dist - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - ${project.build.directory}/dist/apidocs - ${project.build.directory}/dist/apidocs - - - Core - com.mysema.query:com.mysema.query.alias:com.mysema.query.annotations:com.mysema.query.codegen:com.mysema.query.dml:com.mysema.query.functions:com.mysema.query.serialization:com.mysema.query.support:com.mysema.query.types* - - - APT - com.mysema.query.apt* - - - Spatial - com.mysema.query.spatial* - - - Collections - com.mysema.query.collections* - - - JPA - com.mysema.query.jpa* - - - JDO - com.mysema.query.jdo* - - - SQL - com.mysema.query.sql* - - - Spatial - com.mysema.query.spatial* - - - Lucene - com.mysema.query.lucene - - - Hibernate Search - com.mysema.query.search - - - Mongodb - com.mysema.query.mongodb* - - - - - - com.mysema.maven - maven-version-plugin - 0.1.0 - - - org.apache.maven.plugins - maven-pmd-plugin - 2.3 - - 1.6 - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - package - - jar - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xms256m -Xmx512m -XX:MaxPermSize=512m - com.mysema.testutil.ExternalDB - - - - org.apache.maven.surefire - surefire-junit47 - 2.16 - - - - - - - - - jahia - http://maven.jahia.org/maven2 - - - com.springsource.repository.bundles.release - http://repository.springsource.com/maven/bundles/release - - - geoapi - http://maven.geotoolkit.org - - - opengeo - http://repo.opengeo.org - - - nexus - https://maven.nuxeo.org/nexus/content/groups/public - - - - - - com.springsource.repository.bundles.release - http://repository.springsource.com/maven/bundles/release - - - com.springsource.repository.bundles.external - http://repository.springsource.com/maven/bundles/external - - - - - - all - true - - ../querydsl-core - ../querydsl-codegen - ../querydsl-spatial - ../querydsl-apt - ../querydsl-collections - ../querydsl-sql - ../querydsl-sql-codegen - ../querydsl-maven-plugin - ../querydsl-jpa - ../querydsl-jpa-codegen - ../querydsl-jdo - - - ../querydsl-lucene3 - ../querydsl-lucene4 - ../querydsl-hibernate-search - - - ../querydsl-mongodb - - - ../querydsl-scala - - - - - hibernate-search - - ../querydsl-core - ../querydsl-codegen - ../querydsl-lucene3 - ../querydsl-hibernate-search - - - - - jpa - - ../querydsl-core - ../querydsl-codegen - ../querydsl-spatial - ../querydsl-apt - ../querydsl-sql - ../querydsl-sql-codegen - ../querydsl-maven-plugin - ../querydsl-jpa - ../querydsl-jpa-codegen - - - - - jdo - - ../querydsl-core - ../querydsl-codegen - ../querydsl-spatial - ../querydsl-apt - ../querydsl-sql - ../querydsl-sql-codegen - ../querydsl-maven-plugin - ../querydsl-jdo - - - - - lucene - - ../querydsl-core - ../querydsl-codegen - ../querydsl-apt - ../querydsl-lucene3 - ../querydsl-lucene4 - - - - - mongodb - - ../querydsl-core - ../querydsl-codegen - ../querydsl-apt - ../querydsl-mongodb - - - - - sql - - ../querydsl-core - ../querydsl-codegen - ../querydsl-spatial - ../querydsl-sql - ../querydsl-sql-codegen - ../querydsl-maven-plugin - - - - - collections - - ../querydsl-core - ../querydsl-codegen - ../querydsl-apt - ../querydsl-collections - - - - - jenkins - - - - org.apache.maven.plugins - maven-surefire-plugin - - com.mysema.testutil.DummyInterface - - **/*$* - **/MSSQLSuiteTest.java - **/TeradataSuiteTest.java - - - - - - - - - travis - - - - org.apache.maven.plugins - maven-surefire-plugin - - com.mysema.testutil.DummyInterface - - **/*$* - **/ExportOracleTest.java - **/ExportTeradataTest.java - **/OracleSuiteTest.java - **/OracleWithQuotingTest.java - **/MSSQLSuiteTest.java - **/TeradataSuiteTest.java - - - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - true - - - - org.codehaus.mojo - junit-report-maven-plugin - devel - - true - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - true - - - - - + + + 4.0.0 + com.mysema.querydsl + querydsl-root + 3.4.3.BUILD-SNAPSHOT + Querydsl + parent project for Querydsl modules + ${project.homepage} + + + com.mysema.home + mysema-source + 0.3.1 + + + pom + + 2007 + + + false + UTF-8 + http://www.querydsl.com + http://github.com/querydsl/querydsl + scm:git:git@github.com:querydsl/querydsl.git + + + 10.10.1.1 + 2.3.1 + 1.4.178 + 9.3-1101-jdbc41 + 11.1.0.7.0 + 5.1.30 + 1.3.1 + 8.4.0 + 3.7.2 + 13.10.00.35 + 2.2.5 + + 14.0 + 0.6.2 + 0.2.4 + 2.2.2 + 1.3.2 + 1.6.1 + + + + com.google.common.*;version=${@}, + * + + ${osgi.import.package.root} + + + + + junit + junit + 4.8.1 + test + + + javax.servlet + servlet-api + + + + + + org.easymock + easymock + 3.0 + test + + + cglib + cglib-nodep + + + + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + provided + + + + + + ${project.checkout} + ${project.checkout} + ${project.githubpage} + + + + + tiwe + Timo Westkämper + timo.westkamper@gmail.com + Mysema Ltd + + Project Manager + Architect + + + + sasa + Samppa Saarela + samppa.saarela@mysema.com + Mysema Ltd + + Developer + + + + vema + Vesa Marttila + vesa.marttila@mysema.com + Mysema Ltd + + Developer + + + + laim + Lassi Immonen + lassi.immonen@mysema.com + Mysema Ltd + + Developer + + + + + + + Apache License, Version 2.0 + LICENSE.txt + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + com.mysema.maven + apt-maven-plugin + 1.1.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.16 + + + org.apache.felix + maven-bundle-plugin + 2.4.0 + + + bundle-manifest + process-classes + + manifest + + true + + + + ${osgi.import.package} + + + + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.3.1 + + + check + verify + + enforce + + + + + + com/mysema/query/SearchResults + + BACKWARD_COMPATIBLE_USER + true + true + + + + + + + + org.semver + enforcer-rule + 0.9.26 + + + + + maven-assembly-plugin + + + ../querydsl-root/src/main/assembly.xml + + ../querydsl-root/target/dist + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + ${project.build.directory}/dist/apidocs + ${project.build.directory}/dist/apidocs + + + Core + com.mysema.query:com.mysema.query.alias:com.mysema.query.annotations:com.mysema.query.codegen:com.mysema.query.dml:com.mysema.query.functions:com.mysema.query.serialization:com.mysema.query.support:com.mysema.query.types* + + + APT + com.mysema.query.apt* + + + Spatial + com.mysema.query.spatial* + + + Collections + com.mysema.query.collections* + + + JPA + com.mysema.query.jpa* + + + JDO + com.mysema.query.jdo* + + + SQL + com.mysema.query.sql* + + + Spatial + com.mysema.query.spatial* + + + Lucene + com.mysema.query.lucene + + + Hibernate Search + com.mysema.query.search + + + Mongodb + com.mysema.query.mongodb* + + + + + + com.mysema.maven + maven-version-plugin + 0.1.0 + + + org.apache.maven.plugins + maven-pmd-plugin + 2.3 + + 1.6 + true + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package + + jar + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + true + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xms256m -Xmx512m -XX:MaxPermSize=512m + com.mysema.testutil.ExternalDB + + + + org.apache.maven.surefire + surefire-junit47 + 2.16 + + + + + + + + + jahia + http://maven.jahia.org/maven2 + + + com.springsource.repository.bundles.release + http://repository.springsource.com/maven/bundles/release + + + geoapi + http://maven.geotoolkit.org + + + opengeo + http://repo.opengeo.org + + + nexus + https://maven.nuxeo.org/nexus/content/groups/public + + + + + + com.springsource.repository.bundles.release + http://repository.springsource.com/maven/bundles/release + + + com.springsource.repository.bundles.external + http://repository.springsource.com/maven/bundles/external + + + + + + all + true + + ../querydsl-core + ../querydsl-codegen + ../querydsl-spatial + ../querydsl-apt + ../querydsl-collections + ../querydsl-sql + ../querydsl-sql-codegen + ../querydsl-maven-plugin + ../querydsl-jpa + ../querydsl-jpa-codegen + ../querydsl-jdo + + + ../querydsl-lucene3 + ../querydsl-lucene4 + ../querydsl-hibernate-search + + + ../querydsl-mongodb + + + ../querydsl-scala + + + + + hibernate-search + + ../querydsl-core + ../querydsl-codegen + ../querydsl-lucene3 + ../querydsl-hibernate-search + + + + + jpa + + ../querydsl-core + ../querydsl-codegen + ../querydsl-spatial + ../querydsl-apt + ../querydsl-sql + ../querydsl-sql-codegen + ../querydsl-maven-plugin + ../querydsl-jpa + ../querydsl-jpa-codegen + + + + + jdo + + ../querydsl-core + ../querydsl-codegen + ../querydsl-spatial + ../querydsl-apt + ../querydsl-sql + ../querydsl-sql-codegen + ../querydsl-maven-plugin + ../querydsl-jdo + + + + + lucene + + ../querydsl-core + ../querydsl-codegen + ../querydsl-apt + ../querydsl-lucene3 + ../querydsl-lucene4 + + + + + mongodb + + ../querydsl-core + ../querydsl-codegen + ../querydsl-apt + ../querydsl-mongodb + + + + + sql + + ../querydsl-core + ../querydsl-codegen + ../querydsl-spatial + ../querydsl-sql + ../querydsl-sql-codegen + ../querydsl-maven-plugin + + + + + collections + + ../querydsl-core + ../querydsl-codegen + ../querydsl-apt + ../querydsl-collections + + + + + jenkins + + + + org.apache.maven.plugins + maven-surefire-plugin + + com.mysema.testutil.DummyInterface + + **/*$* + **/MSSQLSuiteTest.java + **/TeradataSuiteTest.java + + + + + + + + + travis + + + + org.apache.maven.plugins + maven-surefire-plugin + + com.mysema.testutil.DummyInterface + + **/*$* + **/ExportOracleTest.java + **/ExportTeradataTest.java + **/OracleSuiteTest.java + **/OracleWithQuotingTest.java + **/MSSQLSuiteTest.java + **/TeradataSuiteTest.java + + + + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + true + + + + org.codehaus.mojo + junit-report-maven-plugin + devel + + true + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + true + + + + +