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

Author: robertroeser

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

@@ -3,6 +3,7 @@ syntax = "proto3";
 package io.netifi.proteus.broker.access;
 
 import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
 
 option java_package = "io.netifi.proteus.broker.access";
 option java_outer_classname = "AccessKeyInfo";
@@ -25,6 +26,7 @@ message AccessTokenInfo {
   string accessKeyAlgo = 4;
   string description = 5;
   bool disabled = 6;
+  google.protobuf.Timestamp timestamp = 7;
 }
 
 service AccessKeyInfoService {

core/build.gradle

@@ -10,8 +10,8 @@ dependencies {
     compile 'io.opentracing:opentracing-api:0.31.0'
     compile 'javax.inject:javax.inject:1'
     compile 'com.google.protobuf:protobuf-java:3.6.0'
-    compile 'io.rsocket:rsocket-core:0.11.4'
-    compile 'io.rsocket:rsocket-transport-netty:0.11.4'
+    compile 'io.rsocket:rsocket-core:0.11.5'
+    compile 'io.rsocket:rsocket-transport-netty:0.11.5'
     compile 'io.micrometer:micrometer-core:1.0.3'
 
     protobuf project(':metrics-idl')

frames/build.gradle

@@ -1,3 +1,3 @@
 dependencies {
-    compile 'io.rsocket:rsocket-core:0.11.4'
+    compile 'io.rsocket:rsocket-core:0.11.5'
 }

gradle.properties

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

gradle/java.gradle

@@ -66,8 +66,8 @@ dependencies {
     testCompile 'org.apache.logging.log4j:log4j-api:2.8.2'
     testCompile 'org.apache.logging.log4j:log4j-core:2.8.2'
     testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8.2'
-    testCompile 'io.rsocket:rsocket-transport-netty:0.11.4'
-    testCompile 'io.rsocket:rsocket-transport-local:0.11.4'
+    testCompile 'io.rsocket:rsocket-transport-netty:0.11.5'
+    testCompile 'io.rsocket:rsocket-transport-local:0.11.5'
     testCompile 'org.mockito:mockito-all:1.10.19'
 }