branch develop-4.x updated (2d4a39d -> e6537c2)
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 2d4a39d [jgitflow-maven-plugin]updating poms for 4.0.4-SNAPSHOT development new 575e9e6 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 8ec48ec [jgitflow-maven-plugin]updating poms for branch'release/4.0.3' with non-snapshot versions new 7d07afd [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' new c2bdcae [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' new e6537c2 [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 e6537c204ed5dcd3f3a571c38f62a1b8aac3c685 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:10 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c2bdcaedc2f20c3a33ac59c671d96c52854bf2ca Merge: 575e9e6 7d07afd Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:08 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' commit 575e9e60be2997b2cdce54866c00608f6b8d95ec Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:08 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7d07afdbb76071399f4eec279baa3660cb0dceb8 Merge: ea46753 8ec48ec Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:02 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' commit 8ec48ec7fe997a3b1ffebdda23501a279169c47e Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:15:46 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.3' 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 8ec48ec7fe997a3b1ffebdda23501a279169c47e Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:15:46 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.3' 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 f9e4e65..042d5f2 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.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 7084ff6..1830def 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.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 3e35ff7..5d6ad57 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.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 0bb2c27..d5f7c61 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.3-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 87d558c..e89a503 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.3-SNAPSHOT</version> + <version>4.0.3</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 7d07afdbb76071399f4eec279baa3660cb0dceb8 Merge: ea46753 8ec48ec Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:02 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.3' into 'master' observe-business/pom.xml | 2 +- observe-business/src/main/java/fr/ird/observe/db/util/PGInstall.java | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- .../ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java | 5 +++++ .../ui/content/open/impl/longline/ActivityLonglineUIHandler.java | 2 ++ .../observe/ui/content/open/impl/seine/ActivitySeineUIHandler.java | 2 ++ .../ird/observe/ui/content/open/impl/seine/ActivitySeineUIModel.java | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 17 insertions(+), 8 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 575e9e60be2997b2cdce54866c00608f6b8d95ec Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:08 2015 +0200 [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 70a4575..042d5f2 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.4-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index e73c27c..1830def 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.4-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 1f28b70..5d6ad57 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.4-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index fbef7a0..d5f7c61 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.4-SNAPSHOT</version> + <version>4.0.3</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index a11d3c3..e89a503 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.4-SNAPSHOT</version> + <version>4.0.3</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 c2bdcaedc2f20c3a33ac59c671d96c52854bf2ca Merge: 575e9e6 7d07afd Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:08 2015 +0200 [jgitflow-maven-plugin]merging 'master' 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 e6537c204ed5dcd3f3a571c38f62a1b8aac3c685 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 19:22:10 2015 +0200 [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 042d5f2..70a4575 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.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 1830def..e73c27c 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.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 5d6ad57..1f28b70 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.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index d5f7c61..fbef7a0 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.3</version> + <version>4.0.4-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index e89a503..a11d3c3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.3</version> + <version>4.0.4-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