[Git][ultreia.io/ird-observe][master-5.x] 9 commits: [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development

10 Mar 2017

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
[jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development
- - - - -
43a830c6 by Tony CHEMIT at 2017-03-10T16:14:02+01:00
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
- - - - -
3bbd1da0 by Tony CHEMIT at 2017-03-10T16:14:03+01:00
[jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x'
- - - - -
b3a14be8 by Tony CHEMIT at 2017-03-10T16:14:04+01:00
[jgitflow-maven-plugin]Updating develop poms back to pre merge state
- - - - -
beff6db1 by Tony CHEMIT at 2017-03-10T16:26:09+01:00
improve scripts

- - - - -
fb124529 by Tony CHEMIT at 2017-03-10T16:46:07+01:00
will replay version 5.3.3

- - - - -
c9db738c by Tony CHEMIT at 2017-03-10T16:46:50+01:00
fix some type (See #744)

- - - - -
f3a42991 by Tony CHEMIT at 2017-03-10T16:47:36+01:00
[jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions
- - - - -
1ab6d696 by Tony CHEMIT at 2017-03-10T16:55:02+01:00
[jgitflow-maven-plugin]merging 'release/5.3.3' into 'master-5.x'
- - - - -


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:

=====================================
bin/release_create.sh
=====================================

--- a/bin/release_create.sh
+++ b/bin/release_create.sh
@@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then
    exit 1
 fi
 echo "Get staging id..."
-STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
+STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2)
 
 echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)"
 mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
@@ -39,4 +39,4 @@ if [ ! "$?" == "0" ]; then
 fi
 
 echo "Release stage: $STAGE_ID ($LOG_DIR/stage-release.log)"
-mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
+mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log


=====================================
bin/stage_create.sh
=====================================
--- a/bin/stage_create.sh
+++ b/bin/stage_create.sh
@@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then
    exit 1
 fi
 echo "Get staging id..."
-STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
+STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2)
 
 echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)"
 mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log


=====================================
bin/stage_drop.sh
=====================================
--- a/bin/stage_drop.sh
+++ b/bin/stage_drop.sh
@@ -11,7 +11,7 @@ rm -rf ${LOG_DIR}
 mkdir -p ${LOG_DIR}
 
 echo "Get staging id..."
-STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
+STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 )
 
 echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)"
 mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log


=====================================
bin/stage_release.sh
=====================================
--- a/bin/stage_release.sh
+++ b/bin/stage_release.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env sh
 
 PROJECT=ird-observe
-MASTER=master-5.x
-DEVELOP=develop-5.x
 STAGE=frirdobserve
 
 LOG_DIR=/tmp/${PROJECT}-stage
@@ -11,7 +9,7 @@ rm -rf ${LOG_DIR}
 mkdir -p ${LOG_DIR}
 
 echo "Get staging id..."
-STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
+STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2)
 
 echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)"
-mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
+mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log


=====================================
services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
@@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy
  */
 
 import fr.ird.observe.ObserveEntityEnum;
-import fr.ird.observe.entities.referentiel.Gear;
-import fr.ird.observe.entities.referentiel.GearCaracteristic;
 import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
+import fr.ird.observe.services.dto.referential.GearCaracteristicDto;
+import fr.ird.observe.services.dto.referential.GearDto;
 import fr.ird.observe.services.dto.referential.OceanDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
@@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser
                     // also remove ocean_species association
                     result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id));
                 }
-                if (Gear.class.equals(request.getReferentialName())) {
+                if (GearDto.class.equals(request.getReferentialName())) {
 
                     // also remove gear_gearcaracteristic association
                     result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id));
                 }
-                if (GearCaracteristic.class.equals(request.getReferentialName())) {
+                if (GearCaracteristicDto.class.equals(request.getReferentialName())) {
 
                     // also remove gear_gearcaracteristic association
                     result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id));



View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/de3f1f57dcec9f9a32780f32b6...

    

Tony CHEMIT

tags

participants (1)