Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: dd59aa48 by Tony Chemit at 2020-05-18T11:36:59+02:00 Prepare version 7.6.0 (Version de base dans tms_version - Closes #1485) - - - - - 25 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_5_1.java → 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 - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - − test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz - − test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz - − test/src/main/resources/db/7.5.1/referentiel.sql.gz - + test/src/main/resources/db/7.6/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.6/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5.1/empty_h2.sql.gz → test/src/main/resources/db/7.6/empty_h2.sql.gz - test/src/main/resources/db/7.5.1/empty_pg.sql.gz → test/src/main/resources/db/7.6/empty_pg.sql.gz - + test/src/main/resources/db/7.6/referentiel.sql.gz - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> @@ -90,7 +90,10 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> @@ -488,6 +488,10 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <!-- Nuiton --> <dependency> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</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.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> @@ -107,6 +107,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> @@ -37,7 +37,10 @@ <i18n.artifactId>observe</i18n.artifactId> </properties> <dependencies> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> @@ -113,6 +113,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java → persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_6.java ===================================== @@ -40,10 +40,10 @@ import java.util.Set; * @since 7.5.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_7_5_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_7_6 extends MigrationVersionResource { - public DataSourceMigrationForVersion_7_5_1() { - super(Versions.valueOf("7.5.1")); + public DataSourceMigrationForVersion_7_6() { + super(Versions.valueOf("7.6")); } @Override ===================================== pom.xml ===================================== @@ -26,12 +26,12 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.25</version> + <version>2020.27</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> @@ -149,7 +149,7 @@ <devMode>true</devMode> <!--persistence model version--> - <observe.model.version>7.5.1</observe.model.version> + <observe.model.version>7.6</observe.model.version> <!-- build timestamp configuration --> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -75,6 +75,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <!-- Nuiton --> <dependency> @@ -115,7 +119,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</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.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</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.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</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.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> @@ -101,10 +101,7 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - </dependency> <!--<dependency>--> - <!--<groupId>commons-io</groupId>--> - <!--<artifactId>commons-io</artifactId>--> - <!--</dependency>--> + </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> @@ -117,7 +114,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> @@ -112,7 +112,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> - + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.5.1/referentiel.sql.gz deleted ===================================== Binary files a/test/src/main/resources/db/7.5.1/referentiel.sql.gz and /dev/null differ ===================================== test/src/main/resources/db/7.6/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.6/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5.1/empty_h2.sql.gz → test/src/main/resources/db/7.6/empty_h2.sql.gz ===================================== ===================================== test/src/main/resources/db/7.5.1/empty_pg.sql.gz → test/src/main/resources/db/7.6/empty_pg.sql.gz ===================================== ===================================== test/src/main/resources/db/7.6/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.6/referentiel.sql.gz differ ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.5.3-SNAPSHOT</version> + <version>7.6.0-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> @@ -75,6 +75,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service-annotations</artifactId> + </dependency> <!-- provided dependencies --> <dependency> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dd59aa482ecb044c43b38dc39f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dd59aa482ecb044c43b38dc39f... You're receiving this email because of your account on gitlab.com.