branch develop updated (b1db4c7 -> c91ec94)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See http://git.codelutin.com/coser.git from b1db4c7 fixes #6444: Problème de cohérence de l'écran d'extraction des données new b3b71b1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2f7c24d [jgitflow-maven-plugin]updating poms for branch '1.5.2' with snapshot versions new 7c5c8c0 [jgitflow-maven-plugin]updating poms for branch'release/1.5.2' with non-snapshot versions new 925b0bf Merge branch 'release/1.5.2' new cbf0a15 Merge branch 'master' into develop new c91ec94 [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 c91ec948be16e2db85267703810d2d01812fc6fc Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit cbf0a15b0fade422b649dc41d974d860e47295b8 Merge: b3b71b1 925b0bf Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:45 2015 +0000 Merge branch 'master' into develop commit b3b71b1506384a145fc5752e3d2b06f366957964 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 925b0bfa8577effccaa1a5c7df5fd69a1c84c5c1 Merge: c455238 7c5c8c0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:43 2015 +0000 Merge branch 'release/1.5.2' commit 7c5c8c006dd38162dde351e74cd2e190f011ee40 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:47:24 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.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 coser. See http://git.codelutin.com/coser.git commit 7c5c8c006dd38162dde351e74cd2e190f011ee40 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:47:24 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.2' with non-snapshot versions --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index c5f9f73..6ca036c 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 5a1af20..4c6d54a 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 46925ad..d7db712 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 21f871b..2336be5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2-SNAPSHOT</version> + <version>1.5.2</version> <packaging>pom</packaging> <name>Coser</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 coser. See http://git.codelutin.com/coser.git commit 925b0bfa8577effccaa1a5c7df5fd69a1c84c5c1 Merge: c455238 7c5c8c0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:43 2015 +0000 Merge branch 'release/1.5.2' coser-business/pom.xml | 2 +- .../request/ExtractRawDataAndResultsRequest.java | 27 ++++- .../main/java/fr/ifremer/coser/util/DataType.java | 48 +++++++- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- .../coser/web/actions/search/ExtractAction.java | 133 +++++---------------- .../WEB-INF/content/search/extract-input.jsp | 120 +++++++++---------- pom.xml | 2 +- 8 files changed, 153 insertions(+), 183 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 coser. See http://git.codelutin.com/coser.git commit b3b71b1506384a145fc5752e3d2b06f366957964 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 8a0163c..6ca036c 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 46164ab..4c6d54a 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index adfec90..d7db712 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 78ced4d..2336be5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.2</version> <packaging>pom</packaging> <name>Coser</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 coser. See http://git.codelutin.com/coser.git commit cbf0a15b0fade422b649dc41d974d860e47295b8 Merge: b3b71b1 925b0bf Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:45 2015 +0000 Merge branch '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 coser. See http://git.codelutin.com/coser.git commit c91ec948be16e2db85267703810d2d01812fc6fc Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 17:50:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 6ca036c..8a0163c 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 4c6d54a..46164ab 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index d7db712..adfec90 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 2336be5..78ced4d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.2</version> + <version>1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm