branch develop updated (efcf1a2 -> 38dcf19)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from efcf1a2 Improve the perfomance on search duplicate cell (ref #8165) new 807db9a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 22fb71d [jgitflow-maven-plugin]updating poms for 4.0-alpha-4 branch with snapshot versions new 2a08cea Fix license header new 8ccd467 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions new b5e9529 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' new 9ae86d8 [jgitflow-maven-plugin]merging 'master' into 'develop' new 38dcf19 [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 38dcf19f4946c85c2c8b4132f9b298f0b3ec7e23 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:30 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9ae86d8b4d8a1b8783306ca8a9536b8b02460d17 Merge: 807db9a b5e9529 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:29 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 807db9a9b3a7f840ff8fdd54152d777e836aec2e Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:29 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b5e9529de27af9097d41877d6cf4056fe1b4c4a3 Merge: 5ef97c9 8ccd467 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:26 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' commit 8ccd46740d1c4cf9029d85d23c4b6c7151bf9123 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:29:07 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions commit 2a08cea72f897b0e62c19d4fb3f4b76170831697 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:28:49 2016 +0200 Fix license header Summary of changes: .../WorkingDbMigrationCallBackForVersion3_906.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.906-0-add-indexes.sql | 20 ++++++++++++++++++++ 2 files changed, 41 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 2a08cea72f897b0e62c19d4fb3f4b76170831697 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:28:49 2016 +0200 Fix license header --- .../WorkingDbMigrationCallBackForVersion3_906.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.906-0-add-indexes.sql | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java index f844659..f2abfa0 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.persistence.migration.workingDb; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2016 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.version.Version; diff --git a/echobase-domain/src/main/resources/migration/workingDb/3.906-0-add-indexes.sql b/echobase-domain/src/main/resources/migration/workingDb/3.906-0-add-indexes.sql index e2ba3ad..89536bf 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/3.906-0-add-indexes.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/3.906-0-add-indexes.sql @@ -1 +1,21 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2016 Ifremer, Codelutin +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU Affero 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 Affero General Public License +-- along with this program. If not, see <http://www.gnu.org/licenses/>. +-- #L% +--- CREATE INDEX IDX_CELL_NAME ON CELL (NAME); -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 8ccd46740d1c4cf9029d85d23c4b6c7151bf9123 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:29:07 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-4' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 77effba..4c99c4a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4-SNAPSHOT</version> + <version>4.0-alpha-4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index cfc7b32..3778e72 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4-SNAPSHOT</version> + <version>4.0-alpha-4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index b7d4aad..2a3fe99 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4-SNAPSHOT</version> + <version>4.0-alpha-4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a292404..91560db 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4-SNAPSHOT</version> + <version>4.0-alpha-4</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b5e9529de27af9097d41877d6cf4056fe1b4c4a3 Merge: 5ef97c9 8ccd467 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:26 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-4' into 'master' echobase-domain/pom.xml | 2 +- .../src/main/data/export-AgeCategory.csv | 5 + echobase-domain/src/main/data/export-Category.csv | 8 + echobase-domain/src/main/data/export-CellType.csv | 8 + .../src/main/data/export-DataMetadata.csv | 169 ++++++++++++++ echobase-domain/src/main/data/export-DataType.csv | 29 +++ .../src/main/data/export-DepthStratum.csv | 21 ++ echobase-domain/src/main/data/export-Gear.csv | 188 +++++++++++++++ .../src/main/data/export-GearMetadata.csv | 8 + .../src/main/data/export-SampleDataType.csv | 137 +++++++++++ .../src/main/data/export-SampleType.csv | 6 + .../src/main/data/export-SizeCategory.csv | 8 + echobase-domain/src/main/data/export-Species.csv | 256 +++++++++++++++++++++ echobase-domain/src/main/data/export-Strata.csv | 2 + .../src/main/data/export-TSParameters.csv | 134 +++++++++++ echobase-domain/src/main/data/export-Vessel.csv | 14 ++ .../src/main/data/export-VesselType.csv | 8 + .../echobase/entities/data/CellTopiaDao.java | 54 +++++ .../WorkingDbMigrationCallBackForVersion3_906.java | 54 +++++ .../migration/workingDb/3.906-0-add-indexes.sql | 21 ++ echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 2 +- .../actions/VoyageAcousticsImportAction.java | 2 +- .../gis/templates/EchoBaseQGisTemplate.qgs | 2 +- .../src/test/resources/log4j.properties | 1 + echobase-ui/pom.xml | 2 +- pom.xml | 2 +- src/site/en/rst/configure.rst.vm | 28 +-- src/site/en/rst/model.rst | 4 + src/site/en/rst/update.rst.vm | 2 +- src/site/resources/model/Transverse.png | Bin 5934 -> 9110 bytes src/site/resources/model/dataAcoustic.png | Bin 30243 -> 34954 bytes src/site/resources/model/dataCatches.png | Bin 22259 -> 22223 bytes src/site/resources/model/dataCategory.png | Bin 9107 -> 9122 bytes src/site/resources/model/dataCommon.png | Bin 29256 -> 34469 bytes src/site/resources/model/dataEchotype.png | Bin 6836 -> 6860 bytes src/site/resources/model/dataLengthAgeKey.png | Bin 6800 -> 6754 bytes src/site/resources/model/dataLengthWeightKey.png | Bin 6658 -> 5566 bytes src/site/resources/model/dataMooring.png | Bin 0 -> 14136 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/resources/model/referenceAll.png | Bin 65068 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes src/site/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes src/site/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes src/site/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/resources/model/referenceGear.png | Bin 12657 -> 12676 bytes src/site/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/resources/model/referenceOperation.png | Bin 5848 -> 5858 bytes src/site/resources/model/referencePort.png | Bin 0 -> 3465 bytes src/site/resources/model/referenceProtocole.png | Bin 6561 -> 6576 bytes .../resources/model/referenceReferenceDatum.png | Bin 3124 -> 3134 bytes src/site/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/resources/model/referenceSpecies.png | Bin 14271 -> 14498 bytes src/site/resources/model/referenceStrata.png | Bin 7889 -> 7903 bytes src/site/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/rst/model.rst | 4 + 58 files changed, 1161 insertions(+), 22 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 807db9a9b3a7f840ff8fdd54152d777e836aec2e Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:29 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 4e85f0c..4c99c4a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 28473a7..3778e72 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index af02dfb..2a3fe99 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-4</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a32d2be..91560db 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0-alpha-4</version> <modules> <module>echobase-domain</module> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 9ae86d8b4d8a1b8783306ca8a9536b8b02460d17 Merge: 807db9a b5e9529 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:29 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../WorkingDbMigrationCallBackForVersion3_906.java | 21 +++++++++++++++++++++ .../migration/workingDb/3.906-0-add-indexes.sql | 20 ++++++++++++++++++++ 2 files changed, 41 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 38dcf19f4946c85c2c8b4132f9b298f0b3ec7e23 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jun 29 13:32:30 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 4c99c4a..4e85f0c 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 3778e72..28473a7 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 2a3fe99..af02dfb 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4</version> + <version>4.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 91560db..a32d2be 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-alpha-4</version> + <version>4.0-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm