GitLab

at 2020-05-21T08:32:16+02:00

[jgitflow-maven-plugin]updating poms for 7.6.1-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]
Nom et version de l'application Web - Closes #1490

Erreur migration base centrale 7.3 -> 7.6 - Closes #1489

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

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>client-configuration</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>client-core</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>client-runner</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>dto</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>observe-i18n</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>observe</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>persistence</artifactId>

             String comment = pair.getValue().trim();

 

             int endIndex = comment.indexOf('#', 1);

+            if (endIndex == 1) {

+                // Must be a ## starting comment

+                continue;

+            }

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

             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));

 

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

   <artifactId>ird-observe</artifactId>

-  <version>7.6.0</version>

+  <version>7.6.1</version>

   <packaging>pom</packaging>

 

   <name>ObServe :: Pom</name>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>server-configuration</artifactId>

     <dependency>

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

       <artifactId>services</artifactId>

-      <version>7.6.0</version>

+      <version>7.6.1</version>

       <scope>compile</scope>

     </dependency>

 

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>server-core</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>server-runner</artifactId>

     <pluginManagement>

       <plugins>

 

+        <plugin>

+          <groupId>org.apache.maven.plugins</groupId>

+          <artifactId>maven-war-plugin</artifactId>

+          <configuration>

+            <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>

+<!--            <webResources>-->

+<!--              <resource>-->

+<!--                <filtering>true</filtering>-->

+<!--                <directory>src/main/webapp</directory>-->

+<!--                <includes>-->

+<!--                  <include>**/web.xml</include>-->

+<!--                </includes>-->

+<!--              </resource>-->

+<!--            </webResources>-->

+<!--            <warSourceDirectory>src/main/webapp</warSourceDirectory>-->

+<!--            <webXml>src/main/webapp/WEB-INF/web.xml</webXml>-->

+          </configuration>

+        </plugin>

+

         <plugin>

           <groupId>org.mortbay.jetty</groupId>

           <artifactId>jetty-maven-plugin</artifactId>

          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee

   http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" >

 

-  <display-name>Observe Web Application by WebMotion</display-name>

+  <display-name>Observe Web v ${project.version} Application by WebMotion</display-name>

 

   <context-param>

     <param-name>wm.skip.conventionScan</param-name>

     <param-value>true</param-value>

   </context-param>

 

-  <!--filter>

-    <filter-name>topiaTransaction</filter-name>

-    <filter-class>

-      fr.ird.observe.services.rest.ObserveRestTransactionFilter

-    </filter-class>

-  </filter-->

-

-  <!--filter-mapping>

-    <filter-name>topiaTransaction</filter-name>

-    <url-pattern>/*</url-pattern>

-  </filter-mapping-->

-

   <listener>

     <listener-class>fr.ird.observe.server.ObserveWebApplicationListener</listener-class>

   </listener>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>services-client</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>services-local</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>services</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.0</version>

+    <version>7.6.1</version>

   </parent>

 

   <artifactId>validation</artifactId>

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

Commits:

18 changed files:

Changes: