branch develop updated (c41c581 -> 0a48322)
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 c41c581 [jgitflow-maven-plugin]updating poms for 2.8-SNAPSHOT development new ec7ef43 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d3da33a [maven-release-plugin] copy for tag echobase-2.6 new d67523e prepare release 2.7 new 84887a1 [jgitflow-maven-plugin]updating poms for branch'release/2.7' with non-snapshot versions new 649ef30 Merge branch 'release/2.7' new 4111c64 Merge branch 'master' into develop new 0a48322 [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 0a48322898cc532e2b4d68391e5119024fe06c8d Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:31 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 4111c64e66a5b8e2b4032b57c375e07aea11d09e Merge: ec7ef43 649ef30 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:26 2014 +0000 Merge branch 'master' into develop commit ec7ef4377bd8371d1fa150b730aaa00337501e59 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:25 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 649ef30f6eddc8494059734ccb30c228e32d7a5a Merge: d3da33a 84887a1 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:20 2014 +0000 Merge branch 'release/2.7' commit 84887a15add5af09e0ea51a967bd80bb88b9cd02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:17:49 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.7' with non-snapshot versions commit d67523ed505a8d6ef90101e0199c79e7fd238f32 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:17:28 2014 +0000 prepare release 2.7 Summary of changes: echobase-ui/src/main/assembly/lizmap-zip.xml | 20 ++++++++++++++++++++ .../echobase/ui/actions/dbeditor/DeleteEntity.java | 21 +++++++++++++++++++++ echobase-ui/src/main/resources/lizmap/www/js/map.js | 21 +++++++++++++++++++++ .../lizmap/www/themes/default/css/admin.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/main.css | 20 ++++++++++++++++++++ .../resources/lizmap/www/themes/default/css/map.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/media.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/view.css | 20 ++++++++++++++++++++ 8 files changed, 162 insertions(+) mode change 100755 => 100644 echobase-ui/src/main/resources/lizmap/www/js/map.js mode change 100755 => 100644 echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css mode change 100755 => 100644 echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css mode change 100755 => 100644 echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css mode change 100755 => 100644 echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css mode change 100755 => 100644 echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css -- 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 d67523ed505a8d6ef90101e0199c79e7fd238f32 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:17:28 2014 +0000 prepare release 2.7 --- echobase-ui/src/main/assembly/lizmap-zip.xml | 20 ++++++++++++++++++++ .../echobase/ui/actions/dbeditor/DeleteEntity.java | 21 +++++++++++++++++++++ echobase-ui/src/main/resources/lizmap/www/js/map.js | 21 +++++++++++++++++++++ .../lizmap/www/themes/default/css/admin.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/main.css | 20 ++++++++++++++++++++ .../resources/lizmap/www/themes/default/css/map.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/media.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/view.css | 20 ++++++++++++++++++++ 8 files changed, 162 insertions(+) diff --git a/echobase-ui/src/main/assembly/lizmap-zip.xml b/echobase-ui/src/main/assembly/lizmap-zip.xml index 26d66db..0a51f04 100644 --- a/echobase-ui/src/main/assembly/lizmap-zip.xml +++ b/echobase-ui/src/main/assembly/lizmap-zip.xml @@ -1,3 +1,23 @@ +<!-- + #%L + EchoBase :: UI + %% + Copyright (C) 2011 - 2014 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% + --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java index 2d80957..06275e5 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/DeleteEntity.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.ui.actions.dbeditor; +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.services.service.DbEditorService; diff --git a/echobase-ui/src/main/resources/lizmap/www/js/map.js b/echobase-ui/src/main/resources/lizmap/www/js/map.js old mode 100755 new mode 100644 index 6732989..5f02b1b --- a/echobase-ui/src/main/resources/lizmap/www/js/map.js +++ b/echobase-ui/src/main/resources/lizmap/www/js/map.js @@ -15,6 +15,27 @@ var lizMap = function() { * {object} The map config */ var config = null; + +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ /** * PRIVATE Property: capabilities * {object} The wms capabilities diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css old mode 100755 new mode 100644 index 870b7ab..140afd2 --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ .jforms-error-list { background-color: #C43C35; background-image: -moz-linear-gradient(center top , #EE5F5B, #C43C35); diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css old mode 100755 new mode 100644 index 124a050..30b47fb --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ body { background: #03497c; color : #ffec3e; diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css old mode 100755 new mode 100644 index 3047a98..46d6345 --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ #title { right: 20%; diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css old mode 100755 new mode 100644 index 1a7dd38..99df5e0 --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ /* #### Mobile Phones Portrait #### */ @media screen and (max-device-width: 480px) and (orientation: portrait){ /* some CSS here */ diff --git a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css old mode 100755 new mode 100644 index b4008b8..a13d95a --- a/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css +++ b/echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css @@ -1,3 +1,23 @@ +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2014 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% + */ .thumbnail { border: 1px solid #ffec3e; background: #03497c; -- 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 84887a15add5af09e0ea51a967bd80bb88b9cd02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:17:49 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.7' 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 e84e295..6b9d974 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-SNAPSHOT</version> + <version>2.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index d783988..0f7cbec 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-SNAPSHOT</version> + <version>2.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 367cec3..76c64bd 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-SNAPSHOT</version> + <version>2.7</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a18a365..712e3d4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.7</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 649ef30f6eddc8494059734ccb30c228e32d7a5a Merge: d3da33a 84887a1 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:20 2014 +0000 Merge branch 'release/2.7' .gitignore | 15 + R-EchoBase/Baracouda2Echobase.r | 217 + R-EchoBase/R-echobaseLegacyCheck.r | 534 +++ R-EchoBase/R-echobase_functions.r | 26 + echobase-domain/pom.xml | 7 +- .../echobase/config/EchoBaseConfiguration.java | 51 + .../config/EchoBaseConfigurationOption.java | 34 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 2 +- .../i18n/echobase-domain_en_GB.properties | 7 + .../i18n/echobase-domain_fr_FR.properties | 7 + echobase-services/pom.xml | 6 +- .../echobase/services/service/DbEditorService.java | 15 + .../services/service/UserDbPersistenceService.java | 4 + .../exportCoser/ExportCoserConfiguration.java | 76 +- .../service/exportCoser/ExportCoserService.java | 91 +- .../service/importdata/AcousticImportResult.java | 57 + .../service/importdata/AcousticImportService.java | 78 +- .../services/service/spatial/SpatialService.java | 244 ++ .../workingDb/WorkingDbConfigurationService.java | 7 + .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + echobase-ui/pom.xml | 24 +- echobase-ui/src/main/assembly/lizmap-zip.xml | 43 + .../echobase/ui/EchoBaseApplicationContext.java | 41 + .../echobase/ui/EchoBaseApplicationListener.java | 8 + .../echobase/ui/actions/dbeditor/DeleteEntity.java | 84 + .../echobase/ui/actions/dbeditor/ExportTable.java | 13 +- .../echobase/ui/actions/exportCoser/Configure.java | 27 +- .../exportQuery/DownloadExportQueryResult.java | 5 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 33 +- .../echobase/ui/actions/spatial/ShowMap.java | 21 - .../ui/actions/workingDb/DownloadDriver.java | 3 +- .../src/main/resources/config/struts-dbeditor.xml | 6 + .../src/main/resources/config/struts-spatial.xml | 4 +- .../actions/exportCoser/Configure-validation.xml | 16 +- .../resources/i18n/echobase-ui_en_GB.properties | 12 + .../resources/i18n/echobase-ui_fr_FR.properties | 14 + .../resources/lizmap/resources/France&Spain.dbf | Bin 0 -> 277 bytes .../resources/lizmap/resources/France&Spain.prj | 1 + .../resources/lizmap/resources/France&Spain.qpj | 1 + .../resources/lizmap/resources/France&Spain.shp | Bin 0 -> 1692536 bytes .../resources/lizmap/resources/France&Spain.shx | Bin 0 -> 116 bytes .../main/resources/lizmap/resources/pelgas09.avl | 1134 +++++ .../main/resources/lizmap/resources/pelgas09.dbf | Bin 0 -> 434 bytes .../main/resources/lizmap/resources/pelgas09.qix | Bin 0 -> 152 bytes .../main/resources/lizmap/resources/pelgas09.shp | Bin 0 -> 896940 bytes .../main/resources/lizmap/resources/pelgas09.shx | Bin 0 -> 196 bytes .../lizmap/templates/LizmapTemplate.qgs.cfg | 325 ++ .../resources/lizmap/templates/QgisTemplate.qgs | 4530 ++++++++++++++++++++ .../src/main/resources/lizmap/www/js/map.js | 4019 +++++++++++++++++ .../lizmap/www/themes/default/css/admin.css | 28 + .../www/themes/default/css/images/123_click.png | Bin 0 -> 270 bytes .../www/themes/default/css/images/bt_jaune.jpg | Bin 0 -> 1271 bytes .../themes/default/css/images/download_layer.gif | Bin 0 -> 5174 bytes .../www/themes/default/css/images/sprite_18.png | Bin 0 -> 3731 bytes .../www/themes/default/css/images/sprite_20.png | Bin 0 -> 2394 bytes .../themes/default/css/images/sprite_20_black.png | Bin 0 -> 2730 bytes .../themes/default/css/images/sprite_20_tools.png | Bin 0 -> 26490 bytes .../www/themes/default/css/images/sprite_menu.png | Bin 0 -> 2062 bytes .../default/css/images/sprite_menu_tools.png | Bin 0 -> 4871 bytes .../default/css/images/sprite_timemanager.png | Bin 0 -> 730 bytes .../themes/default/css/img/250x250_mappemonde.png | Bin 0 -> 59473 bytes .../lizmap/www/themes/default/css/img/loading.gif | Bin 0 -> 12454 bytes .../lizmap/www/themes/default/css/img/logo.png | Bin 0 -> 6717 bytes .../www/themes/default/css/img/logo_footer.png | Bin 0 -> 1520 bytes .../default/css/img/overview_replacement.gif | Bin 0 -> 100 bytes .../default/css/img/overview_replacement.png | Bin 0 -> 208 bytes .../lizmap/www/themes/default/css/main.css | 133 + .../lizmap/www/themes/default/css/map.css | 540 +++ .../lizmap/www/themes/default/css/media.css | 110 + .../lizmap/www/themes/default/css/view.css | 56 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 4 + .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 122 +- .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 77 +- echobase-ui/src/main/webapp/css/screen.css | 6 + pom.xml | 183 +- src/site/rst/gis.rst | 100 + src/site/rst/install.rst.vm | 81 +- src/site/site_en.xml | 69 +- src/site/site_fr.xml | 71 +- 80 files changed, 12982 insertions(+), 442 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 ec7ef4377bd8371d1fa150b730aaa00337501e59 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:25 2014 +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..6b9d974 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</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index e999435..0f7cbec 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</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index fa7d113..76c64bd 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</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 4b731b5..712e3d4 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</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 4111c64e66a5b8e2b4032b57c375e07aea11d09e Merge: ec7ef43 649ef30 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:26 2014 +0000 Merge branch 'master' into develop echobase-ui/src/main/assembly/lizmap-zip.xml | 20 ++++++++++++++++++++ .../echobase/ui/actions/dbeditor/DeleteEntity.java | 21 +++++++++++++++++++++ echobase-ui/src/main/resources/lizmap/www/js/map.js | 21 +++++++++++++++++++++ .../lizmap/www/themes/default/css/admin.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/main.css | 20 ++++++++++++++++++++ .../resources/lizmap/www/themes/default/css/map.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/media.css | 20 ++++++++++++++++++++ .../lizmap/www/themes/default/css/view.css | 20 ++++++++++++++++++++ 8 files changed, 162 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 0a48322898cc532e2b4d68391e5119024fe06c8d Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:31 2014 +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 6b9d974..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</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 0f7cbec..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</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 76c64bd..fa7d113 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</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 712e3d4..4b731b5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7</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