Merge pull request #4 from scalecube/develop

Prepare new release

.travis.yml

@@ -3,7 +3,6 @@ addons:
     packages:
     - libxml-xpath-perl
 sudo: required
-
 language: java
 jdk: openjdk8
 before_install:
@@ -12,11 +11,12 @@ before_install:
 after_success: "./src/main/scripts/ci/after-success.sh"
 deploy:
 - provider: script
-  script: mvn -P release deploy -DskipTests=true -B -V -s travis-settings.xml
+  script:
+  - "./src/main/scripts/cd/deploy.sh"
   on:
     branch: develop
 - provider: script
   script:
-  - "./src/main/scripts/cd/deploy.sh"
+  - "./src/main/scripts/cd/release.sh"
   on:
-    branch: master
+    branch: master

src/main/scripts/cd/deploy.sh

@@ -1,18 +1,6 @@
 #!/bin/sh
 
+echo       Running $0
+echo *-*-*-*-*-*-*-*-*-*-*-*-*-*
 
-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 && curl -u "$GITHUBUSER:$GITHUBTOKEN" -d '{"title": "Prepare new release","head": "develop","base": "master"}' https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls?access_token=$GITTOKEN
-
-}
-
-mvn -P release release:prepare release:perform -DautoVersionSubmodules=true -DscmCommentPrefix="$TRAVIS_COMMIT_MESSAGE [skip ci] " -DskipTests=true -B -V -s travis-settings.xml
-
-
-mvn clean
-commit_to_develop
+mvn -P release deploy -DskipTests=true -B -V -s travis-settings.xml

src/main/scripts/cd/release.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+
+echo       Running $0
+echo *-*-*-*-*-*-*-*-*-*-*-*-*-*
+
+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
+}
+
+mvn -P release release:prepare release:perform -DautoVersionSubmodules=true -DscmCommentPrefix="$TRAVIS_COMMIT_MESSAGE [skip ci] " -DskipTests=true -B -V -s travis-settings.xml
+
+mvn clean
+commit_to_develop

src/main/scripts/ci/after-success.sh

@@ -1,8 +1,12 @@
 #!/bin/bash
 
+
+echo       Running $0
+echo *-*-*-*-*-*-*-*-*-*-*-*-*-*
+
 if [ -z "$CODACY_PROJECT_TOKEN" ]; then
-	echo [WARNING] Please go to https://app.codacy.com/app/$TRAVIS_REPO_SLUG/settings/coverage and add CODACY_PROJECT_TOKEN to travis settings
+    echo [WARNING] Please go to https://app.codacy.com/app/$TRAVIS_REPO_SLUG/settings/coverage and add CODACY_PROJECT_TOKEN to travis settings
 else 
-	find -name jacoco.xml -exec java -jar ~/codacy-coverage-reporter-assembly.jar report -l Java -r {} \;
-	java -jar ~/codacy-coverage-reporter-assembly.jar final
-fi;
+    find -name jacoco.xml | xargs -i java -jar ~/codacy-coverage-reporter-assembly.jar report -l Java --partial -r {}
+    java -jar ~/codacy-coverage-reporter-assembly.jar final
+fi;

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

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+
+echo       Running $0
+echo *-*-*-*-*-*-*-*-*-*-*-*-*-*
+
 # get latest version of codacy reporter from sonatype
 latest=$(curl "https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/maven-metadata.xml" | xpath -e "/metadata/versioning/release/text()")
 

travis-settings.xml

@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <settings
   xsi:schemaLocation='http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd'
-  xmlns='http://maven.apache.org/SETTINGS/1.0.0'
-  xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  xmlns='http://maven.apache.org/SETTINGS/1.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
   <profiles>
+    <profile>
+      <id>skipstyle</id>
+      <properties>
+        <checkstyle.skip>true</checkstyle.skip>
+      </properties>
+    </profile>
+    <profile>
+      <id>skippmd</id>
+      <properties>
+        <pmd.skip>true</pmd.skip>
+      </properties>
+    </profile>
     <profile>
       <id>bintray</id>
       <repositories>
@@ -19,25 +30,20 @@
     </profile>
     <profile>
       <id>ossrh</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
       <properties>
-        <!-- <gpg.executable>gpg</gpg.executable> -->
-        <!-- <gpg.keyname>${env.GPG_KEY_NAME}</gpg.keyname> -->
         <gpg.passphrase>${env.GPG_KEY}</gpg.passphrase>
       </properties>
     </profile>
   </profiles>
-  <activeProfiles>
-    <activeProfile>bintray</activeProfile>
-  </activeProfiles>
-
   <servers>
     <server>
       <id>ossrh</id>
       <username>${env.SONATYPE_USERNAME}</username>
       <password>${env.SONATYPE_PASSWORD}</password>
     </server>
   </servers>
+  <activeProfiles>
+    <activeProfile>bintray</activeProfile>
+    <activeProfile>ossrh</activeProfile>
+  </activeProfiles>
 </settings>