Merge branch 'master' of github.com:netifi-proteus/proteus-java

Author: robertroeser

.travis.yml

@@ -7,7 +7,8 @@ matrix:
     before_install:
     - wget https://github.com/google/protobuf/releases/download/v3.6.0/protobuf-cpp-3.6.0.tar.gz
     - tar -xzvf protobuf-cpp-3.6.0.tar.gz
-    - pushd protobuf-3.6.0 && ./configure --disable-shared && make && sudo make install && popd
+    - pushd protobuf-3.6.0 && ./configure --disable-shared && make && sudo make install
+      && popd
     script: gradle/buildViaTravis-linux.sh
   - os: osx
     osx_image: xcode9.4
@@ -17,10 +18,10 @@ matrix:
     - LDFLAGS="/usr/local/lib/libprotobuf.a /usr/local/lib/libprotoc.a"
     before_install:
     - brew update
-    - EDITOR="sed -i '' 's/system \".\/configure\",/system \".\/configure\", \"--disable-shared\",/g'" brew edit protobuf
+    - EDITOR="sed -i '' 's/system \".\/configure\",/system \".\/configure\", \"--disable-shared\",/g'"
+      brew edit protobuf
     - brew install protobuf
     script: gradle/buildViaTravis.sh
-
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 notifications:
@@ -30,8 +31,9 @@ cache:
   - "$HOME/.gradle/caches/"
   - "$HOME/.gradle/wrapper/"
   - "$HOME/.m2"
-
 env:
   global:
   - secure: fG6x4/LuQuYDO6B3hw9YnxTKBepOS/zcSqDbyl3fJkYSDYuRS6yvI0CsQCQGTLtD3MKED+0o43rUiuPgNzz3qENKQukrFgmXQl24fwuUxtFhz4Lbb3OCMnWMAU3SgWZmpbUoOhCEGr0LzvYnb+MImiRU2v7gxr4Nc9hy8gRZjQQ4R7V+UlhOhZVjN5JfsEnKMpZejEkFlNADCdAhSDdHLVZN7lOsFjDC7XQ/GKLKGrRyIzREto9hm58QIsolghMyIEL2Jj1+ePTM/3wCYLUaRpdUjmHQawJi9vfwFO4g4yyKdUVXHpITQwQ7JE/SoJsje8ZUhOJZ3TvaBDlVjvXP41P3JNDbSesrBYcR0k70TYr7wliHKsdGurHvDQ/2Rxas/FITFGvLchYczbUPLJ7h0fJha+cpwsmmNvLmg0RIaaHa4RXPknWuetipbJFSqYtBN01iCtdSzHwwhZGZ6zV3kPBa0QWsDLWa/Ih2STDY6DVIA6YgaqaM6aN9U/UR8XeCnjPot+StaNuU2nSgGcwX5BIZRMuca9OF6FryG+t527njU86mp2QSj1HOTs/c31v9sSg2krCl7jChm3ZtpXyiEp+IdKaa5uZHLyx0fcm489375PLjhE6gRp/zvYf58uSvoMLOl1xwfOkNiPP8YXIDtVodzgGxCnxD49WE5B9CCbk=
   - secure: NvHtXfxiqBwkmj5l7Wr9EuBi9X0dMVL5CCeKFVqzIOmXCIdjwvknQ3rfZZ46fjwOQC/FuCcoM/8dHkBIkGzqIVo9Qx1+AGnq4AO7rr+iLYPvmz2wB8QKrD81bVAhtoKnuYe1wyu1XvURBgrietjoAgxrhgW3iReBVW4dj0YaTdRZXAD70M3i63tfV9GyB2pv6NfRyaq50IGkaJPdiyUPpDWcSmtnrkxQvUvIzNm50AGKEq3IuLp+wgVouAI81m1a+B0TuEfo4VnqOKlJx1dq9VT76GN4Ni+u2Rnnli2kFAXGtGfuPrZF1WPE2APJQ4W9H7YeGzya38JCUkkwD2Buxoe7CsW7ZEVnGbFE4xsuc+vejvDkeGF4LLABzuGwcDxG70MPHoXpyd1ayY3Iek1zPn4/3nFTO40YreeaHDT3MG3BSZx6WkMfmqfnFsKJeX9g7zzZLGmOuniwGLOIwFpePtyhn/wQvfPG+UalnSk+pXyGWuhnurcgDlk7ASlHj4TZnDiZvCCZy1xdzytttwf/i71Ts+6Db+TZfggnymeYFRo19UpLTr15Rdkwk0CNrJlvruKkGkR5G2els14M37PhHaeIdGol3ZqARs9+7o9gnRW2cPaQ26IRgNSGQwRhGaJcAyoLNZejc97OHEga9r6B8cIJK6NGD+4m8GA7Sh4O3EM=
+  - secure: crwXv5Q/iCtIIC81QWgWYNfuGJxSQQjVn83vvRoRMXmfSZ02NnQfDos+p1GxxbIXLUQ8NsaLc8cg0o2PQgsK/l0d7nDExix5Rt+AwzU4UOrUcZh46MgEeZDow4q6ySToOHaeKsaRnbTIpAwU28o9fnZ9ViaQ7s2uZWQZXYigGf0PN1ca9E8MJ6VEMvp34e2wJok6woaWG9ALCL2b5viofTv0zdHXWfGV4rdz9Rq0fThmFn4BlmHdcTwGt2ZLdWcEbzv0qNYNAiVvNJd4uWHOnjRceslAZ/JZxgIzSHK0ctNiZdc9rRNo8BHGQqKvmZqmbzUAU07uS0+iLBnm89KKJyQCXKulDv7NM0ShiFexMQ17TUOdlJtH65ypzUIJ+sbSOj2M+NhThUD8OQlebvjKF6t8M9f1NIXkkH/Xw2XJ146ANBcGyjALVFDIqlKIyCtIoY3/teQWccfbAzBglC24QBizpfgmdBEGOJXs2qR0NxzcIRNc1o9XPyT9BJxa+9JnHyHbF+LG07j1LfaaJSQBIYL7xjDBwEEIOEmP3UrISwjvs1fOQA3oYINguXtl7qi3wNylv35e5xw5acijcTTYHRSY6A5rPdokbK0fCQHCrHldBYDc8Bvy+GnjnYQHynjdWGbTnkvMgvYe2aHD+mH5pO5V7DRYHhnJsuMuscRIELc=
+  - secure: ZMu9rhzTT1F6pyqqrd0TGhAeUGigAvGZT5rJv2ifZJEB8+FOQ+/ylJ/Q3Gq9Wx8quWVR/ocTWF8yEuA1BlZF1Z+tfOcCXOaYPrgMFNhgmETK9X1AQN1gahkTzLNWEZUzKwte5IwaDYDwMe54VcJpY9/f7R6ZyjKVEJOLCjnJ+YLR2rjttsug9ZurH3iLzdgRGMHyI55+dz83MkdumkkATFAeLnQepdL2n4ijD0NvuzvlvaU+Knz9AZCX2kSNDM+hn+K0fFDM4CBFduBi8gEYmRlnSXslHtfwuZRViZQaS4voRMAFmWPNCH67ya3f1voi41BWXgaGTW5He8XDjQtFcIphvykmMOsS4ka9u4K0LEbReoSBRwBUAhigGMFXB1lMup66+WvjvSvwS9rMVVGaXpVGjgpM5shWpiIEoWICWU+Pu5ihk9BWv61/tYNNw6u3QlXt1ZfjM50F7eoJ1ctfYqClrlD3iwrBJ47aIu4kH1HdCp9uxkxq+Cz75n2UdV6Py7eEW1N141fnZ/Iax8nzbNu4SxccsJn1yUv22LJCteW3//GqvRVa7hets587PFpfkyaraBLNBvh90/wouXK/yvYBZN4WK7VwnuCUmxTjTglT9mQGUgPOYNMDU/m7rDp2zDc+8aMEfQjWGktH93M0g1l9yhidc8AMQbyAaxkk73M=

access-key-info-idl/src/main/proto/proteus/accesskey_info.proto

@@ -13,6 +13,10 @@ message AccessKey {
   int64 key = 1;
 }
 
+message AccessKeyParameters {
+  string description = 1;
+}
+
 message AccessToken {
   int64 key = 1;
   bytes accessToken = 2;
@@ -30,7 +34,7 @@ message AccessTokenInfo {
 }
 
 service AccessKeyInfoService {
-  rpc AddAccessKey (AccessToken) returns (AccessTokenInfo) {}
+  rpc CreateAccessKey (AccessKeyParameters) returns (AccessToken) {}
   rpc RemoveAccessKey (AccessKey) returns (AccessTokenInfo) {}
   rpc DisableAccessKey (AccessKey) returns (AccessTokenInfo) {}
   rpc EnableAccessKey (AccessKey) returns (AccessTokenInfo) {}

build.gradle

@@ -1,6 +1,14 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+    }
+}
+
 plugins {
-    id 'com.gradle.build-scan' version '1.9' // declare before any other plugin
-    id 'com.jfrog.bintray' version '1.8.0'
+    id 'com.gradle.build-scan' version '1.15.1' // declare before any other plugin
     id 'com.google.osdetector' version '1.4.0'
     id 'com.github.sherter.google-java-format' version '0.6' apply false
     id 'com.github.johnrengelman.shadow' version '2.0.1' apply false
@@ -14,104 +22,90 @@ project(':auth') {
     description = 'Netifi Proteus Authentication Utilities'
     ext.artifactName = 'auth'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':access-key-info-idl') {
     description = 'Netifi Access Key IDL'
-    ext.artifactName = 'access-key-idl'
+    ext.artifactName = 'access-key-info-idl'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':broker-info-idl') {
     description = 'Netifi Broker Info IDL'
     ext.artifactName = 'broker-info-idl'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':broker-mgmt-idl') {
-
     description = 'Netifi Broker Management IDL'
     ext.artifactName = 'broker-mgmt-idl'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':client') {
     description = 'Netifi Proteus Client'
     ext.artifactName = 'client'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':core') {
     description = 'Netifi Core Library'
     ext.artifactName = 'core'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':core-idl') {
     description = 'Netifi Core IDL'
     ext.artifactName = 'core-idl'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':frames') {
     description = 'Netifi Proteus Frames'
     ext.artifactName = 'frames'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':metrics-idl') {
     description = 'Netifi Proteus Metrics IDL'
     ext.artifactName = 'metrics-idl'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':metrics-micrometer') {
     description = 'Netifi Proteus Micrometer Support'
     ext.artifactName = 'metrics-micrometer'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':metrics-prometheus') {
     description = 'Netifi Proteus Prometheus Integration'
     ext.artifactName = 'metrics-prometheus'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
 project(':protobuf-rpc') {
     description = 'Netifi Proteus RPC'
     ext.artifactName = 'protobuf-rpc'
 
-    apply from: file('../gradle/release.gradle')
+    //apply from: file('../gradle/java.gradle')
 }
 
-
 project(':tracing-openzipkin') {
     description = 'Netifi Proteus Openzipkin Integration'
-    ext.artifactName = 'tracing'
+    ext.artifactName = 'tracing-openzipkin'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }
 
@@ -120,6 +114,5 @@ project(':tracing-idl') {
     description = 'Netifi Proteus Tracing IDL'
     ext.artifactName = 'tracing-idl'
 
-    apply from: file('../gradle/release.gradle')
     apply from: file('../gradle/java.gradle')
 }

gradle.properties

@@ -1,2 +1,2 @@
 group=io.netifi.proteus
-version=0.8.7
+version=0.8.8

gradle/buildViaTravis-linux.sh

@@ -1,16 +1,38 @@
 #!/bin/bash
 # This script will build the project.
 
+echo -e "TRAVIS_BRANCH=$TRAVIS_BRANCH"
+echo -e "TRAVIS_TAG=$TRAVIS_TAG"
+echo -e "TRAVIS_COMMIT=${TRAVIS_COMMIT::7}"
+echo -e "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
+
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
-  ./gradlew clean build
-elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
-  echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-  ./gradlew clean build
+    # Pull Request
+    echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
+    ./gradlew clean build --stacktrace
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_TAG" == "" ]; then
+    # Develop Branch
+    echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=snapshot
+    ./gradlew clean build publish --stacktrace
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "$TRAVIS_BRANCH" == release/* ]] && [ "$TRAVIS_TAG" == "" ]; then
+    # Release Branch
+    echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=releaseCandidate
+    ./gradlew clean build publish --stacktrace
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+    # Master Branch
+    echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=release
+    ./gradlew clean build --stacktrace
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
-  echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']'
-  ./gradlew -PreleaseType=release -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" clean build :protobuf-rpc:bintrayUpload --stacktrace
+    # Tag
+    echo -e 'Build Tag for Release => Tag ['$TRAVIS_TAG']'
+    export ORG_GRADLE_PROJECT_releaseType=release
+    ./gradlew clean build bintrayUpload --stacktrace
 else
-  echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']  Pull Request ['$TRAVIS_PULL_REQUEST']'
-  ./gradlew clean build
+    # Feature Branch
+    echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=snapshot
+    ./gradlew clean build publish --stacktrace
 fi

gradle/buildViaTravis.sh

@@ -1,16 +1,38 @@
 #!/bin/bash
 # This script will build the project.
 
+echo -e "TRAVIS_BRANCH=$TRAVIS_BRANCH"
+echo -e "TRAVIS_TAG=$TRAVIS_TAG"
+echo -e "TRAVIS_COMMIT=${TRAVIS_COMMIT::7}"
+echo -e "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
+
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
-  ./gradlew clean build
-elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
-  echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-  ./gradlew clean build
+    # Pull Request
+    echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
+    ./gradlew clean build --stacktrace
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_TAG" == "" ]; then
+    # Develop Branch
+    echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=snapshot
+    ./gradlew clean build publish --stacktrace
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [[ "$TRAVIS_BRANCH" == release/* ]] && [ "$TRAVIS_TAG" == "" ]; then
+    # Release Branch
+    echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=releaseCandidate
+    ./gradlew clean build publish --stacktrace
+elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then
+    # Master Branch
+    echo -e 'Build Master for Release => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=release
+    ./gradlew clean build --stacktrace
 elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
-  echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']'
-  ./gradlew -PreleaseType=release -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" clean build bintrayUpload --stacktrace
+    # Tag
+    echo -e 'Build Tag for Release => Tag ['$TRAVIS_TAG']'
+    export ORG_GRADLE_PROJECT_releaseType=release
+    ./gradlew clean build bintrayUpload --stacktrace
 else
-  echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']  Pull Request ['$TRAVIS_PULL_REQUEST']'
-  ./gradlew clean build
+    # Feature Branch
+    echo -e 'Build Branch => Branch ['$TRAVIS_BRANCH']'
+    export ORG_GRADLE_PROJECT_releaseType=snapshot
+    ./gradlew clean build publish --stacktrace
 fi