branch develop updated (41ee679 -> fc6b44b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git from 41ee679 fixes #9243 downgrade lucene version to be jkd7-proof new f7008b0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8d19a69 [jgitflow-maven-plugin]updating poms for 3.0.2 branch with snapshot versions new d357a7e [jgitflow-maven-plugin]updating poms for branch'release/3.0.2' with non-snapshot versions new a3cc9e6 [jgitflow-maven-plugin]merging 'release/3.0.2' into 'master' new 2b887e1 [jgitflow-maven-plugin]merging 'master' into 'develop' new fc6b44b [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 fc6b44b2f8a1095129ed489bf797c9e164ee140c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:11 2017 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2b887e116521f55c168175f866af11b32831e4f9 Merge: f7008b0 a3cc9e6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:11 2017 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f7008b0d208f639ca0bdf9eae0c6319e5d28aba5 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:10 2017 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a3cc9e6bc873a4344af39dccaf5311dda8939661 Merge: 8bc75ff d357a7e Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:08 2017 +0200 [jgitflow-maven-plugin]merging 'release/3.0.2' into 'master' commit d357a7e840c78a3e4787adc0c2f95dd9257d2f13 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:33:53 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0.2' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit d357a7e840c78a3e4787adc0c2f95dd9257d2f13 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:33:53 2017 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.0.2' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 129295f..52331e6 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 860168f..64e4275 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 36a289e..43129ed 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 9d180e3..3767ff1 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 5f338a7..17e0080 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2-SNAPSHOT</version> + <version>3.0.2</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit a3cc9e6bc873a4344af39dccaf5311dda8939661 Merge: 8bc75ff d357a7e Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:08 2017 +0200 [jgitflow-maven-plugin]merging 'release/3.0.2' into 'master' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/beans/DocumentSearchExample.java | 32 +++++++--- .../coselmar/beans/QuestionSearchExample.java | 32 +++++++--- .../persistence/entity/QuestionTopiaDao.java | 12 ++-- coselmar-rest/pom.xml | 2 +- .../fr/ifremer/coselmar/beans/AbstractMail.java | 2 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 8 ++- .../ifremer/coselmar/beans/DocumentSearchBean.java | 31 +++++++--- .../fr/ifremer/coselmar/beans/QuestionBean.java | 24 ++++++-- .../ifremer/coselmar/beans/QuestionSearchBean.java | 32 +++++++--- .../ifremer/coselmar/beans/QuestionTreeNode.java | 16 +++-- .../coselmar/converter/BeanEntityConverter.java | 69 ++++------------------ .../coselmar/services/CoselmarRestUtil.java | 6 +- .../services/CoselmarWebServiceSupport.java | 9 +++ .../services/DefaultCoselmarServicesContext.java | 9 ++- .../services/StringLongMapValueComparator.java | 8 ++- .../indexation/DocumentsIndexationService.java | 26 ++++---- .../coselmar/services/indexation/LuceneUtils.java | 7 +-- .../indexation/QuestionsIndexationService.java | 22 ++++--- .../coselmar/services/indexation/TikaUtils.java | 14 +++-- .../indexation/TransverseIndexationService.java | 20 ++++--- .../coselmar/services/v1/DocumentsWebService.java | 22 +++---- .../coselmar/services/v1/GeneralWebService.java | 2 +- .../coselmar/services/v1/QuestionsWebService.java | 22 +++---- .../coselmar/services/v1/UsersWebService.java | 4 +- coselmar-ui/pom.xml | 2 +- pom.xml | 4 +- 28 files changed, 255 insertions(+), 186 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit f7008b0d208f639ca0bdf9eae0c6319e5d28aba5 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:10 2017 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index fcda085..52331e6 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 437f9c4..64e4275 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 0fa57c0..43129ed 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index d59cf8b..3767ff1 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index cfcc531..17e0080 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.0.2</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit 2b887e116521f55c168175f866af11b32831e4f9 Merge: f7008b0 a3cc9e6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:11 2017 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit fc6b44b2f8a1095129ed489bf797c9e164ee140c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jun 20 10:37:11 2017 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 52331e6..fcda085 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 64e4275..437f9c4 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 43129ed..0fa57c0 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 3767ff1..d59cf8b 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2</version> + <version>3.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 17e0080..cfcc531 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>3.0.2</version> + <version>3.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm