Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe
Commits:
-
41d3e28f
by Tony CHEMIT at 2017-03-10T16:06:44+01:00
-
43a830c6
by Tony CHEMIT at 2017-03-10T16:14:02+01:00
-
3bbd1da0
by Tony CHEMIT at 2017-03-10T16:14:03+01:00
-
b3a14be8
by Tony CHEMIT at 2017-03-10T16:14:04+01:00
-
beff6db1
by Tony CHEMIT at 2017-03-10T16:26:09+01:00
-
fb124529
by Tony CHEMIT at 2017-03-10T16:46:07+01:00
-
c9db738c
by Tony CHEMIT at 2017-03-10T16:46:50+01:00
-
f3a42991
by Tony CHEMIT at 2017-03-10T16:47:36+01:00
-
1ab6d696
by Tony CHEMIT at 2017-03-10T16:55:02+01:00
5 changed files:
- bin/release_create.sh
- bin/stage_create.sh
- bin/stage_drop.sh
- bin/stage_release.sh
- services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
Changes:
| ... | ... | @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then |
| 29 | 29 |
exit 1
|
| 30 | 30 |
fi
|
| 31 | 31 |
echo "Get staging id..."
|
| 32 |
-STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
|
|
| 32 |
+STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2)
|
|
| 33 | 33 |
|
| 34 | 34 |
echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)"
|
| 35 | 35 |
mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
|
| ... | ... | @@ -39,4 +39,4 @@ if [ ! "$?" == "0" ]; then |
| 39 | 39 |
fi
|
| 40 | 40 |
|
| 41 | 41 |
echo "Release stage: $STAGE_ID ($LOG_DIR/stage-release.log)"
|
| 42 |
-mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
|
|
| 42 |
+mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
|
| ... | ... | @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then |
| 29 | 29 |
exit 1
|
| 30 | 30 |
fi
|
| 31 | 31 |
echo "Get staging id..."
|
| 32 |
-STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
|
|
| 32 |
+STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2)
|
|
| 33 | 33 |
|
| 34 | 34 |
echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)"
|
| 35 | 35 |
mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
|
| ... | ... | @@ -11,7 +11,7 @@ rm -rf ${LOG_DIR} |
| 11 | 11 |
mkdir -p ${LOG_DIR}
|
| 12 | 12 |
|
| 13 | 13 |
echo "Get staging id..."
|
| 14 |
-STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
|
|
| 14 |
+STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 )
|
|
| 15 | 15 |
|
| 16 | 16 |
echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)"
|
| 17 | 17 |
mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
|
| 1 | 1 |
#!/usr/bin/env sh
|
| 2 | 2 |
|
| 3 | 3 |
PROJECT=ird-observe
|
| 4 |
-MASTER=master-5.x
|
|
| 5 |
-DEVELOP=develop-5.x
|
|
| 6 | 4 |
STAGE=frirdobserve
|
| 7 | 5 |
|
| 8 | 6 |
LOG_DIR=/tmp/${PROJECT}-stage
|
| ... | ... | @@ -11,7 +9,7 @@ rm -rf ${LOG_DIR} |
| 11 | 9 |
mkdir -p ${LOG_DIR}
|
| 12 | 10 |
|
| 13 | 11 |
echo "Get staging id..."
|
| 14 |
-STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
|
|
| 12 |
+STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2)
|
|
| 15 | 13 |
|
| 16 | 14 |
echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)"
|
| 17 |
-mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
|
|
| 15 |
+mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
|
| ... | ... | @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy |
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 | 25 |
import fr.ird.observe.ObserveEntityEnum;
|
| 26 |
-import fr.ird.observe.entities.referentiel.Gear;
|
|
| 27 |
-import fr.ird.observe.entities.referentiel.GearCaracteristic;
|
|
| 28 | 26 |
import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
|
| 27 |
+import fr.ird.observe.services.dto.referential.GearCaracteristicDto;
|
|
| 28 |
+import fr.ird.observe.services.dto.referential.GearDto;
|
|
| 29 | 29 |
import fr.ird.observe.services.dto.referential.OceanDto;
|
| 30 | 30 |
import fr.ird.observe.services.dto.referential.ReferentialDto;
|
| 31 | 31 |
import fr.ird.observe.services.dto.referential.ReferentialReference;
|
| ... | ... | @@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser |
| 161 | 161 |
// also remove ocean_species association
|
| 162 | 162 |
result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id));
|
| 163 | 163 |
}
|
| 164 |
- if (Gear.class.equals(request.getReferentialName())) {
|
|
| 164 |
+ if (GearDto.class.equals(request.getReferentialName())) {
|
|
| 165 | 165 |
|
| 166 | 166 |
// also remove gear_gearcaracteristic association
|
| 167 | 167 |
result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id));
|
| 168 | 168 |
}
|
| 169 |
- if (GearCaracteristic.class.equals(request.getReferentialName())) {
|
|
| 169 |
+ if (GearCaracteristicDto.class.equals(request.getReferentialName())) {
|
|
| 170 | 170 |
|
| 171 | 171 |
// also remove gear_gearcaracteristic association
|
| 172 | 172 |
result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id));
|