This is an automated email from the git hooks/post-receive script. New commit to branch feature/6417 in repository tutti. See http://git.codelutin.com/tutti.git commit 7472c732bb40e2bf00876d3d57602a72dc4f1c4e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 12 20:52:58 2015 +0100 passage sur adagio 3.8.2 --- pom.xml | 2 +- .../i18n/tutti-persistence_en_GB.properties | 25 ---------------------- .../i18n/tutti-persistence_fr_FR.properties | 25 ---------------------- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 ++++-- 4 files changed, 5 insertions(+), 53 deletions(-) diff --git a/pom.xml b/pom.xml index 39b9109..0b59fe1 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <jaxxVersion>2.21</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.9</slf4jVersion> - <adagioVersion>3.8.1</adagioVersion> + <adagioVersion>3.8.2-SNAPSHOT</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.7.Final</hibernateVersion> <springVersion>4.1.4.RELEASE</springVersion> diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index c2f80a2..e520f38 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -1,28 +1,3 @@ -adagio.enumeration.PmfmId.ID_PSFM.description= -adagio.enumeration.PmfmId.MARINE_LITTER_SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.MARINE_LITTER_TYPE.description= -adagio.enumeration.PmfmId.MATURITY.description= -adagio.enumeration.PmfmId.MULTIRIG_AGGREGATION.description= -adagio.enumeration.PmfmId.MULTIRIG_NUMBER.description= -adagio.enumeration.PmfmId.RECTILINEAR_OPERATION.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE2.description= -adagio.enumeration.PmfmId.SEX.description= -adagio.enumeration.PmfmId.SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.SORTED_UNSORTED.description= -adagio.enumeration.PmfmId.SORTING_TYPE_TCC.description= -adagio.enumeration.PmfmId.STATION_NUMBER.description= -adagio.enumeration.PmfmId.SURVEY_PART.description= -adagio.enumeration.PmfmId.TRAWL_DISTANCE.description= -adagio.enumeration.PmfmId.VERTICAL_OPENING.description= -adagio.enumeration.PmfmId.WEIGHT_MEASURED.description= -adagio.enumeration.QualitativeValueId.MATURITY_1.description= -adagio.enumeration.QualitativeValueId.MATURITY_2.description= -adagio.enumeration.QualitativeValueId.MATURITY_3.description= -adagio.enumeration.QualitativeValueId.MATURITY_4.description= -adagio.enumeration.QualitativeValueId.MATURITY_5.description= -adagio.enumeration.QualitativeValueId.NOT_SIZED.description= -adagio.enumeration.QualitativeValueId.SEX_UNDEFINED.description= application.common.unit=Unit application.common.unit.g=Gram application.common.unit.kg=Kilogram diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index 34e0b1d..33939a2 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -1,28 +1,3 @@ -adagio.enumeration.PmfmId.ID_PSFM.description= -adagio.enumeration.PmfmId.MARINE_LITTER_SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.MARINE_LITTER_TYPE.description= -adagio.enumeration.PmfmId.MATURITY.description= -adagio.enumeration.PmfmId.MULTIRIG_AGGREGATION.description= -adagio.enumeration.PmfmId.MULTIRIG_NUMBER.description= -adagio.enumeration.PmfmId.RECTILINEAR_OPERATION.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE2.description= -adagio.enumeration.PmfmId.SEX.description= -adagio.enumeration.PmfmId.SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.SORTED_UNSORTED.description= -adagio.enumeration.PmfmId.SORTING_TYPE_TCC.description= -adagio.enumeration.PmfmId.STATION_NUMBER.description= -adagio.enumeration.PmfmId.SURVEY_PART.description= -adagio.enumeration.PmfmId.TRAWL_DISTANCE.description= -adagio.enumeration.PmfmId.VERTICAL_OPENING.description= -adagio.enumeration.PmfmId.WEIGHT_MEASURED.description= -adagio.enumeration.QualitativeValueId.MATURITY_1.description= -adagio.enumeration.QualitativeValueId.MATURITY_2.description= -adagio.enumeration.QualitativeValueId.MATURITY_3.description= -adagio.enumeration.QualitativeValueId.MATURITY_4.description= -adagio.enumeration.QualitativeValueId.MATURITY_5.description= -adagio.enumeration.QualitativeValueId.NOT_SIZED.description= -adagio.enumeration.QualitativeValueId.SEX_UNDEFINED.description= application.common.unit=Unité application.common.unit.g=Gramme application.common.unit.kg=Kilogramme diff --git a/tutti-ui-swing/src/license/THIRD-PARTY.properties b/tutti-ui-swing/src/license/THIRD-PARTY.properties index a5f4186..35a4659 100644 --- a/tutti-ui-swing/src/license/THIRD-PARTY.properties +++ b/tutti-ui-swing/src/license/THIRD-PARTY.properties @@ -10,16 +10,17 @@ # - BSD License # - Common Development and Distribution License # - Common Development and Distribution License (CDDL) v1.0 -# - Common Public License Version 1.0 # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 +# - Eclipse Public License 1.0 # - GNU Affero General Public License v3 # - GNU General Public License (GPL) # - GNU General Public License - Version 2 with the class path exception # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence # - GNU Lesser General Public License (LGPL), version 2.1 +# - GNU Lesser Public License # - GNU Library or Lesser General Public License # - General Public License (GPL) # - ICU License @@ -33,12 +34,13 @@ # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 +# - The New BSD License # - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sat Nov 08 18:30:54 CET 2014 +#Mon Jan 12 10:25:47 CET 2015 batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 batik--batik-css--1.6=The Apache Software License, Version 2.0 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.