GitLab

at 2017-06-13T22:39:54+02:00

[jgitflow-maven-plugin]updating poms for branch'release/5.4' with non-snapshot versions
fix test

fix new h2 db file name

add missing license header

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>application-swing-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>application-swing-decoration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>application-swing-validation</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>application-swing-validators</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>application-swing</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>application-web-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>application-web</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>entities-migration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>entities</artifactId>

 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;

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>observe</artifactId>

 

   <groupId>fr.ird.observe</groupId>

   <artifactId>pom</artifactId>

-  <version>5.4-SNAPSHOT</version>

+  <version>5.4</version>

   <packaging>pom</packaging>

 

   <name>ObServe :: Pom</name>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-configuration-rest</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-configuration-topia</artifactId>

     }

 

     public File getDatabaseFile() {

-        return new File(directory, dbName + ".h2.db");

+        return new File(directory, dbName + ".mv.db");

     }

 

     public File getLockFile() {

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-configuration</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-dto</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-rest</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-runner</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-topia-validation</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-topia-validators</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services-topia</artifactId>

 

         File databasesRootDirectory = topiaTestMethodResource.getDataSourceConfiguration().getDatabaseFile();

 

-        while (!"observe".equals(databasesRootDirectory.getName())) {

+        while (!"ird-observe".equals(databasesRootDirectory.getName())) {

             databasesRootDirectory = databasesRootDirectory.getParentFile();

         }

 

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>services</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>toolbox-maven-plugin</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>topia-extension</artifactId>

   <parent>

     <groupId>fr.ird.observe</groupId>

     <artifactId>pom</artifactId>

-    <version>5.4-SNAPSHOT</version>

+    <version>5.4</version>

   </parent>

 

   <artifactId>topia-templates-extension</artifactId>

...	...	@@ -58,7 +58,7 @@ public class ObserveDataSourceConfigurationTopiaH2 extends ObserveDataSourceConf
58	58	}
59	59
60	60	public File getDatabaseFile() {
61		- return new File(directory, dbName + ".h2.db");
	61	+ return new File(directory, dbName + ".mv.db");
62	62	}
63	63
64	64	public File getLockFile() {

Tony CHEMIT pushed to branch release/5.4 at ultreiaio / ird-observe

Commits:

28 changed files:

Changes: