branch develop updated (669c86d -> 97470c0)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 669c86d fixes #6359: Utiliser coser 1.5.2 new eede296 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4a6431c [jgitflow-maven-plugin]updating poms for branch '2.7.2' with snapshot versions new ac756f4 prepare release 2.7.2 new 03d71f4 [jgitflow-maven-plugin]updating poms for branch'release/2.7.2' with non-snapshot versions new 57e5d46 Merge branch 'release/2.7.2' new 3076588 Merge branch 'master' into develop new 97470c0 [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 97470c0d24e8977f7568aeed346b9fd5672bf558 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:43 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 30765889a47a748d794ad0f43e5933ed2e2274ae Merge: eede296 57e5d46 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:43 2015 +0000 Merge branch 'master' into develop commit eede296f5e01223db80ea34fe5a03470e39e47c8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:42 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 57e5d46a7b8f0abb016084bdf9b980f22daf972f Merge: 2e1d397 03d71f4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:37 2015 +0000 Merge branch 'release/2.7.2' commit 03d71f4caf07580e5e0cf7bbfcc79ea52b51c517 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:38:41 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.7.2' with non-snapshot versions commit ac756f44320b47722c47fa39c472b51549580b99 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:37:57 2015 +0000 prepare release 2.7.2 Summary of changes: .../echobase/entities/references/Species2.java | 21 +++++++++++++++++++++ .../workingDb/MigrationCallBackForVersion2_7_2.java | 21 +++++++++++++++++++++ .../migration/workingDb/2.7.2-0-postgis-view.sql | 20 ++++++++++++++++++++ .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 20 ++++++++++++++++++++ .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 20 ++++++++++++++++++++ .../ui/actions/workingDb/DownloadImportFile.java | 21 +++++++++++++++++++++ 6 files changed, 123 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 http://git.codelutin.com/echobase.git commit ac756f44320b47722c47fa39c472b51549580b99 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:37:57 2015 +0000 prepare release 2.7.2 --- .../echobase/entities/references/Species2.java | 21 +++++++++++++++++++++ .../workingDb/MigrationCallBackForVersion2_7_2.java | 21 +++++++++++++++++++++ .../migration/workingDb/2.7.2-0-postgis-view.sql | 20 ++++++++++++++++++++ .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 20 ++++++++++++++++++++ .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 20 ++++++++++++++++++++ .../ui/actions/workingDb/DownloadImportFile.java | 21 +++++++++++++++++++++ 6 files changed, 123 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Species2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Species2.java index dcbf283..6ac801a 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Species2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Species2.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 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 com.google.common.base.Predicate; /** diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java index fc16c8c..97d91a3 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.persistence.migration.workingDb; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2015 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 fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.Version; diff --git a/echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql b/echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql index 2ea6670..1f9a352 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2015 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% +--- DROP FUNCTION IF EXISTS echobase_refresh_views() CASCADE; CREATE OR REPLACE FUNCTION echobase_refresh_views() diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql index b407135..2de7fb8 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2015 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 TABLE IMPORTFILE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, name VARCHAR(255), file BLOB, importLog VARCHAR(255)); ALTER TABLE IMPORTFILE ADD CONSTRAINT PK_IMPORTFILE PRIMARY KEY(TOPIAID); ALTER TABLE IMPORTFILE ADD CONSTRAINT FK_IMPORTFILE_IMPORTLOG FOREIGN KEY(IMPORTLOG) REFERENCES IMPORTLOG(TOPIAID); diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql index 969b487..97e3eeb 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql @@ -1,3 +1,23 @@ +--- +-- #%L +-- EchoBase :: Domain +-- %% +-- Copyright (C) 2011 - 2015 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 TABLE IMPORTFILE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, name character varying(255), file OID, importLog character varying(255)); ALTER TABLE IMPORTFILE ADD CONSTRAINT PK_IMPORTFILE PRIMARY KEY(TOPIAID); ALTER TABLE IMPORTFILE ADD CONSTRAINT FK_IMPORTFILE_IMPORTLOG FOREIGN KEY(IMPORTLOG) REFERENCES IMPORTLOG(TOPIAID); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java index 5069ee5..849285c 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.ui.actions.workingDb; +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2015 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 fr.ifremer.echobase.entities.ImportFile; import fr.ifremer.echobase.services.service.UserDbPersistenceService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -- 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 http://git.codelutin.com/echobase.git commit 03d71f4caf07580e5e0cf7bbfcc79ea52b51c517 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:38:41 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.7.2' 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 0988e1e..5585f9a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 42ebf94..6f37156 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 1f86cdf..8dd97bf 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index f97159e..21ffba1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2-SNAPSHOT</version> + <version>2.7.2</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 http://git.codelutin.com/echobase.git commit 57e5d46a7b8f0abb016084bdf9b980f22daf972f Merge: 2e1d397 03d71f4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:37 2015 +0000 Merge branch 'release/2.7.2' echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 45 +- .../config/EchoBaseConfigurationOption.java | 54 +- .../entities/EchoBaseUserPersistenceContext.java | 1 + .../EchoBaseUserTopiaApplicationContext.java | 56 +- .../EchoBaseUserTopiaPersistenceContext.java | 8 + .../echobase/entities/references/Species2.java | 54 + .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 7 +- .../internalDb/MigrationCallBackForVersion.java | 14 + .../workingDb/MigrationCallBackForVersion.java | 39 + .../workingDb/MigrationCallBackForVersion2_2.java | 3 +- .../MigrationCallBackForVersion2_5_1.java | 9 +- .../workingDb/MigrationCallBackForVersion2_6.java | 5 +- .../MigrationCallBackForVersion2_6_1.java | 5 +- ....java => MigrationCallBackForVersion2_7_2.java} | 33 +- ...migration.workingDb.MigrationCallBackForVersion | 3 +- .../i18n/echobase-domain_en_GB.properties | 7 +- .../i18n/echobase-domain_fr_FR.properties | 7 +- .../2.5.1-0-postgis-structure.sql} | 0 .../2.5.1-1-postgis-view.sql} | 0 .../2.6-0-postgis-view.sql} | 0 .../2.6.1-0-postgis-structure.sql} | 0 .../migration/workingDb/2.7.2-0-postgis-view.sql | 63 + .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 23 + .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 23 + .../src/main/resources/postgis-view.sql | 6 +- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89097 -> 89705 bytes echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 67 +- .../EmbeddedApplicationService.java | 21 - .../service/exportCoser/ExportCoserService.java | 65 +- .../importdata/AbstractImportDataService.java | 51 +- .../services/service/spatial/GisService.java | 244 +- ...late.qgs.cfg => EchoBaseLizmapTemplate.qgs.cfg} | 0 ...seQGisTemplate.qgs => EchoBaseQGisTemplate.qgs} | 10 +- .../main/resources/gis/templates/QgisTemplate.qgs | 4530 -------------------- .../services/service/spatial/GisServiceTest.java | 13 +- .../gis}/lizmap/resources/France&Spain.dbf | Bin .../gis}/lizmap/resources/France&Spain.prj | 0 .../gis}/lizmap/resources/France&Spain.qpj | 0 .../gis}/lizmap/resources/France&Spain.shp | Bin .../gis}/lizmap/resources/France&Spain.shx | Bin .../resources/gis}/lizmap/resources/pelgas09.avl | 0 .../resources/gis}/lizmap/resources/pelgas09.dbf | Bin .../resources/gis}/lizmap/resources/pelgas09.qix | Bin .../resources/gis}/lizmap/resources/pelgas09.shp | Bin .../resources/gis}/lizmap/resources/pelgas09.shx | Bin echobase-ui/pom.xml | 2 +- echobase-ui/src/main/assembly/lizmap-zip.xml | 2 +- .../{resources => assembly}/lizmap/www/js/map.js | 0 .../lizmap/www/themes/default/css/admin.css | 0 .../www/themes/default/css/images/123_click.png | Bin .../www/themes/default/css/images/bt_jaune.jpg | Bin .../themes/default/css/images/download_layer.gif | Bin .../www/themes/default/css/images/sprite_18.png | Bin .../www/themes/default/css/images/sprite_20.png | Bin .../themes/default/css/images/sprite_20_black.png | Bin .../themes/default/css/images/sprite_20_tools.png | Bin .../www/themes/default/css/images/sprite_menu.png | Bin .../default/css/images/sprite_menu_tools.png | Bin .../default/css/images/sprite_timemanager.png | Bin .../themes/default/css/img/250x250_mappemonde.png | Bin .../lizmap/www/themes/default/css/img/loading.gif | Bin .../lizmap/www/themes/default/css/img/logo.png | Bin .../www/themes/default/css/img/logo_footer.png | Bin .../default/css/img/overview_replacement.gif | Bin .../default/css/img/overview_replacement.png | Bin .../lizmap/www/themes/default/css/main.css | 0 .../lizmap/www/themes/default/css/map.css | 0 .../lizmap/www/themes/default/css/media.css | 0 .../lizmap/www/themes/default/css/view.css | 0 .../echobase/ui/EchoBaseApplicationContext.java | 52 +- .../echobase/ui/actions/workingDb/Create.java | 8 + .../ui/actions/workingDb/DownloadImportFile.java | 116 + .../ui/actions/workingDb/GetImportLogDetail.java | 9 + .../src/main/resources/config/struts-workingDb.xml | 12 + .../{ => gis}/lizmap/resources/France&Spain.dbf | Bin .../{ => gis}/lizmap/resources/France&Spain.prj | 0 .../{ => gis}/lizmap/resources/France&Spain.qpj | 0 .../{ => gis}/lizmap/resources/France&Spain.shp | Bin .../{ => gis}/lizmap/resources/France&Spain.shx | Bin .../{ => gis}/lizmap/resources/pelgas09.avl | 0 .../{ => gis}/lizmap/resources/pelgas09.dbf | Bin .../{ => gis}/lizmap/resources/pelgas09.qix | Bin .../{ => gis}/lizmap/resources/pelgas09.shp | Bin .../{ => gis}/lizmap/resources/pelgas09.shx | Bin .../resources/i18n/echobase-ui_en_GB.properties | 2 + .../resources/i18n/echobase-ui_fr_FR.properties | 2 + .../webapp/WEB-INF/decorators/layout-default.jsp | 9 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 53 +- .../main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 38 +- echobase-ui/src/main/webapp/css/screen.css | 19 +- echobase-ui/src/main/webapp/js/test.js | 65 - pom.xml | 21 +- src/site/site_en.xml | 2 +- src/site/site_fr.xml | 2 +- 97 files changed, 998 insertions(+), 4888 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 http://git.codelutin.com/echobase.git commit eede296f5e01223db80ea34fe5a03470e39e47c8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:42 2015 +0000 [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 2c425c4..5585f9a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index e999435..6f37156 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 873b59a..8dd97bf 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.2</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 3f1b98d..21ffba1 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.2</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 http://git.codelutin.com/echobase.git commit 30765889a47a748d794ad0f43e5933ed2e2274ae Merge: eede296 57e5d46 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:43 2015 +0000 Merge branch 'master' into develop .../echobase/entities/references/Species2.java | 21 +++++++++++++++++++++ .../workingDb/MigrationCallBackForVersion2_7_2.java | 21 +++++++++++++++++++++ .../migration/workingDb/2.7.2-0-postgis-view.sql | 20 ++++++++++++++++++++ .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 20 ++++++++++++++++++++ .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 20 ++++++++++++++++++++ .../ui/actions/workingDb/DownloadImportFile.java | 21 +++++++++++++++++++++ 6 files changed, 123 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 http://git.codelutin.com/echobase.git commit 97470c0d24e8977f7568aeed346b9fd5672bf558 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:43 2015 +0000 [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 5585f9a..2c425c4 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 6f37156..e999435 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 8dd97bf..873b59a 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 21ffba1..3f1b98d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.2</version> + <version>2.8-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