[Git][ultreia.io/ird-observe][develop-5.x] 2 commits: update scripts

10 Mar 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe


Commits:
69dbca6f by Tony CHEMIT at 2017-03-10T14:03:37+01:00
update scripts

- - - - -
737de3ce by Tony CHEMIT at 2017-03-10T14:41:26+01:00
[Synchro referentiel] Impossible d'appliquer un changement de référentiel (See #743)

- - - - -


5 changed files:

- application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
- bin/stage_create.sh
- bin/stage_drop.sh
- bin/stage_release.sh
- pom.xml


Changes:

=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
=====================================

--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
@@ -262,7 +262,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler {
                 box.setBean(this);
                 box.setProperty("safeEntity");
                 box.setShowReset(true);
-                box.addPropertyChangeListener("selectedItem", evt -> updateCanApply());
+                box.addPropertyChangeListener(BeanComboBox.PROPERTY_SELECTED_ITEM, evt -> updateCanApply());
                 safeRefsPanel.add(box, key);
                 box.init(decorator, data);
 


=====================================
bin/stage_create.sh
=====================================
--- a/bin/stage_create.sh
+++ b/bin/stage_create.sh
@@ -18,29 +18,33 @@ git checkout -B ${DEVELOP}
 
 echo "Start release: $VERSION ($LOG_DIR/release-start.log)"
 mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log
-
+if [ ! "$?" == "0" ]; then
+   echo "Error"
+   exit 1
+fi
 echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)"
 mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log
-
+if [ ! "$?" == "0" ]; then
+   echo "Error"
+   exit 1
+fi
 echo "Get staging id..."
-STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2)
+STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
 
 echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)"
-mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
-
-echo "Update changelog ($LOG_DIR/release-changelog.log)"
-mvn -N  -Pupdate-staging-changelog -Dgitlab.milestone=${VERSION} -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} --log-file ${LOG_DIR}/release-changelog.log
-
-git commit -m "Update changelog for version $VERSION" CHANGELOG.md
-
-git stash
-git checkout ${PROJECT}-${VERSION}
-
-echo "Generate site: ($LOG_DIR/release-site.log)"
-mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log
-
-echo "Deploy demo: ($LOG_DIR/release-demo.log)"
-mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log
-
-git stash
-git checkout ${DEVELOP}
\ No newline at end of file
+mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
+if [ ! "$?" == "0" ]; then
+   echo "Error"
+   exit 1
+fi
+
+echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)"
+rm -rf target/gitlab_cache
+
+mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log
+if [ ! "$?" == "0" ]; then
+   echo "Error"
+   exit 1
+fi
+
+git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md


=====================================
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)
+STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
 
 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
@@ -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)
+STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
 
 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


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2</version>
+    <version>4</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -169,7 +169,7 @@
 
     <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
     <processorPluginVersion>1.3</processorPluginVersion>
-    <jaxxVersion>2.41</jaxxVersion>
+    <jaxxVersion>2.42</jaxxVersion>
     <nuitonI18nVersion>3.6.3</nuitonI18nVersion>
     <nuitonConfigVersion>3.2</nuitonConfigVersion>
     <topiaVersion>3.2.1</topiaVersion>



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

    

Tony CHEMIT

tags

participants (1)