branch develop updated (df36b02 -> 36bc899)
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 df36b02 fixes #6417 new ad35264 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cd52ee8 [jgitflow-maven-plugin]updating poms for branch '3.11.4' with snapshot versions new da02d36 prepare release new e17845f [jgitflow-maven-plugin]updating poms for branch'release/3.11.4' with non-snapshot versions new e032832 Merge branch 'release/3.11.4' new 5d7c8d6 Merge branch 'master' into develop new 36bc899 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 36bc899c5f4c0ba36590c98577ee9cbc248e9a4c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:52 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5d7c8d6fd507c014e2ebdf52022a8488e3616f04 Merge: ad35264 e032832 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:51 2015 +0000 Merge branch 'master' into develop commit ad352648be75f6bd409edb52db38a7b17fb7a155 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:50 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e03283275552394962bff6ffa94a0eebfaf05f8d Merge: 23df1ef e17845f Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:46 2015 +0000 Merge branch 'release/3.11.4' commit e17845f233290c61896e970ec8873c25cd834480 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:37:17 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.11.4' with non-snapshot versions commit da02d369a235f7b8dbd0d9dac48835c9f3cc5d93 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:36:44 2015 +0000 prepare release Summary of changes: .../service/UpdateSchemaContextSupport.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 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 da02d369a235f7b8dbd0d9dac48835c9f3cc5d93 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:36:44 2015 +0000 prepare release --- .../service/UpdateSchemaContextSupport.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java index 93f486b..2131132 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/UpdateSchemaContextSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.version.Version; -- 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 e17845f233290c61896e970ec8873c25cd834480 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:37:17 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.11.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 95e84bd..55b3a13 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11.4-SNAPSHOT</version> + <version>3.11.4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index dd3ed0c..043e28c 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.11.4-SNAPSHOT</version> + <version>3.11.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 6e6bce1..435404b 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.11.4-SNAPSHOT</version> + <version>3.11.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7786865..1e19bb0 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.11.4-SNAPSHOT</version> + <version>3.11.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index d32b183..dfa609d 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.11.4-SNAPSHOT</version> + <version>3.11.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 e03283275552394962bff6ffa94a0eebfaf05f8d Merge: 23df1ef e17845f Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:46 2015 +0000 Merge branch 'release/3.11.4' pom.xml | 4 +- src/site/rst/referential.rst | 6 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../adagio/core/dao/referential/pmfm/PmfmId2.java | 190 --------- .../tutti/persistence/TuttiPersistenceImpl.java | 431 +++++++++++++-------- .../persistence/TuttiPersistenceNoDbImpl.java | 15 +- .../TuttiPersistenceServiceImplementor.java | 2 + .../service/AbstractPersistenceService.java | 27 +- .../AccidentalBatchPersistenceServiceImpl.java | 5 +- .../service/ReferentialPersistenceServiceImpl.java | 5 +- .../service/TechnicalPersistenceService.java | 18 +- .../service/TechnicalPersistenceServiceImpl.java | 18 +- .../service/UpdateSchemaContextSupport.java | 111 ++++++ .../CaracteristicPersistenceServiceImpl.java | 5 +- .../tutti/persistence/test/DatabaseFixtures.java | 10 - .../i18n/tutti-persistence_en_GB.properties | 25 -- .../i18n/tutti-persistence_fr_FR.properties | 25 -- .../resources/tutti-db-enumerations.properties | 3 - .../persistence/TuttiPersistenceWriteTest.java | 68 ---- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 19 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 15 +- .../ifremer/tutti/service/ServiceDbResource.java | 4 +- .../fr/ifremer/tutti/service/UpdateSchemaTest.java | 69 ---- .../catches/WeightComputingServiceTest.java | 3 +- tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 +- tutti-ui-swing/src/main/help/fr/dbMapping.html | 20 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 9 +- .../tutti/ui/swing/action/ExportDbAction.java | 15 +- .../tutti/ui/swing/action/ImportDbAction.java | 184 ++++----- .../tutti/ui/swing/action/OpenDbAction.java | 207 +++++----- .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../swing/content/validation/ValidateCruiseUI.css | 4 +- 35 files changed, 728 insertions(+), 805 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 ad352648be75f6bd409edb52db38a7b17fb7a155 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:50 2015 +0000 [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 8dd599e..55b3a13 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.12-SNAPSHOT</version> + <version>3.11.4</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 6eb5c7b..043e28c 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.12-SNAPSHOT</version> + <version>3.11.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index bc852c7..435404b 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.12-SNAPSHOT</version> + <version>3.11.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index b8e3c02..1e19bb0 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.12-SNAPSHOT</version> + <version>3.11.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b9df966..dfa609d 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.12-SNAPSHOT</version> + <version>3.11.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 5d7c8d6fd507c014e2ebdf52022a8488e3616f04 Merge: ad35264 e032832 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:51 2015 +0000 Merge branch 'master' into develop .../service/UpdateSchemaContextSupport.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) -- 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 36bc899c5f4c0ba36590c98577ee9cbc248e9a4c Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 14:44:52 2015 +0000 [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 55b3a13..8dd599e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.11.4</version> + <version>3.12-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 043e28c..6eb5c7b 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.11.4</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 435404b..bc852c7 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.11.4</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 1e19bb0..b8e3c02 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.11.4</version> + <version>3.12-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index dfa609d..b9df966 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.11.4</version> + <version>3.12-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