branch develop updated (16bbbae4 -> ccb6a0b2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 16bbbae4 [jgitflow-maven-plugin]updating poms for 4.0.14-SNAPSHOT development new ecfafdda [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 3a98d3d9 [jgitflow-maven-plugin]updating poms for branch'release/4.0.13' with non-snapshot versions new be377dde [jgitflow-maven-plugin]merging 'release/4.0.13' into 'master' new 66b830e8 [jgitflow-maven-plugin]merging 'master' into 'develop' new ccb6a0b2 [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 ccb6a0b27835b044766cb61ac46e55f219f45558 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:32:13 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 66b830e82090702a766c6ed6de7a823273eefd68 Merge: ecfafdda be377dde Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:32:10 2018 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit ecfafdda34013e4e6b9b0b92235470518b2700de Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:32:09 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit be377ddea3c25cd5f8924a1de894ea9b4d3d0a2a Merge: f1ee80c7 3a98d3d9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:31:49 2018 +0100 [jgitflow-maven-plugin]merging 'release/4.0.13' into 'master' commit 3a98d3d9a8f0418891a3c3bca5e9b4c9b51756d1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:26:27 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.13' 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 3a98d3d9a8f0418891a3c3bca5e9b4c9b51756d1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:26:27 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.13' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index d5362e3e..011aa9a7 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13-SNAPSHOT</version> + <version>4.0.13</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 6d83635f..da55744c 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13-SNAPSHOT</version> + <version>4.0.13</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 44af82c4..1e06e269 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13-SNAPSHOT</version> + <version>4.0.13</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 751fae7c..a1904005 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13-SNAPSHOT</version> + <version>4.0.13</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit be377ddea3c25cd5f8924a1de894ea9b4d3d0a2a Merge: f1ee80c7 3a98d3d9 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:31:49 2018 +0100 [jgitflow-maven-plugin]merging 'release/4.0.13' into 'master' echobase-domain/pom.xml | 2 +- .../persistence/migration/EchoBaseMigrationCallBackResolver.java | 3 ++- echobase-services/pom.xml | 2 +- .../actions/VoyageCatchesBiometrySampleImportAction.java | 7 +++++-- .../csv/VoyageCatchesBiometrySampleImportExportModel.java | 4 ++-- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 13 insertions(+), 9 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit ecfafdda34013e4e6b9b0b92235470518b2700de Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:32:09 2018 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index fdcd786e..011aa9a7 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.13</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 667bf44a..da55744c 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.13</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 0ccf3860..1e06e269 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.13</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index cb7b824b..a1904005 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.14-SNAPSHOT</version> + <version>4.0.13</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 66b830e82090702a766c6ed6de7a823273eefd68 Merge: ecfafdda be377dde Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:32:10 2018 +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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit ccb6a0b27835b044766cb61ac46e55f219f45558 Author: Maven Release <maven-release@codelutin.com> Date: Fri Mar 2 10:32:13 2018 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 011aa9a7..fdcd786e 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index da55744c..667bf44a 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 1e06e269..0ccf3860 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a1904005..cb7b824b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.13</version> + <version>4.0.14-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm