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

Commits:

28 changed files:

Changes:

  • application-swing-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-configuration</artifactId>
    

  • application-swing-decoration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-decoration</artifactId>
    

  • application-swing-validation/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-validation</artifactId>
    

  • application-swing-validators/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing-validators</artifactId>
    

  • application-swing/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-swing</artifactId>
    

  • application-web-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>application-web-configuration</artifactId>
    

  • application-web/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>application-web</artifactId>
    

  • bin/stage_create.sh
    ... ... @@ -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 | awk '/./{line=$0} END{print line}')
    
    33 33
     
    
    34 34
     echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)"
    
    35 35
     mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log
    

  • bin/stage_drop.sh
    1 1
     #!/usr/bin/env sh
    
    2 2
     
    
    3 3
     PROJECT=ird-observe
    
    4
    -MASTER=master
    
    5
    -DEVELOP=develop
    
    6 4
     STAGE=frirdobserve
    
    7 5
     
    
    8
    -LOG_DIR=/tmp/${PROJECT}-stage
    
    6
    +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1)
    
    7
    +VERSION=${VERSION/-SNAPSHOT/}
    
    8
    +LOG_DIR=/tmp/${PROJECT}-${VERSION}
    
    9 9
     echo "log dir: $LOG_DIR"
    
    10 10
     rm -rf ${LOG_DIR}
    
    11 11
     mkdir -p ${LOG_DIR}
    
    ... ... @@ -14,4 +14,4 @@ echo "Get staging id..."
    14 14
     STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2)
    
    15 15
     
    
    16 16
     echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)"
    
    17
    -mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log
    17
    +mvn -N nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-drop.log

  • bin/stage_release.sh
    1 1
     #!/usr/bin/env sh
    
    2 2
     
    
    3 3
     PROJECT=ird-observe
    
    4
    -MASTER=master
    
    5
    -DEVELOP=develop
    
    6 4
     STAGE=frirdobserve
    
    7 5
     
    
    8
    -LOG_DIR=/tmp/${PROJECT}-stage
    
    6
    +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1)
    
    7
    +VERSION=${VERSION/-SNAPSHOT/}
    
    8
    +LOG_DIR=/tmp/${PROJECT}-${VERSION}
    
    9 9
     echo "log dir: $LOG_DIR"
    
    10 10
     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 -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2)
    
    15 15
     
    
    16 16
     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
    17
    +mvn -N nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log

  • common/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>common</artifactId>
    

  • observe/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>observe</artifactId>
    

  • persistence/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>persistence</artifactId>
    

  • pom.xml
    ... ... @@ -31,7 +31,7 @@
    31 31
     
    
    32 32
       <groupId>fr.ird.observe</groupId>
    
    33 33
       <artifactId>pom</artifactId>
    
    34
    -  <version>6.0-RC-1-SNAPSHOT</version>
    
    34
    +  <version>6.0-RC-2-SNAPSHOT</version>
    
    35 35
       <packaging>pom</packaging>
    
    36 36
     
    
    37 37
       <name>ObServe</name>
    

  • services-binder/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-binder</artifactId>
    

  • services-configuration-rest/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-configuration-rest</artifactId>
    

  • services-configuration-topia/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-configuration-topia</artifactId>
    

  • services-configuration/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-configuration</artifactId>
    

  • services-rest/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-rest</artifactId>
    

  • services-runner/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-runner</artifactId>
    

  • services-topia/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services-topia</artifactId>
    

  • services-validation/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>services-validation</artifactId>
    

  • services-validators/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>services-validators</artifactId>
    

  • services/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27
       <parent>
    
    28 28
         <groupId>fr.ird.observe</groupId>
    
    29 29
         <artifactId>pom</artifactId>
    
    30
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    30
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    31 31
       </parent>
    
    32 32
     
    
    33 33
       <artifactId>services</artifactId>
    

  • test/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>test</artifactId>
    

  • toolbox-maven-plugin/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>toolbox-maven-plugin</artifactId>
    

  • topia-extension/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>topia-extension</artifactId>
    

  • topia-templates-extension/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>fr.ird.observe</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>6.0-RC-1-SNAPSHOT</version>
    
    29
    +    <version>6.0-RC-2-SNAPSHOT</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <artifactId>topia-templates-extension</artifactId>