Tony CHEMIT pushed to branch develop-5.x 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 - - - - - 54357830 by Tony CHEMIT at 2017-06-13T23:44:45+02:00 [jgitflow-maven-plugin]merging 'release/5.4' into 'master-5.x' - - - - - 84ea53aa by Tony CHEMIT at 2017-06-13T23:44:48+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 06a6f198 by Tony CHEMIT at 2017-06-13T23:44:49+02:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 5cc115b4 by Tony CHEMIT at 2017-06-13T23:44:50+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 3 changed files: - entities/src/test/java/fr/ird/observe/H2TimeZoneTest.java - services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/topia/ObserveDataSourceConfigurationTopiaH2.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java Changes: ===================================== 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; ===================================== 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-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(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/43d6a0890c5d53d89d77cbdb250... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/43d6a0890c5d53d89d77cbdb250... You're receiving this email because of your account on gitlab.com.