Merge pull request #72 from scalecube/develop

Release

Author: artem-v

.gitignore

@@ -15,3 +15,6 @@
 
 # IntelliJ IDEA project files and directories
 *.iml
+
+**/pom.xml.releaseBackup
+/release.properties

.travis.yml

@@ -8,6 +8,7 @@ jdk: openjdk8
 before_install:
 - "./src/main/scripts/ci/before-install.sh"
 - "./src/main/scripts/cd/before-deploy.sh"
+script: "mvn verify -B"
 after_success: "./src/main/scripts/ci/after-success.sh"
 deploy:
 - provider: script
@@ -20,3 +21,8 @@ deploy:
   - "./src/main/scripts/cd/release.sh"
   on:
     branch: master
+- provider: script
+  script:
+  - "./src/main/scripts/cd/release.sh"
+  on:
+    tags: true

pom.xml

@@ -124,6 +124,7 @@
               <configuration>
                 <overWriteReleases>false</overWriteReleases>
                 <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                <silent>true</silent>
               </configuration>
             </execution>
           </executions>
@@ -282,6 +283,7 @@
               </goals>
               <configuration>
                 <additionalparam>-Xdoclint:none</additionalparam>
+                <quiet>true</quiet>
               </configuration>
             </execution>
           </executions>

src/main/scripts/cd/before-deploy.sh

@@ -6,52 +6,52 @@ BEFORE_DEPLOY_EXEC_FILES=$(find $DIRNAME -name 'before-deploy-*.sh')
 echo       Running $0
 echo *-*-*-*-*-*-*-*-*-*-*-*-*-*
 
-function decryptsecrets {
-	echo   decrypting secrets
-	echo *-*-*-*-*-*-*-*-*-*-*-*
-	mkdir -p ~/tmp
-	openssl aes-256-cbc -K $encrypted_SOME_key -iv $encrypted_SOME_iv -in $TRAVIS_BUILD_DIR/src/main/scripts/cd/secrets.tar.enc -out ~/tmp/secrets.tar -d
-	md5sum ~/tmp/secrets.tar
-	tar -xvf ~/tmp/secrets.tar -C  ~/.ssh
-	shred -z -u ~/tmp/secrets.tar    
+decryptsecrets() {
+    echo   decrypting secrets
+    echo *-*-*-*-*-*-*-*-*-*-*-*
+    mkdir -p ~/tmp
+    openssl aes-256-cbc -K $encrypted_SOME_key -iv $encrypted_SOME_iv -in $TRAVIS_BUILD_DIR/src/main/scripts/cd/secrets.tar.enc -out ~/tmp/secrets.tar -d
+    md5sum ~/tmp/secrets.tar
+    tar -xvf ~/tmp/secrets.tar -C  ~/.ssh
+    shred -z -u ~/tmp/secrets.tar    
 }
 
-function importpgp {
-	echo   importing pgp secret
-	echo *-*-*-*-*-*-*-*-*-*-*-*
-	eval $(gpg-agent --daemon --batch)
+importpgp() {
+    echo   importing pgp secret
+    echo *-*-*-*-*-*-*-*-*-*-*-*
+    eval $(gpg-agent --daemon --batch)
     gpg --batch --passphrase $GPG_PASSPHRASE --import  ~/.ssh/codesigning.asc
     shred -z -u ~/.ssh/codesigning.asc
 }
 
-function setupssh {
-	echo   importing ssh secret
-	echo *-*-*-*-*-*-*-*-*-*-*-*
+setupssh() {
+    echo   importing ssh secret
+    echo *-*-*-*-*-*-*-*-*-*-*-*
     chmod 400 ~/.ssh/id_rsa
     touch ~/.ssh/config
 
     echo "Host github.com" >> $HOME/.ssh/config
     echo "    IdentityFile $HOME/.ssh/id_rsa" >> $HOME/.ssh/config
     echo "    StrictHostKeyChecking no" >> $HOME/.ssh/config
-	
-	eval "$(ssh-agent -s)"
-	ssh-add ~/.ssh/id_rsa
-	ssh -T [email protected] | true
+    
+    eval "$(ssh-agent -s)"
+    ssh-add ~/.ssh/id_rsa
+    ssh -T [email protected] | true
 }
-	
-function setupgit {
-	echo   setting git up
-	echo *-*-*-*-*-*-*-*-*-*-*-*
+    
+setupgit() {
+    echo   setting git up
+    echo *-*-*-*-*-*-*-*-*-*-*-*
     git remote set-url origin [email protected]:$TRAVIS_REPO_SLUG.git
-	git config --global user.email "[email protected]"
+    git config --global user.email "[email protected]"
     git config --global user.name "io-scalecube-ci"
-	git checkout -B $TRAVIS_BRANCH | true
+    git checkout -B $TRAVIS_BRANCH | true
 }
 
-function deployment {
-  if [ "$TRAVIS_PULL_REQUEST" == 'false' ] &&  [ "$TRAVIS_BRANCH" = 'master' ]  || [ "$TRAVIS_BRANCH" = 'develop' ]; then
-	echo     deployment
-	echo *-*-*-*-*-*-*-*-*-*-*-*
+deployment() {
+  if [ "$TRAVIS_PULL_REQUEST" = 'false' -a "$TRAVIS_BRANCH" = 'master' -o "$TRAVIS_BRANCH" = 'develop' -o -n "$TRAVIS_TAG" ]; then
+    echo     deployment
+    echo *-*-*-*-*-*-*-*-*-*-*-*
     decryptsecrets
     importpgp
     setupssh

src/main/scripts/cd/release.sh

@@ -6,19 +6,55 @@ RELEASE_EXEC_FILES=$(find $DIRNAME -name 'release-*.sh')
 echo       Running $0
 echo *-*-*-*-*-*-*-*-*-*-*-*-*-*
 
+. $DIRNAME/before-deploy.sh
+
 commit_to_develop() { 
- git fetch
- git branch -r
- git checkout -B develop 
- git rebase master
- git commit --amend -m "++++ Prepare for next development iteration build: $TRAVIS_BUILD_NUMBER ++++"
- git push origin develop
+  git fetch
+  git branch -r
+  git checkout -B develop 
+  git rebase $TRAVIS_BRANCH
+  git commit --amend -m "++++ Prepare for next development iteration build: $TRAVIS_BUILD_NUMBER ++++"
+  git push origin develop
+}
+
+check_next_version() {
+  export NEXT_VERSION=$(echo $TRAVIS_COMMIT_MESSAGE | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT')
+  if [ -n "$NEXT_VERSION" ] ; then
+    export MVN_NEXT_VERSION=-DdevelopmentVersion=$NEXT_VERSION
+  fi
 }
 
-mvn -P release -Darguments=-DskipTests release:prepare release:perform -DautoVersionSubmodules=true -DscmCommentPrefix="$TRAVIS_COMMIT_MESSAGE [skip ci] " -B -V -s travis-settings.xml
+check_tag_for_rc() {
+  export VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+  if [ -n "$TRAVIS_TAG" ] ; then
+    RC_VER=$(echo $TRAVIS_TAG | grep -E -o 'RC-?[0-9]+')
+    RC_PREPARE=$(echo $TRAVIS_TAG | grep -o -i 'prepare')
+    if [ -n "$RC_VER" -a -n "$RC_PREPARE" ] ; then
+      export NEW_RC_VERSION=$(echo $VERSION | sed  "s/SNAPSHOT/$RC_VER/g")
+      echo Release candidate: $NEW_RC_VERSION
+      echo *-*-*-*-*-*-*-*-*-*-*-*
+      decryptsecrets
+      importpgp
+      setupssh
+      setupgit
+      export MVN_RELEASE_VERSION=-DreleaseVersion=$NEW_RC_VERSION
+      if [ -n "$MVN_NEXT_VERSION" ] ; then
+        export MVN_NEXT_VERSION=-DdevelopmentVersion=$VERSION;
+      fi
+    fi
+  fi
+}
+
+check_next_version
+check_tag_for_rc
+
+mvn -P release -Darguments=-DskipTests release:prepare release:perform $MVN_RELEASE_VERSION $MVN_NEXT_VERSION -DautoVersionSubmodules=true -DscmCommentPrefix="$TRAVIS_COMMIT_MESSAGE [skip ci] " -B -V -s travis-settings.xml || exit 126
+
+mvn -B -q clean 
 
-mvn clean
-commit_to_develop
+if [ -z "$NEW_RC_VERSION" ]; then 
+  commit_to_develop
+fi
 
 # extends release.sh
 for script_file in $RELEASE_EXEC_FILES; do

src/main/scripts/ci/before-install.sh

@@ -14,7 +14,7 @@ latest=$(curl "https://oss.sonatype.org/service/local/repositories/releases/cont
 
 echo Downloading latest version $latest of codacy reporter from sonatype 
 # download latest assembly jar 
-mvn dependency:get dependency:copy \
+mvn -B -q dependency:get dependency:copy \
    -DoutputDirectory=$HOME \
    -DoutputAbsoluteArtifactFilename=true \
    -Dmdep.stripVersion=true \