Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ac92b53b by Tony CHEMIT at 2018-02-20T13:11:39+01:00 Let's go to version 2.1 - - - - - 21 changed files: - CONTRIBUTING.md - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java → t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_1.java - t3-domain/src/main/resources/db/migration/V3_0_01_add-Harbour-country-link.sql → t3-domain/src/main/resources/db/migration/V2_1_01_add-Harbour-country-link.sql - t3-domain/src/main/resources/db/migration/V3_0_02_remove-LocalMarketPackaging-status.sql → t3-domain/src/main/resources/db/migration/V2_1_02_remove-LocalMarketPackaging-status.sql - t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql → t3-domain/src/main/resources/db/migration/V2_1_03_fix-LocalMarketPackagingType-ids.sql - t3-domain/src/main/resources/db/migration/V3_0_04_rename-SampleWell-table.sql → t3-domain/src/main/resources/db/migration/V2_1_04_rename-SampleWell-table.sql - t3-domain/src/main/resources/db/migration/V3_0_05_rename-SampleSpecies-fields.sql → t3-domain/src/main/resources/db/migration/V2_1_05_rename-SampleSpecies-fields.sql - t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql → t3-domain/src/main/resources/db/migration/V2_1_06_referential-i18n.sql - t3-domain/src/main/xmi/t3-persistence.properties - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-test/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,39 +1,3 @@ -# Release (without stage) +# How does it works ? -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdt3/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash -``` - -# Release (with stage) - -Create stage - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdt3/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdt3/' | bash -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash -``` - -And to release stage - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdt3/' | bash -``` - -# Regenerate changelog - -``` -wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash -``` - -# Generate site - -``` -mvn clean verify site -DperformRelease scm-publish:publish-scm -``` \ No newline at end of file +See [Ultreiaio/scripts](https://gitlab.com/ultreiaio/scripts/blob/master/README.md). ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <packaging>pom</packaging> <name>T3 :: Pom</name> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java → t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_1.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV3_0.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_1.java @@ -35,30 +35,20 @@ import java.util.List; * @author Tony Chemit - dev@tchemit.fr */ @AutoService(TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion.class) -public class T3MigrationCallbackV3_0 extends T3MigrationCallbackSupport { +public class T3MigrationCallbackV2_1 extends T3MigrationCallbackSupport { - public T3MigrationCallbackV3_0() { - super(Versions.valueOf("3.0")); + public T3MigrationCallbackV2_1() { + super(Versions.valueOf("2.1")); } @Override protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { - addScript("01", "add-Harbour-country-link", queries); addScript("02", "remove-LocalMarketPackaging-status", queries); addScript("03", "fix-LocalMarketPackagingType-ids", queries); addScript("04", "rename-SampleWell-table", queries); addScript("05", "rename-SampleSpecies-fields", queries); addScript("06", "referential-i18n", queries); -// addScript("07", "", queries); -// addScript("08", "", queries); -// addScript("09", "", queries); -// addScript("10", "", queries); -// addScript("11", "", queries); -// addScript("12", "", queries); -// addScript("13", "", queries); -// addScript("14", "", queries); - } } ===================================== t3-domain/src/main/resources/db/migration/V3_0_01_add-Harbour-country-link.sql → t3-domain/src/main/resources/db/migration/V2_1_01_add-Harbour-country-link.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_02_remove-LocalMarketPackaging-status.sql → t3-domain/src/main/resources/db/migration/V2_1_02_remove-LocalMarketPackaging-status.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_03_fix-LocalMarketPackagingType-ids.sql → t3-domain/src/main/resources/db/migration/V2_1_03_fix-LocalMarketPackagingType-ids.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_04_rename-SampleWell-table.sql → t3-domain/src/main/resources/db/migration/V2_1_04_rename-SampleWell-table.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_05_rename-SampleSpecies-fields.sql → t3-domain/src/main/resources/db/migration/V2_1_05_rename-SampleSpecies-fields.sql ===================================== ===================================== t3-domain/src/main/resources/db/migration/V3_0_06_referential-i18n.sql → t3-domain/src/main/resources/db/migration/V2_1_06_referential-i18n.sql ===================================== ===================================== t3-domain/src/main/xmi/t3-persistence.properties ===================================== --- a/t3-domain/src/main/xmi/t3-persistence.properties +++ b/t3-domain/src/main/xmi/t3-persistence.properties @@ -22,7 +22,7 @@ model.tagValue.notGenerateToString=true model.tagValue.generateOperatorForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=3.0 +model.tagValue.version=2.1 model.tagValue.indexForeignKeys=true fr.ird.t3.entities.data.Trip.attribute.activity.stereotype=ordered ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-test</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ac92b53b88b3fdfd4579824b2ce9d7701... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ac92b53b88b3fdfd4579824b2ce9d7701... You're receiving this email because of your account on gitlab.com.