branch develop-4.x updated (348bc1f -> 8d2dc7b)
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 348bc1f [jgitflow-maven-plugin]updating poms for 4.0.3-SNAPSHOT development new 4686ec9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new dfa66c8 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' with non-snapshot versions new ea46753 [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' new 7f2a79a [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' new 8d2dc7b [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 8d2dc7b405f07548dc68ad0caafe35fcc0d0ee82 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:37 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 7f2a79ae7360de1daa697df99e9fa62814414be0 Merge: 4686ec9 ea46753 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:36 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop-4.x' commit 4686ec998bd13d7465167714ba887f0f286b4ef6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:35 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ea46753f3f39b46a3f58f1116591d602a9fe510a Merge: b509d93 dfa66c8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:32 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' commit dfa66c88c928eb597e295b412c7a41c2231305b3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:08:16 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' 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 dfa66c88c928eb597e295b412c7a41c2231305b3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:08:16 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.2' 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 b5a788b..a26310a 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 819541d..0c0e041 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 320bbca..d89eaaf 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 51e2c98..27779c6 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.2-SNAPSHOT</version> + <version>4.0.2</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index f58bd5b..a652213 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.2-SNAPSHOT</version> + <version>4.0.2</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 ea46753f3f39b46a3f58f1116591d602a9fe510a Merge: b509d93 dfa66c8 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:32 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.2' into 'master' observe-business/pom.xml | 2 +- .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 0 -> 138257 bytes observe-entities/pom.xml | 2 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../DataSourceMigrationForVersion_4_0_1.java | 13 +++- .../DataSourceMigrationForVersion_4_0_2.java | 75 +++++++++++++++++++++ .../observe/entities/seine/ActivitySeineImpl.java | 2 +- .../{4.0.1 => 4.0.2}/remove-gender-column-PG.sql | 2 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 10 +-- 14 files changed, 100 insertions(+), 20 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 4686ec998bd13d7465167714ba887f0f286b4ef6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:35 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 f9e4e65..a26310a 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.2</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 7084ff6..0c0e041 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.2</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 3e35ff7..d89eaaf 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.2</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 0bb2c27..27779c6 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.2</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index a73de2b..a652213 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.2</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 7f2a79ae7360de1daa697df99e9fa62814414be0 Merge: 4686ec9 ea46753 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:36 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 8d2dc7b405f07548dc68ad0caafe35fcc0d0ee82 Author: Maven Release <maven-release@codelutin.com> Date: Thu Aug 27 16:13:37 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 a26310a..f9e4e65 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 0c0e041..7084ff6 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index d89eaaf..3e35ff7 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 27779c6..0bb2c27 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.2</version> + <version>4.0.3-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index a652213..a73de2b 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.2</version> + <version>4.0.3-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