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

Commits:

5 changed files:

Changes:

  • 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 {
    262 262 
                     box.setBean(this);
    263 263 
                     box.setProperty("safeEntity");
    264 264 
                     box.setShowReset(true);
    265 
    -                box.addPropertyChangeListener("selectedItem", evt -> updateCanApply());
    265 
    +                box.addPropertyChangeListener(BeanComboBox.PROPERTY_SELECTED_ITEM, evt -> updateCanApply());
    266 266 
                     safeRefsPanel.add(box, key);
    267 267 
                     box.init(decorator, data);
    268 268

  • bin/stage_create.sh
    ... ... @@ -18,29 +18,33 @@ git checkout -B ${DEVELOP}
    18 18
    19 19 
     echo "Start release: $VERSION ($LOG_DIR/release-start.log)"
    20 20 
     mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log
    21 
    -
    21 
    +if [ ! "$?" == "0" ]; then
    22 
    +   echo "Error"
    23 
    +   exit 1
    24 
    +fi
    22 25 
     echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)"
    23 26 
     mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log
    24 
    -
    27 
    +if [ ! "$?" == "0" ]; then
    28 
    +   echo "Error"
    29 
    +   exit 1
    30 
    +fi
    25 31 
     echo "Get staging id..."
    26 
    -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2)
    32 
    +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
    27 33
    28 34 
     echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)"
    29 
    -mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
    30 
    -
    31 
    -echo "Update changelog ($LOG_DIR/release-changelog.log)"
    32 
    -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
    33 
    -
    34 
    -git commit -m "Update changelog for version $VERSION" CHANGELOG.md
    35 
    -
    36 
    -git stash
    37 
    -git checkout ${PROJECT}-${VERSION}
    38 
    -
    39 
    -echo "Generate site: ($LOG_DIR/release-site.log)"
    40 
    -mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log
    41 
    -
    42 
    -echo "Deploy demo: ($LOG_DIR/release-demo.log)"
    43 
    -mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log
    44 
    -
    45 
    -git stash
    46 
    -git checkout ${DEVELOP}
    \ No newline at end of file
    35 
    +mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
    36 
    +if [ ! "$?" == "0" ]; then
    37 
    +   echo "Error"
    38 
    +   exit 1
    39 
    +fi
    40 
    +
    41 
    +echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)"
    42 
    +rm -rf target/gitlab_cache
    43 
    +
    44 
    +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
    45 
    +if [ ! "$?" == "0" ]; then
    46 
    +   echo "Error"
    47 
    +   exit 1
    48 
    +fi
    49 
    +
    50 
    +git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md

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

  • bin/stage_release.sh
    ... ... @@ -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)
    14 
    +STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}')
    15 15
    16 16 
     echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)"
    17 17 
     mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log

  • pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>io.ultreia.maven</groupId>
    29 29 
         <artifactId>pom</artifactId>
    30 
    -    <version>2</version>
    30 
    +    <version>4</version>
    31 31 
       </parent>
    32 32
    33 33 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -169,7 +169,7 @@
    169 169
    170 170 
         <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
    171 171 
         <processorPluginVersion>1.3</processorPluginVersion>
    172 
    -    <jaxxVersion>2.41</jaxxVersion>
    172 
    +    <jaxxVersion>2.42</jaxxVersion>
    173 173 
         <nuitonI18nVersion>3.6.3</nuitonI18nVersion>
    174 174 
         <nuitonConfigVersion>3.2</nuitonConfigVersion>
    175 175 
         <topiaVersion>3.2.1</topiaVersion>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.