branch develop updated (7488889 -> 7694e71)
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 7488889 [jgitflow-maven-plugin]updating poms for 3.14-SNAPSHOT development new 64c0587 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 8e5acf5 [jgitflow-maven-plugin]updating poms for branch'release/3.13' with non-snapshot versions new bd21407 [jgitflow-maven-plugin]merging 'release/3.13' into 'master' new 7c73903 [jgitflow-maven-plugin]merging 'master' into 'develop' new 7694e71 [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 7694e711746a2000a4bfcd4299bb81da9a8d9624 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:30 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 7c73903b7eeabf4b2da860dbebeba6c4714d942d Merge: 64c0587 bd21407 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:30 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 64c0587b86776f366a32ca1ca3241a27b3eccaf1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:29 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bd21407843e18e3ebe9d92e68507877cfcbb6909 Merge: f117e0b 8e5acf5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:27 2015 +0200 [jgitflow-maven-plugin]merging 'release/3.13' into 'master' commit 8e5acf5f5945d6c0a9d6104dc4b4c0f0225204f9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 22:57:46 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.13' 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 8e5acf5f5945d6c0a9d6104dc4b4c0f0225204f9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 22:57:46 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.13' 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 2dc1b00..71394b1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.13</version> <packaging>pom</packaging> <name>Wikitty</name> diff --git a/wikitty-api/pom.xml b/wikitty-api/pom.xml index e42eedc..f52648e 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-dto/pom.xml b/wikitty-dto/pom.xml index b1953a5..d44e1d0 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-generators/pom.xml b/wikitty-generators/pom.xml index d433815..f21c1e1 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-client/pom.xml b/wikitty-hessian-client/pom.xml index a192799..f51713e 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-server/pom.xml b/wikitty-hessian-server/pom.xml index 9c6effd..864297c 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-jdbc/pom.xml b/wikitty-jdbc/pom.xml index f73f6af..50d45a8 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-perf-test/pom.xml b/wikitty-perf-test/pom.xml index 95d2264..fd5ce0c 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-solr/pom.xml b/wikitty-solr/pom.xml index c8ff9bb..2279c98 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.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-struts/pom.xml b/wikitty-struts/pom.xml index f380b04..6580d30 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.13</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 bd21407843e18e3ebe9d92e68507877cfcbb6909 Merge: f117e0b 8e5acf5 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:27 2015 +0200 [jgitflow-maven-plugin]merging 'release/3.13' into 'master' pom.xml | 2 +- src/site/rst/user/query.rst | 15 +++++ wikitty-api/pom.xml | 2 +- .../java/org/nuiton/wikitty/WikittyClient.java | 11 ++-- .../nuiton/wikitty/query/WikittyQueryParser.java | 6 +- .../services/WikittyServiceAuthorisation.java | 20 ++++-- .../WikittyServiceAuthorisationReadNullify.java | 72 ++++++++++++++++++++++ .../storage/WikittySearchEngineInMemory.java | 5 +- .../java/org/nuiton/wikitty/WikittyClientTest.java | 48 ++++++++++++--- 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 +- 17 files changed, 163 insertions(+), 34 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 64c0587b86776f366a32ca1ca3241a27b3eccaf1 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:29 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 9364979..71394b1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13</version> <packaging>pom</packaging> <name>Wikitty</name> diff --git a/wikitty-api/pom.xml b/wikitty-api/pom.xml index dff940b..f52648e 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-dto/pom.xml b/wikitty-dto/pom.xml index a967e7f..d44e1d0 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-generators/pom.xml b/wikitty-generators/pom.xml index 8b30a5a..f21c1e1 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-client/pom.xml b/wikitty-hessian-client/pom.xml index 62b2c53..f51713e 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-server/pom.xml b/wikitty-hessian-server/pom.xml index 04567c2..864297c 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-jdbc/pom.xml b/wikitty-jdbc/pom.xml index de69224..50d45a8 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-perf-test/pom.xml b/wikitty-perf-test/pom.xml index 91ce2a8..fd5ce0c 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-solr/pom.xml b/wikitty-solr/pom.xml index 31eecc9..2279c98 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-struts/pom.xml b/wikitty-struts/pom.xml index c9938ff..6580d30 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.14-SNAPSHOT</version> + <version>3.13</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 7c73903b7eeabf4b2da860dbebeba6c4714d942d Merge: 64c0587 bd21407 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:30 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 7694e711746a2000a4bfcd4299bb81da9a8d9624 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 6 23:08:30 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 71394b1..9364979 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ </parent> <artifactId>wikitty</artifactId> - <version>3.13</version> + <version>3.14-SNAPSHOT</version> <packaging>pom</packaging> <name>Wikitty</name> diff --git a/wikitty-api/pom.xml b/wikitty-api/pom.xml index f52648e..dff940b 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-dto/pom.xml b/wikitty-dto/pom.xml index d44e1d0..a967e7f 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-generators/pom.xml b/wikitty-generators/pom.xml index f21c1e1..8b30a5a 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-client/pom.xml b/wikitty-hessian-client/pom.xml index f51713e..62b2c53 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-hessian-server/pom.xml b/wikitty-hessian-server/pom.xml index 864297c..04567c2 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-jdbc/pom.xml b/wikitty-jdbc/pom.xml index 50d45a8..de69224 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-perf-test/pom.xml b/wikitty-perf-test/pom.xml index fd5ce0c..91ce2a8 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-solr/pom.xml b/wikitty-solr/pom.xml index 2279c98..31eecc9 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</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> diff --git a/wikitty-struts/pom.xml b/wikitty-struts/pom.xml index 6580d30..c9938ff 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</version> + <version>3.14-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