Tony CHEMIT pushed to branch release/5.4 at ultreiaio / ird-observe Commits: db71e851 by Tony CHEMIT at 2017-06-13T22:39:54+02:00 [jgitflow-maven-plugin]updating poms for branch'release/5.4' with non-snapshot versions - - - - - 61b5b4a0 by Tony CHEMIT at 2017-06-13T23:26:58+02:00 fix test - - - - - 790cc1db by Tony CHEMIT at 2017-06-13T23:27:18+02:00 fix new h2 db file name - - - - - e3c73e79 by Tony CHEMIT at 2017-06-13T23:27:33+02:00 add missing license header - - - - - 28 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - entities/src/test/java/fr/ird/observe/H2TimeZoneTest.java - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>entities</artifactId> ===================================== entities/src/test/java/fr/ird/observe/H2TimeZoneTest.java ===================================== --- a/entities/src/test/java/fr/ird/observe/H2TimeZoneTest.java +++ b/entities/src/test/java/fr/ird/observe/H2TimeZoneTest.java @@ -1,5 +1,27 @@ package fr.ird.observe; +/*- + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * 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 java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java ===================================== --- a/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java +++ b/services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java @@ -58,7 +58,7 @@ public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConf } public File getDatabaseFile() { - return new File(directory, dbName + ".h2.db"); + return new File(directory, dbName + ".mv.db"); } public File getLockFile() { ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java ===================================== --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java @@ -117,7 +117,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { File databasesRootDirectory = topiaTestMethodResource.getDataSourceConfiguration().getDatabaseFile(); - while (!"observe".equals(databasesRootDirectory.getName())) { + while (!"ird-observe".equals(databasesRootDirectory.getName())) { databasesRootDirectory = databasesRootDirectory.getParentFile(); } ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.4-SNAPSHOT</version> + <version>5.4</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c6a793a8f5e57e7ca299294c6a7... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c6a793a8f5e57e7ca299294c6a7... You're receiving this email because of your account on gitlab.com.