branch develop updated (c1643c1 -> a79087f)
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 c1643c1 [jgitflow-maven-plugin]updating poms for 4.0-RC8-SNAPSHOT development new 6338b45 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ca6e021 [jgitflow-maven-plugin]updating poms for 4.0-RC7 branch with snapshot versions new 5edbf2d Fix release 4.0-RC7 new ba30d9c [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC7' with non-snapshot versions new 2cb4558 [jgitflow-maven-plugin]merging 'release/4.0-RC7' into 'master' new af5ec09 [jgitflow-maven-plugin]merging 'master' into 'develop' new a79087f [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 a79087f08730ae07149056a34de13469de80fa03 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:21 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit af5ec092dd39d91018d4610952fb1230b0889e91 Merge: 6338b45 2cb4558 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:20 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 6338b459b2e7f23a7c37b42c6ac50494e9a19b16 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:19 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2cb4558a31b43c90c32d5249bab5b42aaf572fed Merge: c4e11be ba30d9c Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:16 2015 +0000 [jgitflow-maven-plugin]merging 'release/4.0-RC7' into 'master' commit ba30d9c2a8504392c9e60fceb39f716105942656 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:53:25 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC7' with non-snapshot versions commit 5edbf2d4534d1efbe366cee404d83832e117f4d8 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:51:44 2015 +0000 Fix release 4.0-RC7 Summary of changes: .../DataSourceMigrationForVersion_4_0_RC7.java | 22 ++++++++++++++++++++++ 1 file changed, 22 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 5edbf2d4534d1efbe366cee404d83832e117f4d8 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:51:44 2015 +0000 Fix release 4.0-RC7 --- .../DataSourceMigrationForVersion_4_0_RC7.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java index 90a62d7..1fad493 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.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; -- 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 ba30d9c2a8504392c9e60fceb39f716105942656 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:53:25 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC7' 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 86e4bf7..eecd18d 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-RC7-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 44290ed..3b2e636 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-RC7-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 5fb1e0c..d24ab28 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-RC7-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 4c21e8e..a5c3918 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-RC7-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index a910e1f..76d0778 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC7-SNAPSHOT</version> + <version>4.0-RC7</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 2cb4558a31b43c90c32d5249bab5b42aaf572fed Merge: c4e11be ba30d9c Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:16 2015 +0000 [jgitflow-maven-plugin]merging 'release/4.0-RC7' into 'master' observe-business/pom.xml | 2 +- .../src/main/filters/observe-reports.properties | 1663 ++++++-------------- .../ird/observe/validation/ObserveValidator.java | 12 +- .../validation/ValidationMessageDetector.java | 32 +- observe-entities/pom.xml | 5 +- .../entities/longline/TripLonglineDAOImpl.java | 37 +- .../migration/AbstractDataSourceMigration.java | 4 +- .../entities/migration/H2DataSourceMigration.java | 46 + .../entities/migration/PGDataSourceMigration.java | 88 ++ .../DataSourceMigrationForVersion_4_0_RC6.java | 22 +- ... => DataSourceMigrationForVersion_4_0_RC7.java} | 32 +- .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql | 2 +- .../db/4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql | 2 +- .../rename-unknown-longliner-H2.sql} | 6 +- .../rename-unknown-longliner-PG.sql} | 6 +- .../update-senne-gear-usedInTrip-H2.sql} | 6 +- .../update-senne-gear-usedInTrip-PG.sql} | 6 +- observe-swing/pom.xml | 2 +- observe-swing/src/license/THIRD-PARTY.properties | 6 +- .../observe/ui/admin/report/ReportUIHandler.java | 5 + .../ui/admin/validate/ValidateUIHandler.java | 3 +- .../observe/ui/util/tripMap/ObserveMapPane.java | 33 +- .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 7 +- .../ui/util/tripMap/TripMapContentBuilder.java | 103 +- observe-swing/src/main/map/style.xml | 143 +- observe-validation/pom.xml | 2 +- pom.xml | 22 +- 27 files changed, 1000 insertions(+), 1297 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 6338b459b2e7f23a7c37b42c6ac50494e9a19b16 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:19 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 883335b..eecd18d 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-RC8-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index bb603ac..3b2e636 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-RC8-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 5162555..d24ab28 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-RC8-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 8d0c73a..a5c3918 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-RC8-SNAPSHOT</version> + <version>4.0-RC7</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 4f0937a..76d0778 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC8-SNAPSHOT</version> + <version>4.0-RC7</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 af5ec092dd39d91018d4610952fb1230b0889e91 Merge: 6338b45 2cb4558 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:20 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' .../DataSourceMigrationForVersion_4_0_RC7.java | 22 ++++++++++++++++++++++ 1 file changed, 22 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 a79087f08730ae07149056a34de13469de80fa03 Author: Maven Release <maven-release@codelutin.com> Date: Thu May 28 12:59:21 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 eecd18d..883335b 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-RC7</version> + <version>4.0-RC8-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 3b2e636..bb603ac 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-RC7</version> + <version>4.0-RC8-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index d24ab28..5162555 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-RC7</version> + <version>4.0-RC8-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index a5c3918..8d0c73a 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-RC7</version> + <version>4.0-RC8-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 76d0778..4f0937a 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC7</version> + <version>4.0-RC8-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