branch develop updated (63f9ace -> 74dab2f)
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 63f9ace [jgitflow-maven-plugin]updating poms for 4.0.8-SNAPSHOT development new 4ab771f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 1e0822f [jgitflow-maven-plugin]updating poms for branch'release/4.0.7' with non-snapshot versions new 93cea64 [jgitflow-maven-plugin]merging 'release/4.0.7' into 'master' new f04fc36 [jgitflow-maven-plugin]merging 'master' into 'develop' new 74dab2f [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 74dab2f3c2660505c61885e4dd32b537426ee43d Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:43 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f04fc36e3130eea193e94a61c95c12d88bb9bcac Merge: 4ab771f 93cea64 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:40 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 4ab771fb040f3906017ef16f9c3a9452a1d4d00f Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:36 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 93cea6439ada1096e36ab1fab1be6a68e4f48b08 Merge: d27b820 1e0822f Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:28 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.7' into 'master' commit 1e0822fe43e96fdb5198acbebee5c9f3c3b81e09 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:15:54 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.7' 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 1e0822fe43e96fdb5198acbebee5c9f3c3b81e09 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:15:54 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.7' 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 d1f25e6..09b9e7a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 9f60a00..f5079b9 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 43f5469..533cd22 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 18daaaa..68fde06 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7-SNAPSHOT</version> + <version>4.0.7</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 93cea6439ada1096e36ab1fab1be6a68e4f48b08 Merge: d27b820 1e0822f Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:28 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.7' into 'master' echobase-domain/pom.xml | 2 +- .../echobase/persistence/EchoBaseDbMeta.java | 34 ++++++++++------------ echobase-services/pom.xml | 2 +- .../importdb/EchoBaseImportModelFactory.java | 3 +- echobase-ui/pom.xml | 2 +- .../resources/i18n/echobase-ui_fr_FR.properties | 4 +-- pom.xml | 2 +- src/site/rst/importData.rst | 4 +++ 8 files changed, 28 insertions(+), 25 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 4ab771fb040f3906017ef16f9c3a9452a1d4d00f Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:36 2016 +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 37c987d..09b9e7a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index b310dc0..f5079b9 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index fbb6b53..533cd22 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index bdcf035..68fde06 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.8-SNAPSHOT</version> + <version>4.0.7</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 f04fc36e3130eea193e94a61c95c12d88bb9bcac Merge: 4ab771f 93cea64 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:40 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 74dab2f3c2660505c61885e4dd32b537426ee43d Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 2 09:19:43 2016 +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 09b9e7a..37c987d 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7</version> + <version>4.0.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index f5079b9..b310dc0 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7</version> + <version>4.0.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 533cd22..fbb6b53 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7</version> + <version>4.0.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 68fde06..bdcf035 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0.7</version> + <version>4.0.8-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