Skip to content
This repository has been archived by the owner on May 4, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/1.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
kbahr committed Apr 23, 2019
2 parents 3c64a4b + 1cad5d3 commit 3027692
Show file tree
Hide file tree
Showing 57 changed files with 727 additions and 580 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
notifications:
email: false
slack:
secure: Cu+GeTIBNIXH+SCidpbtbU5C82K3Car8V2St47mJvxiI7spWvUm+LXWS1x8L8ylR2zE8lE3NYjSPCDVSOxBh3ixCE804Lasb6eAfQ4dZ0zUMCEZuKa/xfunN10y/ZrgTiclVF7dmfEkll0Jv48bJSSXBk0iArnbKb3HGKudPsTVLeJySNGbZXFx9+fkZRYXieh+V1R9aeKLFtiMzNk7IuLwb64fhAqYtEJXBmax47BZiH98vu8LjWeGvszAuXyzrCzeOOS713nPqoeA2RRa15YhasFZcPHQFduwY+yl8ljCqr3JKx5qjpi8LozWfH4BqDlo7WgaYFATts1d4A1lAnfBYrAbfiIxNyFuAVLzm2MjlqjkowVe7C5BBlfltmJQhD8ZQeKF3OWn/wq/VARGu55MvcjicVixM+vafzah0LJr511gEhvydSZnLnaoJvIP3JK5FASRokMQQ+qA4OS0wCdZxzvEea/KOZ+DnABGhA2BaJSNyetCB9Lbzmb0UeSdz8eKCRmV6JJrqFn/8mgkYDOlDo6CqsUa2iX73sPa0GOBIaNvRjbyaJMvxHdDuO8iM3WOcSB5iu/E+ep6mYqOrLfyrkX2aUlBbgP9Ld8/2Ayf33yW5YBjiPBe6R89DOuqYtImk7Sw6RDazXEicKyghtSufvjw5lG2dh/XG1RbupoE=
cache:
directories:
- "$HOME/.gradle/caches/"
Expand Down
9 changes: 7 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ buildScan {


allprojects {

dependencyLocking {
lockAllConfigurations()
}

}

subprojects {
Expand Down Expand Up @@ -65,6 +63,13 @@ subprojects {
password = project.findProperty('netifiArtifactoryPassword') ?: System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
}
}
maven {
url = 'https://artifactory.netifiinc.com/artifactory/libs-snapshot-local'
credentials {
username = project.findProperty('netifiArtifactoryUsername') ?: System.getenv('NETIFI_ARTIFACTORY_USERNAME')
password = project.findProperty('netifiArtifactoryPassword') ?: System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
}
}
maven {
url "https://dl.bintray.com/netifi/netifi-oss"
}
Expand Down
84 changes: 75 additions & 9 deletions dependency-management.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,80 @@
apply plugin: 'io.spring.dependency-management'

ext['slf4j.version'] = '1.7.25'
ext['proteus-common-dependencies.version'] = '1.6.0'

dependencyManagement {
imports {
mavenBom "io.netifi.proteus:proteus-common-dependencies:${ext['proteus-common-dependencies.version']}"
}
imports {

mavenBom "com.fasterxml.jackson:jackson-bom:${jacksonVersion}"
mavenBom "io.netty:netty-bom:${nettyVersion}"
mavenBom "io.projectreactor:reactor-bom:${reactorBomVersion}"
mavenBom "org.apache.logging.log4j:log4j-bom:${log4j2Version}"
mavenBom "org.junit:junit-bom:${junitJupiterVersion}"
mavenBom "software.amazon.awssdk:bom:${awssdkVersion}"
}

dependencies {
dependency "org.slf4j:slf4j-api:${ext['slf4j.version']}"
}
dependencies {
dependency "org.slf4j:slf4j-api:${slf4jVersion}"

dependency "com.github.davidmoten:rxjava2-jdbc:${rxjava2JdbcVersion}"
dependency "com.google.guava:guava:${guavaVersion}"
dependency "com.google.protobuf:protobuf-java-util:${protobufVersion}"
dependency "com.google.protobuf:protobuf-java:${protobufVersion}"
dependency "com.google.protobuf:protoc:${protobufVersion}"
dependency "com.hubspot.jackson:jackson-datatype-protobuf:${jacksonProtobufVersion}"
dependency "com.netflix.spectator:spectator-api:${spectatorVersion}"
dependency "com.netflix.spectator:spectator-ext-ipc:${spectatorVersion}"
dependency "com.netflix.spectator:spectator-reg-atlas:${spectatorVersion}"
dependency "com.typesafe:config:${typesafeConfigVersion}"
dependency "commons-io:commons-io:${commonsIoVersion}"
dependency "commons-validator:commons-validator:${commonsValidatorVersion}"
dependency "io.micrometer:micrometer-core:${micrometerVersion}"
dependency "io.micrometer:micrometer-jersey2:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-appoptics:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-atlas:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-azure-monitor:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-cloudwatch:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-datadog:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-dynatrace:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-elastic:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-ganglia:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-graphite:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-humio:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-influx:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-jmx:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-kairos:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-new-relic:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-prometheus:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-signalfx:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-statsd:${micrometerVersion}"
dependency "io.micrometer:micrometer-registry-wavefront:${micrometerVersion}"
dependency "io.micrometer:micrometer-test:${micrometerVersion}"
dependency "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}"
dependency "io.netty:netty-tcnative:${nettyTcnativeVersion}"
dependency "io.opentracing:opentracing-api:${opentracingVersion}"
dependency "io.opentracing.brave:brave-opentracing:${braveOpentracingVersion}"
dependency "io.zipkin.reporter2:zipkin-sender-okhttp3:${zipkinSenderVersion}"
dependency "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"
dependency "javax.inject:javax.inject:${javaxInjectVersion}"
dependency "junit:junit:${junitVersion}"
dependency "org.assertj:assertj-core:${assertjVersion}"
dependency "org.flywaydb:flyway-core:${flywayVersion}"
dependency "org.hamcrest:hamcrest-core:${hamcrestVersion}"
dependency "org.hamcrest:hamcrest-library:${hamcrestVersion}"
dependency "org.hdrhistogram:HdrHistogram:${hdrhistogramVersion}"
dependency "org.jctools:jctools-core:${jctoolsVersion}"
dependency "org.mockito:mockito-core:${mockitoVersion}"
dependency "org.mockito:mockito-inline:${mockitoVersion}"
dependency "org.mockito:mockito-junit-jupiter:${mockitoVersion}"
dependency "org.postgresql:postgresql:${postgresqlVersion}"
dependency "org.roaringbitmap:RoaringBitmap:${roaringbitmapVersion}"
dependency "io.rsocket:rsocket-core:${rsocketVersion}"
dependency "io.rsocket:rsocket-load-balancer:${rsocketVersion}"
dependency "io.rsocket:rsocket-micrometer:${rsocketVersion}"
dependency "io.rsocket:rsocket-test:${rsocketVersion}"
dependency "io.rsocket:rsocket-transport-netty:${rsocketVersion}"
dependency "io.rsocket:rsocket-transport-local:${rsocketVersion}"
dependency "io.rsocket.rpc:rsocket-rpc-core:${rsocketRpcVersion}"
dependency "io.rsocket.rpc:rsocket-rpc-metrics-idl:${rsocketRpcVersion}"
dependency "io.rsocket.rpc:rsocket-rpc-protobuf:${rsocketRpcVersion}"
dependency "io.rsocket.rpc:rsocket-rpc-protobuf-idl:${rsocketRpcVersion}"
}
}
37 changes: 36 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,37 @@
group=io.netifi.proteus
version=1.6.0
version=1.6.1

awssdkVersion=2.4.13
assertjVersion=3.12.1
braveOpentracingVersion=0.33.10
commonsIoVersion=2.6
commonsValidatorVersion=1.6
flywayVersion=5.2.4
guavaVersion=27.0.1-jre
hamcrestVersion=1.3
hdrhistogramVersion=2.1.10
jacksonProtobufVersion=0.9.10-jackson2.9-proto3
jacksonVersion=2.9.8
javaxAnnotationVersion=1.3.2
javaxInjectVersion=1
jctoolsVersion=2.1.2
junitJupiterVersion=5.4.0
junitVersion=4.12
log4j2Version=2.11.2
micrometerVersion=1.0.6
mockitoVersion=2.25.0
nettyTcnativeVersion=2.0.18.Final
nettyVersion=4.1.31.Final
opentracingVersion=0.31.0
postgresqlVersion=42.2.5
protobufVersion=3.6.1
reactorBomVersion=Californium-SR5
roaringbitmapVersion=0.7.42
rxjava2JdbcVersion=0.2.4
spectatorVersion=0.61.0
typesafeConfigVersion=1.3.3
slf4jVersion=1.7.25
zipkinSenderVersion=2.7.6

rsocketVersion=0.11.17.2
rsocketRpcVersion=0.2.13.3
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
io.netty:netty-buffer:4.1.33.Final
io.netty:netty-common:4.1.33.Final
io.netty:netty-buffer:4.1.31.Final
io.netty:netty-common:4.1.31.Final
javax.inject:javax.inject:1
24 changes: 12 additions & 12 deletions proteus-auth/gradle/dependency-locks/testCompileClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.protobuf:protobuf-java:3.6.1
io.netty:netty-buffer:4.1.33.Final
io.netty:netty-codec-http2:4.1.33.Final
io.netty:netty-codec-http:4.1.33.Final
io.netty:netty-codec-socks:4.1.33.Final
io.netty:netty-codec:4.1.33.Final
io.netty:netty-common:4.1.33.Final
io.netty:netty-handler-proxy:4.1.33.Final
io.netty:netty-handler:4.1.33.Final
io.netty:netty-resolver:4.1.33.Final
io.netty:netty-transport-native-epoll:4.1.33.Final
io.netty:netty-transport-native-unix-common:4.1.33.Final
io.netty:netty-transport:4.1.33.Final
io.netty:netty-buffer:4.1.31.Final
io.netty:netty-codec-http2:4.1.31.Final
io.netty:netty-codec-http:4.1.31.Final
io.netty:netty-codec-socks:4.1.31.Final
io.netty:netty-codec:4.1.31.Final
io.netty:netty-common:4.1.31.Final
io.netty:netty-handler-proxy:4.1.31.Final
io.netty:netty-handler:4.1.31.Final
io.netty:netty-resolver:4.1.31.Final
io.netty:netty-transport-native-epoll:4.1.31.Final
io.netty:netty-transport-native-unix-common:4.1.31.Final
io.netty:netty-transport:4.1.31.Final
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
io.projectreactor:reactor-core:3.2.6.RELEASE
io.projectreactor:reactor-test:3.2.6.RELEASE
Expand Down
24 changes: 12 additions & 12 deletions proteus-auth/gradle/dependency-locks/testRuntimeClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.protobuf:protobuf-java:3.6.1
io.netty:netty-buffer:4.1.33.Final
io.netty:netty-codec-http2:4.1.33.Final
io.netty:netty-codec-http:4.1.33.Final
io.netty:netty-codec-socks:4.1.33.Final
io.netty:netty-codec:4.1.33.Final
io.netty:netty-common:4.1.33.Final
io.netty:netty-handler-proxy:4.1.33.Final
io.netty:netty-handler:4.1.33.Final
io.netty:netty-resolver:4.1.33.Final
io.netty:netty-transport-native-epoll:4.1.33.Final
io.netty:netty-transport-native-unix-common:4.1.33.Final
io.netty:netty-transport:4.1.33.Final
io.netty:netty-buffer:4.1.31.Final
io.netty:netty-codec-http2:4.1.31.Final
io.netty:netty-codec-http:4.1.31.Final
io.netty:netty-codec-socks:4.1.31.Final
io.netty:netty-codec:4.1.31.Final
io.netty:netty-common:4.1.31.Final
io.netty:netty-handler-proxy:4.1.31.Final
io.netty:netty-handler:4.1.31.Final
io.netty:netty-resolver:4.1.31.Final
io.netty:netty-transport-native-epoll:4.1.31.Final
io.netty:netty-transport-native-unix-common:4.1.31.Final
io.netty:netty-transport:4.1.31.Final
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
io.projectreactor:reactor-core:3.2.6.RELEASE
io.projectreactor:reactor-test:3.2.6.RELEASE
Expand Down
4 changes: 2 additions & 2 deletions proteus-bom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ In Maven, you need to import the bom first:
<dependency>
<groupId>io.netifi.proteus</groupId>
<artifactId>proteus-bom</artifactId>
<version>1.6.0</version>
<version>1.6.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -67,7 +67,7 @@ Then use it to import the BOM:
```groovy
dependencyManagement {
imports {
mavenBom "io.netifi.proteus:proteus-bom:1.6.0"
mavenBom "io.netifi.proteus:proteus-bom:1.6.1"
}
}
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.protobuf:protobuf-java:3.6.1
io.netty:netty-buffer:4.1.33.Final
io.netty:netty-codec-http2:4.1.33.Final
io.netty:netty-codec-http:4.1.33.Final
io.netty:netty-codec-socks:4.1.33.Final
io.netty:netty-codec:4.1.33.Final
io.netty:netty-common:4.1.33.Final
io.netty:netty-handler-proxy:4.1.33.Final
io.netty:netty-handler:4.1.33.Final
io.netty:netty-resolver:4.1.33.Final
io.netty:netty-transport-native-epoll:4.1.33.Final
io.netty:netty-transport-native-unix-common:4.1.33.Final
io.netty:netty-transport:4.1.33.Final
io.netty:netty-buffer:4.1.31.Final
io.netty:netty-codec-http2:4.1.31.Final
io.netty:netty-codec-http:4.1.31.Final
io.netty:netty-codec-socks:4.1.31.Final
io.netty:netty-codec:4.1.31.Final
io.netty:netty-common:4.1.31.Final
io.netty:netty-handler-proxy:4.1.31.Final
io.netty:netty-handler:4.1.31.Final
io.netty:netty-resolver:4.1.31.Final
io.netty:netty-transport-native-epoll:4.1.31.Final
io.netty:netty-transport-native-unix-common:4.1.31.Final
io.netty:netty-transport:4.1.31.Final
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
io.projectreactor:reactor-core:3.2.6.RELEASE
io.projectreactor:reactor-test:3.2.6.RELEASE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.protobuf:protobuf-java:3.6.1
io.netty:netty-buffer:4.1.33.Final
io.netty:netty-codec-http2:4.1.33.Final
io.netty:netty-codec-http:4.1.33.Final
io.netty:netty-codec-socks:4.1.33.Final
io.netty:netty-codec:4.1.33.Final
io.netty:netty-common:4.1.33.Final
io.netty:netty-handler-proxy:4.1.33.Final
io.netty:netty-handler:4.1.33.Final
io.netty:netty-resolver:4.1.33.Final
io.netty:netty-transport-native-epoll:4.1.33.Final
io.netty:netty-transport-native-unix-common:4.1.33.Final
io.netty:netty-transport:4.1.33.Final
io.netty:netty-buffer:4.1.31.Final
io.netty:netty-codec-http2:4.1.31.Final
io.netty:netty-codec-http:4.1.31.Final
io.netty:netty-codec-socks:4.1.31.Final
io.netty:netty-codec:4.1.31.Final
io.netty:netty-common:4.1.31.Final
io.netty:netty-handler-proxy:4.1.31.Final
io.netty:netty-handler:4.1.31.Final
io.netty:netty-resolver:4.1.31.Final
io.netty:netty-transport-native-epoll:4.1.31.Final
io.netty:netty-transport-native-unix-common:4.1.31.Final
io.netty:netty-transport:4.1.31.Final
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
io.projectreactor:reactor-core:3.2.6.RELEASE
io.projectreactor:reactor-test:3.2.6.RELEASE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ message Destination {
bytes ipAddress = 4;
repeated Tag tags = 5;
int64 accessKey = 6;
bool public = 7;
}

message Broker {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.protobuf:protobuf-java:3.6.1
io.netty:netty-buffer:4.1.33.Final
io.netty:netty-codec-http2:4.1.33.Final
io.netty:netty-codec-http:4.1.33.Final
io.netty:netty-codec-socks:4.1.33.Final
io.netty:netty-codec:4.1.33.Final
io.netty:netty-common:4.1.33.Final
io.netty:netty-handler-proxy:4.1.33.Final
io.netty:netty-handler:4.1.33.Final
io.netty:netty-resolver:4.1.33.Final
io.netty:netty-transport-native-epoll:4.1.33.Final
io.netty:netty-transport-native-unix-common:4.1.33.Final
io.netty:netty-transport:4.1.33.Final
io.netty:netty-buffer:4.1.31.Final
io.netty:netty-codec-http2:4.1.31.Final
io.netty:netty-codec-http:4.1.31.Final
io.netty:netty-codec-socks:4.1.31.Final
io.netty:netty-codec:4.1.31.Final
io.netty:netty-common:4.1.31.Final
io.netty:netty-handler-proxy:4.1.31.Final
io.netty:netty-handler:4.1.31.Final
io.netty:netty-resolver:4.1.31.Final
io.netty:netty-transport-native-epoll:4.1.31.Final
io.netty:netty-transport-native-unix-common:4.1.31.Final
io.netty:netty-transport:4.1.31.Final
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
io.projectreactor:reactor-core:3.2.6.RELEASE
io.projectreactor:reactor-test:3.2.6.RELEASE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.protobuf:protobuf-java:3.6.1
io.netty:netty-buffer:4.1.33.Final
io.netty:netty-codec-http2:4.1.33.Final
io.netty:netty-codec-http:4.1.33.Final
io.netty:netty-codec-socks:4.1.33.Final
io.netty:netty-codec:4.1.33.Final
io.netty:netty-common:4.1.33.Final
io.netty:netty-handler-proxy:4.1.33.Final
io.netty:netty-handler:4.1.33.Final
io.netty:netty-resolver:4.1.33.Final
io.netty:netty-transport-native-epoll:4.1.33.Final
io.netty:netty-transport-native-unix-common:4.1.33.Final
io.netty:netty-transport:4.1.33.Final
io.netty:netty-buffer:4.1.31.Final
io.netty:netty-codec-http2:4.1.31.Final
io.netty:netty-codec-http:4.1.31.Final
io.netty:netty-codec-socks:4.1.31.Final
io.netty:netty-codec:4.1.31.Final
io.netty:netty-common:4.1.31.Final
io.netty:netty-handler-proxy:4.1.31.Final
io.netty:netty-handler:4.1.31.Final
io.netty:netty-resolver:4.1.31.Final
io.netty:netty-transport-native-epoll:4.1.31.Final
io.netty:netty-transport-native-unix-common:4.1.31.Final
io.netty:netty-transport:4.1.31.Final
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
io.projectreactor:reactor-core:3.2.6.RELEASE
io.projectreactor:reactor-test:3.2.6.RELEASE
Expand Down
Loading

0 comments on commit 3027692

Please sign in to comment.