branch develop updated (26bcdf5 -> cec2d42)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git from 26bcdf5 fixes #3735: containsOne and containsAll with an empty collection returns all objects but no object should have been returned use expression with better performance (x4) new 5169438 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds af75b5c [jgitflow-maven-plugin]updating poms for 3.12.1 branch with snapshot versions new 28a812f [jgitflow-maven-plugin]updating poms for branch'release/3.12.1' with non-snapshot versions new f117e0b [jgitflow-maven-plugin]merging 'release/3.12.1' into 'master' new 266e826 [jgitflow-maven-plugin]merging 'master' into 'develop' new cec2d42 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cec2d423883f9bf43e9f04924e2113b7f0b5e05c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:26 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 266e82699e53039cc78723de1a21a78dd3470f44 Merge: 5169438 f117e0b Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:25 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 51694380e074ee37611332e2654e0524b6d704f7 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:25 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f117e0b75c8bc09ebb06f83fec803125b8caab8c Merge: ff9c8d6 28a812f Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:24 2015 +0200 [jgitflow-maven-plugin]merging 'release/3.12.1' into 'master' commit 28a812fe33629cf09ba9680af5aff2894177608a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:12:46 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.12.1' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit 28a812fe33629cf09ba9680af5aff2894177608a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:12:46 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.12.1' with non-snapshot versions --- pom.xml | 2 +- wikitty-api/pom.xml | 2 +- wikitty-dto/pom.xml | 2 +- wikitty-generators/pom.xml | 2 +- wikitty-hessian-client/pom.xml | 2 +- wikitty-hessian-server/pom.xml | 2 +- wikitty-jdbc/pom.xml | 2 +- wikitty-perf-test/pom.xml | 2 +- wikitty-solr/pom.xml | 2 +- wikitty-struts/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 90f6c8f..e983a70 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> <packaging>pom</packaging> <name>Wikitty</name> diff --git a/wikitty-api/pom.xml b/wikitty-api/pom.xml index 4da92dd..63308f6 100644 --- a/wikitty-api/pom.xml +++ b/wikitty-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-dto/pom.xml b/wikitty-dto/pom.xml index 81d7a5c..bd0ab0d 100644 --- a/wikitty-dto/pom.xml +++ b/wikitty-dto/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-generators/pom.xml b/wikitty-generators/pom.xml index 73d86d2..4857544 100644 --- a/wikitty-generators/pom.xml +++ b/wikitty-generators/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-client/pom.xml b/wikitty-hessian-client/pom.xml index c15826d..af185f7 100644 --- a/wikitty-hessian-client/pom.xml +++ b/wikitty-hessian-client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-server/pom.xml b/wikitty-hessian-server/pom.xml index da00e3e..78b490a 100644 --- a/wikitty-hessian-server/pom.xml +++ b/wikitty-hessian-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-jdbc/pom.xml b/wikitty-jdbc/pom.xml index 99c5872..470a260 100644 --- a/wikitty-jdbc/pom.xml +++ b/wikitty-jdbc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-perf-test/pom.xml b/wikitty-perf-test/pom.xml index 9863eb6..36fbd11 100644 --- a/wikitty-perf-test/pom.xml +++ b/wikitty-perf-test/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-solr/pom.xml b/wikitty-solr/pom.xml index 96d7cf6..e1e9ca6 100644 --- a/wikitty-solr/pom.xml +++ b/wikitty-solr/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-struts/pom.xml b/wikitty-struts/pom.xml index de5950d..50b525e 100644 --- a/wikitty-struts/pom.xml +++ b/wikitty-struts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit f117e0b75c8bc09ebb06f83fec803125b8caab8c Merge: ff9c8d6 28a812f Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:24 2015 +0200 [jgitflow-maven-plugin]merging 'release/3.12.1' into 'master' pom.xml | 2 +- wikitty-api/pom.xml | 2 +- wikitty-dto/pom.xml | 2 +- wikitty-generators/pom.xml | 2 +- wikitty-hessian-client/pom.xml | 2 +- wikitty-hessian-server/pom.xml | 2 +- wikitty-jdbc/pom.xml | 2 +- wikitty-perf-test/pom.xml | 2 +- wikitty-solr/pom.xml | 2 +- .../main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java | 6 ++++-- .../org/nuiton/wikitty/storage/solr/WikittyQueryVisitorToSolr.java | 6 +++--- .../java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java | 3 +++ wikitty-struts/pom.xml | 2 +- 13 files changed, 20 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit 51694380e074ee37611332e2654e0524b6d704f7 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:25 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- wikitty-api/pom.xml | 2 +- wikitty-dto/pom.xml | 2 +- wikitty-generators/pom.xml | 2 +- wikitty-hessian-client/pom.xml | 2 +- wikitty-hessian-server/pom.xml | 2 +- wikitty-jdbc/pom.xml | 2 +- wikitty-perf-test/pom.xml | 2 +- wikitty-solr/pom.xml | 2 +- wikitty-struts/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 2dc1b00..e983a70 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> <packaging>pom</packaging> <name>Wikitty</name> diff --git a/wikitty-api/pom.xml b/wikitty-api/pom.xml index e42eedc..63308f6 100644 --- a/wikitty-api/pom.xml +++ b/wikitty-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-dto/pom.xml b/wikitty-dto/pom.xml index b1953a5..bd0ab0d 100644 --- a/wikitty-dto/pom.xml +++ b/wikitty-dto/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-generators/pom.xml b/wikitty-generators/pom.xml index d433815..4857544 100644 --- a/wikitty-generators/pom.xml +++ b/wikitty-generators/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-client/pom.xml b/wikitty-hessian-client/pom.xml index a192799..af185f7 100644 --- a/wikitty-hessian-client/pom.xml +++ b/wikitty-hessian-client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-server/pom.xml b/wikitty-hessian-server/pom.xml index 9c6effd..78b490a 100644 --- a/wikitty-hessian-server/pom.xml +++ b/wikitty-hessian-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-jdbc/pom.xml b/wikitty-jdbc/pom.xml index f73f6af..470a260 100644 --- a/wikitty-jdbc/pom.xml +++ b/wikitty-jdbc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-perf-test/pom.xml b/wikitty-perf-test/pom.xml index 95d2264..36fbd11 100644 --- a/wikitty-perf-test/pom.xml +++ b/wikitty-perf-test/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-solr/pom.xml b/wikitty-solr/pom.xml index c8ff9bb..e1e9ca6 100644 --- a/wikitty-solr/pom.xml +++ b/wikitty-solr/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-struts/pom.xml b/wikitty-struts/pom.xml index f380b04..50b525e 100644 --- a/wikitty-struts/pom.xml +++ b/wikitty-struts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.12.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit 266e82699e53039cc78723de1a21a78dd3470f44 Merge: 5169438 f117e0b Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:25 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit cec2d423883f9bf43e9f04924e2113b7f0b5e05c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:22:26 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- wikitty-api/pom.xml | 2 +- wikitty-dto/pom.xml | 2 +- wikitty-generators/pom.xml | 2 +- wikitty-hessian-client/pom.xml | 2 +- wikitty-hessian-server/pom.xml | 2 +- wikitty-jdbc/pom.xml | 2 +- wikitty-perf-test/pom.xml | 2 +- wikitty-solr/pom.xml | 2 +- wikitty-struts/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index e983a70..2dc1b00 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> <packaging>pom</packaging> <name>Wikitty</name> diff --git a/wikitty-api/pom.xml b/wikitty-api/pom.xml index 63308f6..e42eedc 100644 --- a/wikitty-api/pom.xml +++ b/wikitty-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-dto/pom.xml b/wikitty-dto/pom.xml index bd0ab0d..b1953a5 100644 --- a/wikitty-dto/pom.xml +++ b/wikitty-dto/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-generators/pom.xml b/wikitty-generators/pom.xml index 4857544..d433815 100644 --- a/wikitty-generators/pom.xml +++ b/wikitty-generators/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-client/pom.xml b/wikitty-hessian-client/pom.xml index af185f7..a192799 100644 --- a/wikitty-hessian-client/pom.xml +++ b/wikitty-hessian-client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-server/pom.xml b/wikitty-hessian-server/pom.xml index 78b490a..9c6effd 100644 --- a/wikitty-hessian-server/pom.xml +++ b/wikitty-hessian-server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-jdbc/pom.xml b/wikitty-jdbc/pom.xml index 470a260..f73f6af 100644 --- a/wikitty-jdbc/pom.xml +++ b/wikitty-jdbc/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-perf-test/pom.xml b/wikitty-perf-test/pom.xml index 36fbd11..95d2264 100644 --- a/wikitty-perf-test/pom.xml +++ b/wikitty-perf-test/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-solr/pom.xml b/wikitty-solr/pom.xml index e1e9ca6..c8ff9bb 100644 --- a/wikitty-solr/pom.xml +++ b/wikitty-solr/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-struts/pom.xml b/wikitty-struts/pom.xml index 50b525e..f380b04 100644 --- a/wikitty-struts/pom.xml +++ b/wikitty-struts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.12.1</version> + <version>3.13-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm