GitLab

at 2020-05-23T14:05:14+02:00

[jgitflow-maven-plugin]updating poms for 7.6.2-SNAPSHOT development[skip ci]
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
[jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
Migration des trip.comment vers trip.homeid incorrecte - Closes #1492

update pom

[jgitflow-maven-plugin]updating poms for branch'release/7.6.2' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/7.6.2' into 'master-7.x'
   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>client-configuration</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>client-core</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>client-runner</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>dto</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>observe-i18n</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>observe</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>persistence</artifactId>

 import org.nuiton.topia.persistence.support.TopiaSqlQuery;

 import org.nuiton.topia.service.migration.resources.MigrationVersionResource;

 import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;

+import org.nuiton.util.DateUtil;

 import org.nuiton.version.Versions;

 

 import java.sql.Connection;

 import java.sql.PreparedStatement;

 import java.sql.ResultSet;

 import java.sql.SQLException;

+import java.util.Date;

 import java.util.Set;

 

 /**

                 // Must be a ## starting comment

                 continue;

             }

-            String homeId = comment.substring(1, endIndex - 1);

+            String homeId = comment.substring(1, endIndex);

             String newComment = endIndex + 1 == comment.length() ? "NULL" : (String.format("'%s'", comment.substring(endIndex + 1).trim().replaceAll("'","''")));

             executor.writeSql(String.format("UPDATE observe_seine.trip t SET comment = %s, homeId = '%s', topiaVersion = topiaVersion + 1, lastUpdateDate = CURRENT_TIMESTAMP WHERE t.topiaId = '%s';", newComment, homeId, tripId));

         }

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2020.27</version>

+    <version>2020.28</version>

   </parent>

 

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

   <artifactId>ird-observe</artifactId>

-  <version>7.6.1</version>

+  <version>7.6.2</version>

   <packaging>pom</packaging>

 

   <name>ObServe :: Pom</name>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>server-configuration</artifactId>

     <dependency>

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

       <artifactId>services</artifactId>

-      <version>7.6.1</version>

+      <version>7.6.2</version>

       <scope>compile</scope>

     </dependency>

 

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>server-core</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>server-runner</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>services-client</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>services-local</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>services</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.1</version>

+    <version>7.6.2</version>

   </parent>

 

   <artifactId>validation</artifactId>

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe

Commits:

20 changed files:

Changes: