[Observe-commits] [Git][ultreia.io/ird-observe][develop] 3 commits: fix scripts

11 Mar 2017

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


Commits:
069012b8 by Tony CHEMIT at 2017-03-11T12:47:32+01:00
fix scripts

- - - - -
fd44c369 by Tony CHEMIT at 2017-03-11T12:48:55+01:00
fix scripts

- - - - -
5c4ba81e by Tony CHEMIT at 2017-03-11T12:49:31+01:00
[jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
- - - - -


28 changed files:

- application-swing-configuration/pom.xml
- application-swing-decoration/pom.xml
- application-swing-validation/pom.xml
- application-swing-validators/pom.xml
- application-swing/pom.xml
- application-web-configuration/pom.xml
- application-web/pom.xml
- bin/stage_create.sh
- bin/stage_drop.sh
- bin/stage_release.sh
- common/pom.xml
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- services-binder/pom.xml
- services-configuration-rest/pom.xml
- services-configuration-topia/pom.xml
- services-configuration/pom.xml
- services-rest/pom.xml
- services-runner/pom.xml
- services-topia/pom.xml
- services-validation/pom.xml
- services-validators/pom.xml
- services/pom.xml
- test/pom.xml
- toolbox-maven-plugin/pom.xml
- topia-extension/pom.xml
- topia-templates-extension/pom.xml


Changes:

=====================================
application-swing-configuration/pom.xml
=====================================

--- a/application-swing-configuration/pom.xml
+++ b/application-swing-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-configuration</artifactId>


=====================================
application-swing-decoration/pom.xml
=====================================
--- a/application-swing-decoration/pom.xml
+++ b/application-swing-decoration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-decoration</artifactId>


=====================================
application-swing-validation/pom.xml
=====================================
--- a/application-swing-validation/pom.xml
+++ b/application-swing-validation/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-validation</artifactId>


=====================================
application-swing-validators/pom.xml
=====================================
--- a/application-swing-validators/pom.xml
+++ b/application-swing-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-validators</artifactId>


=====================================
application-swing/pom.xml
=====================================
--- a/application-swing/pom.xml
+++ b/application-swing/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing</artifactId>


=====================================
application-web-configuration/pom.xml
=====================================
--- a/application-web-configuration/pom.xml
+++ b/application-web-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-web-configuration</artifactId>


=====================================
application-web/pom.xml
=====================================
--- a/application-web/pom.xml
+++ b/application-web/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-web</artifactId>


=====================================
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 | awk '/./{line=$0} END{print line}')
 
 echo "Closing stage: $STAGE_ID ($LOG_DIR/release-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
@@ -1,11 +1,11 @@
 #!/usr/bin/env sh
 
 PROJECT=ird-observe
-MASTER=master
-DEVELOP=develop
 STAGE=frirdobserve
 
-LOG_DIR=/tmp/${PROJECT}-stage
+VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1)
+VERSION=${VERSION/-SNAPSHOT/}
+LOG_DIR=/tmp/${PROJECT}-${VERSION}
 echo "log dir: $LOG_DIR"
 rm -rf ${LOG_DIR}
 mkdir -p ${LOG_DIR}
@@ -14,4 +14,4 @@ echo "Get staging id..."
 STAGE_ID=$(mvn 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
+mvn -N nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-drop.log


=====================================
bin/stage_release.sh
=====================================
--- a/bin/stage_release.sh
+++ b/bin/stage_release.sh
@@ -1,17 +1,17 @@
 #!/usr/bin/env sh
 
 PROJECT=ird-observe
-MASTER=master
-DEVELOP=develop
 STAGE=frirdobserve
 
-LOG_DIR=/tmp/${PROJECT}-stage
+VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1)
+VERSION=${VERSION/-SNAPSHOT/}
+LOG_DIR=/tmp/${PROJECT}-${VERSION}
 echo "log dir: $LOG_DIR"
 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 -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 -N nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log


=====================================
common/pom.xml
=====================================
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>common</artifactId>


=====================================
observe/pom.xml
=====================================
--- a/observe/pom.xml
+++ b/observe/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>observe</artifactId>


=====================================
persistence/pom.xml
=====================================
--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>persistence</artifactId>


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>fr.ird.observe</groupId>
   <artifactId>pom</artifactId>
-  <version>6.0-RC-1-SNAPSHOT</version>
+  <version>6.0-RC-2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ObServe</name>


=====================================
services-binder/pom.xml
=====================================
--- a/services-binder/pom.xml
+++ b/services-binder/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-binder</artifactId>


=====================================
services-configuration-rest/pom.xml
=====================================
--- a/services-configuration-rest/pom.xml
+++ b/services-configuration-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration-rest</artifactId>


=====================================
services-configuration-topia/pom.xml
=====================================
--- a/services-configuration-topia/pom.xml
+++ b/services-configuration-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration-topia</artifactId>


=====================================
services-configuration/pom.xml
=====================================
--- a/services-configuration/pom.xml
+++ b/services-configuration/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration</artifactId>


=====================================
services-rest/pom.xml
=====================================
--- a/services-rest/pom.xml
+++ b/services-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-rest</artifactId>


=====================================
services-runner/pom.xml
=====================================
--- a/services-runner/pom.xml
+++ b/services-runner/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-runner</artifactId>


=====================================
services-topia/pom.xml
=====================================
--- a/services-topia/pom.xml
+++ b/services-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-topia</artifactId>


=====================================
services-validation/pom.xml
=====================================
--- a/services-validation/pom.xml
+++ b/services-validation/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-validation</artifactId>


=====================================
services-validators/pom.xml
=====================================
--- a/services-validators/pom.xml
+++ b/services-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-validators</artifactId>


=====================================
services/pom.xml
=====================================
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>services</artifactId>


=====================================
test/pom.xml
=====================================
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>test</artifactId>


=====================================
toolbox-maven-plugin/pom.xml
=====================================
--- a/toolbox-maven-plugin/pom.xml
+++ b/toolbox-maven-plugin/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>toolbox-maven-plugin</artifactId>


=====================================
topia-extension/pom.xml
=====================================
--- a/topia-extension/pom.xml
+++ b/topia-extension/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>topia-extension</artifactId>


=====================================
topia-templates-extension/pom.xml
=====================================
--- a/topia-templates-extension/pom.xml
+++ b/topia-templates-extension/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>6.0-RC-1-SNAPSHOT</version>
+    <version>6.0-RC-2-SNAPSHOT</version>
   </parent>
 
   <artifactId>topia-templates-extension</artifactId>



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

    