Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: a6259aaa by Tony Chemit at 2020-05-21T08:32:16+02:00 [jgitflow-maven-plugin]updating poms for 7.6.1-SNAPSHOT development[skip ci] - - - - - 3b51a25e by Tony Chemit at 2020-05-21T08:48:20+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 8f14e0ba by Tony Chemit at 2020-05-21T08:48:21+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 5100ddfc by Tony Chemit at 2020-05-21T08:48:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 642088e2 by Tony Chemit at 2020-05-23T13:51:15+02:00 Nom et version de l'application Web - Closes #1490 - - - - - fbe50611 by Tony Chemit at 2020-05-23T14:00:55+02:00 Erreur migration base centrale 7.3 -> 7.6 - Closes #1489 - - - - - c774b6e7 by Tony Chemit at 2020-05-23T14:06:35+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.1' with non-snapshot versions[skip ci] - - - - - aaac9f94 by Tony Chemit at 2020-05-23T14:18:59+02:00 [jgitflow-maven-plugin]merging 'release/7.6.1' into 'master-7.x' - - - - - 18 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - server-runner/src/main/webapp/WEB-INF/web.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <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> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <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> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <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> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0</version> + <version>7.6.1</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <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> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0</version> + <version>7.6.1</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0</version> + <version>7.6.1</version> </parent> <artifactId>persistence</artifactId> ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java ===================================== @@ -68,6 +68,10 @@ public class DataSourceMigrationForVersion_7_6 extends MigrationVersionResource 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)); ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <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> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <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> @@ -119,7 +119,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.0</version> + <version>7.6.1</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <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> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <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> @@ -65,6 +65,25 @@ <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> ===================================== server-runner/src/main/webapp/WEB-INF/web.xml ===================================== @@ -25,25 +25,13 @@ 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> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <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> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <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> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0</version> + <version>7.6.1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0</version> + <version>7.6.1</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.0</version> + <version>7.6.1</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6493aec8c7f12330d0252be58... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/6493aec8c7f12330d0252be58... You're receiving this email because of your account on gitlab.com.