Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
ac92b53b
by Tony CHEMIT at 2018-02-20T13:11:39+01:00
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:
| 1 |
-# Release (without stage)
|
|
| 1 |
+# How does it works ?
|
|
| 2 | 2 |
|
| 3 |
-```
|
|
| 4 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
|
|
| 5 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
|
|
| 6 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdt3/' | bash
|
|
| 7 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
|
|
| 8 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
|
|
| 9 |
-```
|
|
| 10 |
- |
|
| 11 |
-# Release (with stage)
|
|
| 12 |
- |
|
| 13 |
-Create stage
|
|
| 14 |
- |
|
| 15 |
-```
|
|
| 16 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash
|
|
| 17 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash
|
|
| 18 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdt3/' | bash
|
|
| 19 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdt3/' | bash
|
|
| 20 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash
|
|
| 21 |
-```
|
|
| 22 |
- |
|
| 23 |
-And to release stage
|
|
| 24 |
- |
|
| 25 |
-```
|
|
| 26 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdt3/' | bash
|
|
| 27 |
-```
|
|
| 28 |
- |
|
| 29 |
-# Regenerate changelog
|
|
| 30 |
- |
|
| 31 |
-```
|
|
| 32 |
-wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash
|
|
| 33 |
-```
|
|
| 34 |
- |
|
| 35 |
-# Generate site
|
|
| 36 |
- |
|
| 37 |
-```
|
|
| 38 |
-mvn clean verify site -DperformRelease scm-publish:publish-scm
|
|
| 39 |
-```
|
|
| \ No newline at end of file | ||
| 3 |
+See [Ultreiaio/scripts](https://gitlab.com/ultreiaio/scripts/blob/master/README.md).
|
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 |
|
| 29 | 29 |
<groupId>fr.ird.t3</groupId>
|
| 30 | 30 |
<artifactId>ird-t3</artifactId>
|
| 31 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 31 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 32 | 32 |
<packaging>pom</packaging>
|
| 33 | 33 |
|
| 34 | 34 |
<name>T3 :: Pom</name>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-actions</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-domain</artifactId>
|
| ... | ... | @@ -35,30 +35,20 @@ import java.util.List; |
| 35 | 35 |
* @author Tony Chemit - dev@tchemit.fr
|
| 36 | 36 |
*/
|
| 37 | 37 |
@AutoService(TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion.class)
|
| 38 |
-public class T3MigrationCallbackV3_0 extends T3MigrationCallbackSupport {
|
|
| 38 |
+public class T3MigrationCallbackV2_1 extends T3MigrationCallbackSupport {
|
|
| 39 | 39 |
|
| 40 |
- public T3MigrationCallbackV3_0() {
|
|
| 41 |
- super(Versions.valueOf("3.0"));
|
|
| 40 |
+ public T3MigrationCallbackV2_1() {
|
|
| 41 |
+ super(Versions.valueOf("2.1"));
|
|
| 42 | 42 |
}
|
| 43 | 43 |
|
| 44 | 44 |
@Override
|
| 45 | 45 |
protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List<String> queries, boolean showSql, boolean showProgression) throws TopiaException {
|
| 46 |
- |
|
| 47 | 46 |
addScript("01", "add-Harbour-country-link", queries);
|
| 48 | 47 |
addScript("02", "remove-LocalMarketPackaging-status", queries);
|
| 49 | 48 |
addScript("03", "fix-LocalMarketPackagingType-ids", queries);
|
| 50 | 49 |
addScript("04", "rename-SampleWell-table", queries);
|
| 51 | 50 |
addScript("05", "rename-SampleSpecies-fields", queries);
|
| 52 | 51 |
addScript("06", "referential-i18n", queries);
|
| 53 |
-// addScript("07", "", queries);
|
|
| 54 |
-// addScript("08", "", queries);
|
|
| 55 |
-// addScript("09", "", queries);
|
|
| 56 |
-// addScript("10", "", queries);
|
|
| 57 |
-// addScript("11", "", queries);
|
|
| 58 |
-// addScript("12", "", queries);
|
|
| 59 |
-// addScript("13", "", queries);
|
|
| 60 |
-// addScript("14", "", queries);
|
|
| 61 |
- |
|
| 62 | 52 |
}
|
| 63 | 53 |
|
| 64 | 54 |
}
|
| ... | ... | @@ -22,7 +22,7 @@ |
| 22 | 22 |
model.tagValue.notGenerateToString=true
|
| 23 | 23 |
model.tagValue.generateOperatorForDAOHelper=true
|
| 24 | 24 |
model.tagValue.constantPrefix=PROPERTY_
|
| 25 |
-model.tagValue.version=3.0
|
|
| 25 |
+model.tagValue.version=2.1
|
|
| 26 | 26 |
model.tagValue.indexForeignKeys=true
|
| 27 | 27 |
|
| 28 | 28 |
fr.ird.t3.entities.data.Trip.attribute.activity.stereotype=ordered
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-input-avdthv33</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-input-avdthv35</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-input-avdthv36</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.t3</groupId>
|
| 29 | 29 |
<artifactId>ird-t3</artifactId>
|
| 30 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 30 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>t3-installer</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-msaccess-importer</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-output-balbayav32</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-test</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>ird-t3</artifactId>
|
| 27 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-web</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.t3</groupId>
|
| 28 | 28 |
<artifactId>ird-t3</artifactId>
|
| 29 |
- <version>2.0.2-SNAPSHOT</version>
|
|
| 29 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>t3</artifactId>
|