Commit dfd82153 authored by PECQUOT's avatar PECQUOT
Browse files

Merge branch 'release/1.3.2-alpha3'

parents 063e9642 bfb63ac0
......@@ -3,7 +3,7 @@
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
<packaging>pom</packaging>
<name>SUMARiS</name>
<description>SUMARiS :: Maven parent</description>
......
......@@ -35,9 +35,7 @@ echo "**********************************"
echo "* Preparing release..."
echo "**********************************"
mvn -B gitflow:release-start -DreleaseVersion="$version"
if [[ $? -ne 0 ]]; then
exit 1
fi
[[ $? -ne 0 ]] && exit 1
echo "Prepare release [OK]"
......@@ -45,10 +43,7 @@ echo "**********************************"
echo "* Performing release..."
echo "**********************************"
mvn clean deploy -DperformRelease -DskipTests -Denv=hsqldb
if [[ $? -ne 0 ]]; then
exit 1
fi
[[ $? -ne 0 ]] && exit 1
echo "**********************************"
echo "* Generating DB..."
......@@ -59,16 +54,11 @@ version=`grep -m1 -P "\<version>[0-9A−Z.]+(-\w*)?</version>" pom.xml | grep -o
# Generate the DB (run InitTest class)
mvn -Prun,hsqldb -DskipTests --quiet
if [[ $? -ne 0 ]]; then
exit 1
fi
[[ $? -ne 0 ]] && exit 1
# Create ZIP
cd target
zip -q -r "sumaris-db-$version.zip" db
if [[ $? -ne 0 ]]; then
exit 1
fi
[[ $? -ne 0 ]] && exit 1
echo "Generate DB [OK]"
......@@ -77,9 +67,7 @@ echo "**********************************"
echo "* Uploading artifacts to Github..."
echo "**********************************"
./github-gitflow.sh "$task" "$version"
if [[ $? -ne 0 ]]; then
exit 1
fi
[[ $? -ne 0 ]] && exit 1
echo "Upload artifacts to github [OK]"
......@@ -89,9 +77,7 @@ echo "**********************************"
git commit -a -m "Release $version\n$release_description"
git status
mvn gitflow:release-finish -DfetchRemote=false
if [[ $? -ne 0 ]]; then
exit 1
fi
[[ $? -ne 0 ]] && exit 1
# Pause (if propagation is need between hosted git server and github)
#sleep 10s
......@@ -103,9 +89,7 @@ echo "----------------------------------"
echo "Rebuild new SNAPSHOT version..."
mvn clean install -DskipTests --quiet
if [[ $? -ne 0 ]]; then
exit 1
fi
[[ $? -ne 0 ]] && exit 1
echo "Rebuild new SNAPSHOT version [OK]"
......@@ -5,7 +5,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
</parent>
<artifactId>sumaris-core-extraction</artifactId>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -3,7 +3,7 @@
<parent>
<artifactId>sumaris-pod</artifactId>
<groupId>net.sumaris</groupId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
</parent>
<artifactId>sumaris-core-shared</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
</parent>
<artifactId>sumaris-core</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
</parent>
<artifactId>sumaris-server</artifactId>
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>net.sumaris</groupId>
<artifactId>sumaris-pod</artifactId>
<version>1.3.2-alpha2</version>
<version>1.3.2-alpha3</version>
</parent>
<artifactId>sumaris-test-shared</artifactId>
......
......@@ -45,12 +45,14 @@
<PROGRAM_PROPERTY ID="44" STATUS_FK="1" PROGRAM_FK="30" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.metiers.enable" NAME="true"/>
<PROGRAM_PROPERTY ID="45" STATUS_FK="1" PROGRAM_FK="30" CREATION_DATE="2019-02-11" LABEL="sumaris.landing.observers.enable" NAME="false"/>
<PROGRAM_PROPERTY ID="46" STATUS_FK="1" PROGRAM_FK="30" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.location.level.ids" NAME="2"/>
<PROGRAM_PROPERTY ID="47" STATUS_FK="1" PROGRAM_FK="30" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.createVessel.enable" NAME="true"/>
<PROGRAM_PROPERTY ID="50" STATUS_FK="1" PROGRAM_FK="31" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.aggregatedLandings.enable" NAME="true"/>
<PROGRAM_PROPERTY ID="51" STATUS_FK="1" PROGRAM_FK="31" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.aggregatedLandings.program" NAME="OBSDEB"/>
<PROGRAM_PROPERTY ID="52" STATUS_FK="1" PROGRAM_FK="31" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.aggregatedLandings.startDay" NAME="1"/>
<PROGRAM_PROPERTY ID="53" STATUS_FK="1" PROGRAM_FK="31" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.aggregatedLandings.dayCount" NAME="7"/>
<PROGRAM_PROPERTY ID="54" STATUS_FK="1" PROGRAM_FK="31" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.location.level.ids" NAME="2"/>
<PROGRAM_PROPERTY ID="55" STATUS_FK="1" PROGRAM_FK="31" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.createVessel.enable" NAME="true"/>
<!-- strategies -->
<STRATEGY ID="20" PROGRAM_FK="30" LABEL="OBSDEB" NAME="Stratégie adaptée à la saisie sous Obsdeb" STATUS_FK="1" CREATION_DATE="2018-03-08" UPDATE_DATE="2018-03-08"/>
......
......@@ -64,5 +64,8 @@
<SOFTWARE_PROPERTY ID="77" STATUS_FK="1" SOFTWARE_FK="4" CREATION_DATE="2019-02-11" LABEL="sumaris.observedLocation.name" NAME="Observations"/>
<SOFTWARE_PROPERTY ID="78" STATUS_FK="1" SOFTWARE_FK="4" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.enable" NAME="true"/>
<SOFTWARE_PROPERTY ID="79" STATUS_FK="1" SOFTWARE_FK="4" CREATION_DATE="2019-02-11" LABEL="sumaris.vessel.status.default" NAME="2"/>
<SOFTWARE_PROPERTY ID="80" STATUS_FK="1" SOFTWARE_FK="4" CREATION_DATE="2019-02-11" LABEL="sumaris.locationLevel.country" NAME="21"/>
<SOFTWARE_PROPERTY ID="81" STATUS_FK="1" SOFTWARE_FK="4" CREATION_DATE="2019-02-11" LABEL="sumaris.locationLevel.port" NAME="6"/>
<SOFTWARE_PROPERTY ID="82" STATUS_FK="1" SOFTWARE_FK="4" CREATION_DATE="2019-02-11" LABEL="sumaris.locationLevel.sea_area" NAME="7"/>
</dataset>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment