branch develop-4.x updated (b1a1558 -> 378bf0d)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git from b1a1558 [jgitflow-maven-plugin]updating poms for 4.0.6-SNAPSHOT development new 38dbf7e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f6922f2 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' with non-snapshot versions new e5c1ba8 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master-4.x' new b6d8f00 [jgitflow-maven-plugin]merging 'master-4.x' into 'develop-4.x' new 378bf0d [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 378bf0db977ce035d563861ea845c74d20b55913 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:10 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b6d8f00d1eceeb29c1ecec98583b488fff58afbf Merge: 38dbf7e e5c1ba8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:09 2015 +0100 [jgitflow-maven-plugin]merging 'master-4.x' into 'develop-4.x' commit 38dbf7e2f462070fa3653bcc2a28ca6e51d4d9e1 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:08 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e5c1ba833c3102d7a9c1bd4b9bd0a0cc91625b9e Merge: 00b9303 f6922f2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:04 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master-4.x' commit f6922f2c42ee859dfb6aff08e6dfd1d205aa9880 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:32:16 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit f6922f2c42ee859dfb6aff08e6dfd1d205aa9880 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:32:16 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' with non-snapshot versions --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 50be948..4338157 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 9931944..6298bd8 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index c73a07f..863dbf3 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 6bfcf3c..0502dab 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 2f0b5bf..b02ac5e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.5</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit e5c1ba833c3102d7a9c1bd4b9bd0a0cc91625b9e Merge: 00b9303 f6922f2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:04 2015 +0100 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master-4.x' observe-business/pom.xml | 2 +- .../fr/ird/observe/ConsolidateDataService.java | 87 +++++++++++++++++----- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 3 +- 6 files changed, 75 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 38dbf7e2f462070fa3653bcc2a28ca6e51d4d9e1 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:08 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 82cb3fc..4338157 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 38b0611..6298bd8 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 6930a63..863dbf3 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 5b027c1..0502dab 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 134a878..b02ac5e 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.5</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit b6d8f00d1eceeb29c1ecec98583b488fff58afbf Merge: 38dbf7e e5c1ba8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:09 2015 +0100 [jgitflow-maven-plugin]merging 'master-4.x' into 'develop-4.x' -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository observe. See http://git.codelutin.com/observe.git commit 378bf0db977ce035d563861ea845c74d20b55913 Author: Maven Release <maven-release@codelutin.com> Date: Wed Nov 4 18:38:10 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 4338157..82cb3fc 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 6298bd8..38b0611 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 863dbf3..6930a63 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 0502dab..5b027c1 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index b02ac5e..134a878 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm