branch develop updated (32acad7 -> 5324589)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 32acad7 [jgitflow-maven-plugin]updating poms for 4.0.1-SNAPSHOT development new 724bf2a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds bf12662 ajout de la base referentiel pour la version 4.0 new 154d3f2 add missing license headers new 8c98388 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions new 2ee467e [jgitflow-maven-plugin]merging 'release/4.0' into 'master' new 1b93ec9 [jgitflow-maven-plugin]merging 'master' into 'develop' new 5324589 [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 5324589d69e4256bc834f6d87608cb30c717e30b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:33 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 1b93ec9d8add4e58c78812c231f58a9e50514597 Merge: 724bf2a 2ee467e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:32 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 724bf2a83124b3fa0d1b7c8471b463856ccf7e21 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:32 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2ee467e024ed7581726bc9172ff87595d946d294 Merge: ccdba94 8c98388 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:28 2015 +0000 [jgitflow-maven-plugin]merging 'release/4.0' into 'master' commit 8c98388fd0dd585fc0a1642400bc94bd4a23a90a Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:38:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions commit 154d3f270631301091c7f79dc3f609d8b84d62ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:38:08 2015 +0000 add missing license headers Summary of changes: .../src/test/resources/db/4.0/referentiel.sql.gz | Bin 0 -> 138262 bytes .../DataSourceMigrationForVersion_4_0.java | 22 +++++++++++++++++++++ .../src/main/resources/db/4.0/empty-H2.sql | 21 ++++++++++++++++++++ .../src/main/resources/db/4.0/empty-PG.sql | 21 ++++++++++++++++++++ 4 files changed, 64 insertions(+) create mode 100644 observe-business/src/test/resources/db/4.0/referentiel.sql.gz -- 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 in repository observe. See http://git.codelutin.com/observe.git commit 154d3f270631301091c7f79dc3f609d8b84d62ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:38:08 2015 +0000 add missing license headers --- .../DataSourceMigrationForVersion_4_0.java | 22 ++++++++++++++++++++++ .../src/main/resources/db/4.0/empty-H2.sql | 21 +++++++++++++++++++++ .../src/main/resources/db/4.0/empty-PG.sql | 21 +++++++++++++++++++++ 3 files changed, 64 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java index 8b87d86..5b0f431 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.migration.versions; +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * 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 fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; diff --git a/observe-entities/src/main/resources/db/4.0/empty-H2.sql b/observe-entities/src/main/resources/db/4.0/empty-H2.sql index 9b00240..7b47d98 100644 --- a/observe-entities/src/main/resources/db/4.0/empty-H2.sql +++ b/observe-entities/src/main/resources/db/4.0/empty-H2.sql @@ -1,2 +1,23 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit +-- %% +-- 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% +--- -- only to set tms_version to 4.0 -- no real migration \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0/empty-PG.sql b/observe-entities/src/main/resources/db/4.0/empty-PG.sql index 9b00240..7b47d98 100644 --- a/observe-entities/src/main/resources/db/4.0/empty-PG.sql +++ b/observe-entities/src/main/resources/db/4.0/empty-PG.sql @@ -1,2 +1,23 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit +-- %% +-- 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% +--- -- only to set tms_version to 4.0 -- no real migration \ No newline at end of file -- 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 in repository observe. See http://git.codelutin.com/observe.git commit 8c98388fd0dd585fc0a1642400bc94bd4a23a90a Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:38:20 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0' 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 6ab19ba..befa932 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-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index f141cb1..6eae2eb 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-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index fe499ff..dc864c4 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-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index d6a0d00..3138ee9 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-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 4512d15..2ce07e8 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</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 in repository observe. See http://git.codelutin.com/observe.git commit 2ee467e024ed7581726bc9172ff87595d946d294 Merge: ccdba94 8c98388 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:28 2015 +0000 [jgitflow-maven-plugin]merging 'release/4.0' into 'master' observe-business/pom.xml | 2 +- .../main/java/fr/ird/converter/FloatConverter.java | 2 +- .../java/fr/ird/converter/FloatConverterTest.java | 2 +- .../src/test/resources/db/4.0/referentiel.sql.gz | Bin 0 -> 138262 bytes observe-entities/pom.xml | 2 +- .../migration/AbstractDataSourceMigration.java | 3 ++- ...java => DataSourceMigrationForVersion_4_0.java} | 26 ++++++++------------- .../DataSourceMigrationForVersion_4_0_RC4.java | 5 ---- .../DataSourceMigrationForVersion_4_0_RC7.java | 5 ---- .../main/java/fr/ird/type/CoordinateHelper.java | 2 +- .../src/main/resources/db/4.0/empty-H2.sql | 23 ++++++++++++++++++ .../src/main/resources/db/4.0/empty-PG.sql | 23 ++++++++++++++++++ .../i18n/observe-entities_fr_FR.properties | 8 +++---- .../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 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 9 +------ .../AutotSelectRowAndShowPopupActionSupport.java | 7 +----- .../resources/i18n/observe-swing_fr_FR.properties | 4 ++-- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 22 files changed, 77 insertions(+), 58 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 in repository observe. See http://git.codelutin.com/observe.git commit 724bf2a83124b3fa0d1b7c8471b463856ccf7e21 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:32 2015 +0000 [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 746d6ea..befa932 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.1-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 78f3400..6eae2eb 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.1-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 94b23ed..dc864c4 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.1-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 94b1524..3138ee9 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.1-SNAPSHOT</version> + <version>4.0</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index dc8ed77..2ce07e8 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.1-SNAPSHOT</version> + <version>4.0</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 in repository observe. See http://git.codelutin.com/observe.git commit 1b93ec9d8add4e58c78812c231f58a9e50514597 Merge: 724bf2a 2ee467e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:32 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' .../src/test/resources/db/4.0/referentiel.sql.gz | Bin 0 -> 138262 bytes .../DataSourceMigrationForVersion_4_0.java | 22 +++++++++++++++++++++ .../src/main/resources/db/4.0/empty-H2.sql | 21 ++++++++++++++++++++ .../src/main/resources/db/4.0/empty-PG.sql | 21 ++++++++++++++++++++ 4 files changed, 64 insertions(+) -- 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 in repository observe. See http://git.codelutin.com/observe.git commit 5324589d69e4256bc834f6d87608cb30c717e30b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 8 12:43:33 2015 +0000 [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 befa932..746d6ea 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</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 6eae2eb..78f3400 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</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index dc864c4..94b23ed 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</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 3138ee9..94b1524 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</version> + <version>4.0.1-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 2ce07e8..dc8ed77 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0</version> + <version>4.0.1-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