branch develop updated (0361f5b -> 3ec719e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from 0361f5b fixes #8030 authors and copyright no more mandatory new 28bde90 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c967d2a [jgitflow-maven-plugin]updating poms for 2.0-RC2 branch with snapshot versions new b56d4c0 [jgitflow-maven-plugin]updating poms for branch'release/2.0-RC2' with non-snapshot versions new 5451851 [jgitflow-maven-plugin]merging 'release/2.0-RC2' into 'master' new 7f81ede [jgitflow-maven-plugin]merging 'master' into 'develop' new 3ec719e [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 3ec719eb07de902c4061a4c0f8235558f6394b2a Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:05 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 7f81edea538ab9c3b8d7f20791bdc16f208315ea Merge: 28bde90 5451851 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:05 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 28bde90c367c07e8a7c496d434550f63a399af51 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:05 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 54518516e391bcfe518ed2afa049c694f57b9580 Merge: 4b9e9dd b56d4c0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:04 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.0-RC2' into 'master' commit b56d4c07549551868808a01d7d2c3fb83c3c2b1e Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:54:25 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0-RC2' 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 http://git.forge.codelutin.com/coselmar.git commit b56d4c07549551868808a01d7d2c3fb83c3c2b1e Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:54:25 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0-RC2' 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 c341c20..6a09cad 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 261d297..c8011e4 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 67f5a4d..a5e7c12 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index c346a1f..c0768c6 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index a0f0010..bbfb39c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2-SNAPSHOT</version> + <version>2.0-RC2</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 http://git.forge.codelutin.com/coselmar.git commit 54518516e391bcfe518ed2afa049c694f57b9580 Merge: 4b9e9dd b56d4c0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:04 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.0-RC2' into 'master' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- .../indexation/DocumentsIndexationService.java | 9 +++++++-- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 -- .../src/main/webapp/views/documents/editDocument.html | 18 ++++++------------ .../main/webapp/views/documents/modalDocumentEdit.html | 15 ++++----------- .../src/main/webapp/views/documents/newdocument.html | 18 ++++++------------ pom.xml | 2 +- 10 files changed, 28 insertions(+), 44 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 http://git.forge.codelutin.com/coselmar.git commit 28bde90c367c07e8a7c496d434550f63a399af51 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:05 2016 +0100 [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 e95d64f..6a09cad 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 3fb133f..c8011e4 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 8b094e3..a5e7c12 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index dc630a4..c0768c6 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 2c943ca..bbfb39c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-RC2</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 http://git.forge.codelutin.com/coselmar.git commit 7f81edea538ab9c3b8d7f20791bdc16f208315ea Merge: 28bde90 5451851 Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:05 2016 +0100 [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 http://git.forge.codelutin.com/coselmar.git commit 3ec719eb07de902c4061a4c0f8235558f6394b2a Author: Maven Release <maven-release@codelutin.com> Date: Tue Mar 1 11:56:05 2016 +0100 [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 6a09cad..e95d64f 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index c8011e4..3fb133f 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index a5e7c12..8b094e3 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index c0768c6..dc630a4 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index bbfb39c..2c943ca 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>2.0-RC2</version> + <version>2.0-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