[tutti] branch develop updated (2bb5f05 -> 077ff7f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 2bb5f05 update db version new d1b2b52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9767c1f [jgitflow-maven-plugin]updating poms for branch '3.7.4' with snapshot versions new 0d2f4e4 [jgitflow-maven-plugin]updating poms for branch'release/3.7.4' with non-snapshot versions new b335414 Merge branch 'release/3.7.4' new 19d132d Merge branch 'master' into develop new 077ff7f [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 077ff7f531bcb8601fc6bb3131924f69f7eb6660 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:40 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 19d132d9eca05e1244f5261df3b5a38790508cfc Merge: d1b2b52 b335414 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:38 2014 +0200 Merge branch 'master' into develop commit d1b2b526c93246e3da2c1d77f63656bfc996532b Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:38 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b3354146dc8dfc3e57309052ddb4467ea81baf6a Merge: e6e7c4e 0d2f4e4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:36 2014 +0200 Merge branch 'release/3.7.4' commit 0d2f4e4f15dfcc82f76e838237ec83a4321f0531 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 08:58:15 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.4' 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 tutti. See http://git.codelutin.com/tutti.git commit 0d2f4e4f15dfcc82f76e838237ec83a4321f0531 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 08:58:15 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.4' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 6ece3d3..db9fd9a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4-SNAPSHOT</version> + <version>3.7.4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index be742b4..cf799eb 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 84a41c1..89ce454 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7330d1a..47d5a5b 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 140248d..3675dcd 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- 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 tutti. See http://git.codelutin.com/tutti.git commit b3354146dc8dfc3e57309052ddb4467ea81baf6a Merge: e6e7c4e 0d2f4e4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:36 2014 +0200 Merge branch 'release/3.7.4' .gitignore | 3 +- README.txt | 2 + pom.xml | 32 +++---- src/site/rst/dbversions.rst | 2 + tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 101 +-------------------- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 9 +- .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../service/util/BatchPersistenceHelper.java | 44 --------- .../persistence/service/util/BatchTreeHelper.java | 38 -------- .../tutti/persistence/test/DatabaseResource.java | 64 +------------ ...ervice.technical.sanity.task.DatabaseSanityTask | 2 - ...ro.specific.ReferentialSynchroSpecificTableTask | 2 - .../i18n/tutti-persistence_en_GB.properties | 48 +--------- .../i18n/tutti-persistence_fr_FR.properties | 48 +--------- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/pupitri/SpeciesRow.java | 6 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/filtered-resources/tutti.config | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 9 +- .../operation/catches/EditCatchesUIModel.java | 9 ++ .../operation/catches/SampleCategoryAble.java | 2 + .../catches/SampleCategoryColumnIdentifier.java | 7 ++ .../catches/benthos/BenthosBatchRowModel.java | 17 +++- .../catches/benthos/BenthosBatchTableModel.java | 16 +++- .../catches/benthos/BenthosBatchUIHandler.java | 23 +++-- .../frequency/BenthosFrequencyRowModel.java | 5 + .../frequency/BenthosFrequencyUIHandler.java | 6 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 39 ++++++-- .../catches/species/SpeciesBatchRowModel.java | 15 ++- .../catches/species/SpeciesBatchTableModel.java | 16 +++- .../catches/species/SpeciesBatchUIHandler.java | 19 +++- .../frequency/SpeciesFrequencyRowModel.java | 7 +- .../frequency/SpeciesFrequencyUIHandler.java | 9 +- .../species/frequency/SpeciesFrequencyUIModel.java | 39 ++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 39 files changed, 237 insertions(+), 425 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 tutti. See http://git.codelutin.com/tutti.git commit d1b2b526c93246e3da2c1d77f63656bfc996532b Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:38 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 64ec2ca..db9fd9a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..cf799eb 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..89ce454 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..47d5a5b 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9a0bb8d..3675dcd 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- 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 tutti. See http://git.codelutin.com/tutti.git commit 19d132d9eca05e1244f5261df3b5a38790508cfc Merge: d1b2b52 b335414 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:38 2014 +0200 Merge branch '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 tutti. See http://git.codelutin.com/tutti.git commit 077ff7f531bcb8601fc6bb3131924f69f7eb6660 Author: Maven Release <maven-release@codelutin.com> Date: Tue Sep 16 09:04:40 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index db9fd9a..64ec2ca 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4</version> + <version>3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index cf799eb..599d56f 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 89ce454..21e61cb 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 47d5a5b..3724bf6 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 3675dcd..9a0bb8d 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.4</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm