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

Commit 3027692

Browse files
kbahrkbahr
committed
Merge branch 'release/1.6.1'
2 parents 3c64a4b + 1cad5d3 commit 3027692

File tree

57 files changed

+727
-580
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+727
-580
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ before_cache:
66
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
77
notifications:
88
email: false
9+
slack:
10+
secure: Cu+GeTIBNIXH+SCidpbtbU5C82K3Car8V2St47mJvxiI7spWvUm+LXWS1x8L8ylR2zE8lE3NYjSPCDVSOxBh3ixCE804Lasb6eAfQ4dZ0zUMCEZuKa/xfunN10y/ZrgTiclVF7dmfEkll0Jv48bJSSXBk0iArnbKb3HGKudPsTVLeJySNGbZXFx9+fkZRYXieh+V1R9aeKLFtiMzNk7IuLwb64fhAqYtEJXBmax47BZiH98vu8LjWeGvszAuXyzrCzeOOS713nPqoeA2RRa15YhasFZcPHQFduwY+yl8ljCqr3JKx5qjpi8LozWfH4BqDlo7WgaYFATts1d4A1lAnfBYrAbfiIxNyFuAVLzm2MjlqjkowVe7C5BBlfltmJQhD8ZQeKF3OWn/wq/VARGu55MvcjicVixM+vafzah0LJr511gEhvydSZnLnaoJvIP3JK5FASRokMQQ+qA4OS0wCdZxzvEea/KOZ+DnABGhA2BaJSNyetCB9Lbzmb0UeSdz8eKCRmV6JJrqFn/8mgkYDOlDo6CqsUa2iX73sPa0GOBIaNvRjbyaJMvxHdDuO8iM3WOcSB5iu/E+ep6mYqOrLfyrkX2aUlBbgP9Ld8/2Ayf33yW5YBjiPBe6R89DOuqYtImk7Sw6RDazXEicKyghtSufvjw5lG2dh/XG1RbupoE=
911
cache:
1012
directories:
1113
- "$HOME/.gradle/caches/"

‎build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ buildScan {
3333

3434

3535
allprojects {
36-
3736
dependencyLocking {
3837
lockAllConfigurations()
3938
}
40-
4139
}
4240

4341
subprojects {
@@ -65,6 +63,13 @@ subprojects {
6563
password = project.findProperty('netifiArtifactoryPassword') ?: System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
6664
}
6765
}
66+
maven {
67+
url = 'https://artifactory.netifiinc.com/artifactory/libs-snapshot-local'
68+
credentials {
69+
username = project.findProperty('netifiArtifactoryUsername') ?: System.getenv('NETIFI_ARTIFACTORY_USERNAME')
70+
password = project.findProperty('netifiArtifactoryPassword') ?: System.getenv('NETIFI_ARTIFACTORY_PASSWORD')
71+
}
72+
}
6873
maven {
6974
url "https://dl.bintray.com/netifi/netifi-oss"
7075
}

‎dependency-management.gradle‎

Lines changed: 75 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,80 @@
11
apply plugin: 'io.spring.dependency-management'
22

3-
ext['slf4j.version'] = '1.7.25'
4-
ext['proteus-common-dependencies.version'] = '1.6.0'
5-
63
dependencyManagement {
7-
imports {
8-
mavenBom "io.netifi.proteus:proteus-common-dependencies:${ext['proteus-common-dependencies.version']}"
9-
}
4+
imports {
5+
6+
mavenBom "com.fasterxml.jackson:jackson-bom:${jacksonVersion}"
7+
mavenBom "io.netty:netty-bom:${nettyVersion}"
8+
mavenBom "io.projectreactor:reactor-bom:${reactorBomVersion}"
9+
mavenBom "org.apache.logging.log4j:log4j-bom:${log4j2Version}"
10+
mavenBom "org.junit:junit-bom:${junitJupiterVersion}"
11+
mavenBom "software.amazon.awssdk:bom:${awssdkVersion}"
12+
}
1013

11-
dependencies {
12-
dependency "org.slf4j:slf4j-api:${ext['slf4j.version']}"
13-
}
14+
dependencies {
15+
dependency "org.slf4j:slf4j-api:${slf4jVersion}"
16+
17+
dependency "com.github.davidmoten:rxjava2-jdbc:${rxjava2JdbcVersion}"
18+
dependency "com.google.guava:guava:${guavaVersion}"
19+
dependency "com.google.protobuf:protobuf-java-util:${protobufVersion}"
20+
dependency "com.google.protobuf:protobuf-java:${protobufVersion}"
21+
dependency "com.google.protobuf:protoc:${protobufVersion}"
22+
dependency "com.hubspot.jackson:jackson-datatype-protobuf:${jacksonProtobufVersion}"
23+
dependency "com.netflix.spectator:spectator-api:${spectatorVersion}"
24+
dependency "com.netflix.spectator:spectator-ext-ipc:${spectatorVersion}"
25+
dependency "com.netflix.spectator:spectator-reg-atlas:${spectatorVersion}"
26+
dependency "com.typesafe:config:${typesafeConfigVersion}"
27+
dependency "commons-io:commons-io:${commonsIoVersion}"
28+
dependency "commons-validator:commons-validator:${commonsValidatorVersion}"
29+
dependency "io.micrometer:micrometer-core:${micrometerVersion}"
30+
dependency "io.micrometer:micrometer-jersey2:${micrometerVersion}"
31+
dependency "io.micrometer:micrometer-registry-appoptics:${micrometerVersion}"
32+
dependency "io.micrometer:micrometer-registry-atlas:${micrometerVersion}"
33+
dependency "io.micrometer:micrometer-registry-azure-monitor:${micrometerVersion}"
34+
dependency "io.micrometer:micrometer-registry-cloudwatch:${micrometerVersion}"
35+
dependency "io.micrometer:micrometer-registry-datadog:${micrometerVersion}"
36+
dependency "io.micrometer:micrometer-registry-dynatrace:${micrometerVersion}"
37+
dependency "io.micrometer:micrometer-registry-elastic:${micrometerVersion}"
38+
dependency "io.micrometer:micrometer-registry-ganglia:${micrometerVersion}"
39+
dependency "io.micrometer:micrometer-registry-graphite:${micrometerVersion}"
40+
dependency "io.micrometer:micrometer-registry-humio:${micrometerVersion}"
41+
dependency "io.micrometer:micrometer-registry-influx:${micrometerVersion}"
42+
dependency "io.micrometer:micrometer-registry-jmx:${micrometerVersion}"
43+
dependency "io.micrometer:micrometer-registry-kairos:${micrometerVersion}"
44+
dependency "io.micrometer:micrometer-registry-new-relic:${micrometerVersion}"
45+
dependency "io.micrometer:micrometer-registry-prometheus:${micrometerVersion}"
46+
dependency "io.micrometer:micrometer-registry-signalfx:${micrometerVersion}"
47+
dependency "io.micrometer:micrometer-registry-statsd:${micrometerVersion}"
48+
dependency "io.micrometer:micrometer-registry-wavefront:${micrometerVersion}"
49+
dependency "io.micrometer:micrometer-test:${micrometerVersion}"
50+
dependency "io.netty:netty-tcnative-boringssl-static:${nettyTcnativeVersion}"
51+
dependency "io.netty:netty-tcnative:${nettyTcnativeVersion}"
52+
dependency "io.opentracing:opentracing-api:${opentracingVersion}"
53+
dependency "io.opentracing.brave:brave-opentracing:${braveOpentracingVersion}"
54+
dependency "io.zipkin.reporter2:zipkin-sender-okhttp3:${zipkinSenderVersion}"
55+
dependency "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"
56+
dependency "javax.inject:javax.inject:${javaxInjectVersion}"
57+
dependency "junit:junit:${junitVersion}"
58+
dependency "org.assertj:assertj-core:${assertjVersion}"
59+
dependency "org.flywaydb:flyway-core:${flywayVersion}"
60+
dependency "org.hamcrest:hamcrest-core:${hamcrestVersion}"
61+
dependency "org.hamcrest:hamcrest-library:${hamcrestVersion}"
62+
dependency "org.hdrhistogram:HdrHistogram:${hdrhistogramVersion}"
63+
dependency "org.jctools:jctools-core:${jctoolsVersion}"
64+
dependency "org.mockito:mockito-core:${mockitoVersion}"
65+
dependency "org.mockito:mockito-inline:${mockitoVersion}"
66+
dependency "org.mockito:mockito-junit-jupiter:${mockitoVersion}"
67+
dependency "org.postgresql:postgresql:${postgresqlVersion}"
68+
dependency "org.roaringbitmap:RoaringBitmap:${roaringbitmapVersion}"
69+
dependency "io.rsocket:rsocket-core:${rsocketVersion}"
70+
dependency "io.rsocket:rsocket-load-balancer:${rsocketVersion}"
71+
dependency "io.rsocket:rsocket-micrometer:${rsocketVersion}"
72+
dependency "io.rsocket:rsocket-test:${rsocketVersion}"
73+
dependency "io.rsocket:rsocket-transport-netty:${rsocketVersion}"
74+
dependency "io.rsocket:rsocket-transport-local:${rsocketVersion}"
75+
dependency "io.rsocket.rpc:rsocket-rpc-core:${rsocketRpcVersion}"
76+
dependency "io.rsocket.rpc:rsocket-rpc-metrics-idl:${rsocketRpcVersion}"
77+
dependency "io.rsocket.rpc:rsocket-rpc-protobuf:${rsocketRpcVersion}"
78+
dependency "io.rsocket.rpc:rsocket-rpc-protobuf-idl:${rsocketRpcVersion}"
79+
}
1480
}

‎gradle.properties‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,37 @@
11
group=io.netifi.proteus
2-
version=1.6.0
2+
version=1.6.1
3+
4+
awssdkVersion=2.4.13
5+
assertjVersion=3.12.1
6+
braveOpentracingVersion=0.33.10
7+
commonsIoVersion=2.6
8+
commonsValidatorVersion=1.6
9+
flywayVersion=5.2.4
10+
guavaVersion=27.0.1-jre
11+
hamcrestVersion=1.3
12+
hdrhistogramVersion=2.1.10
13+
jacksonProtobufVersion=0.9.10-jackson2.9-proto3
14+
jacksonVersion=2.9.8
15+
javaxAnnotationVersion=1.3.2
16+
javaxInjectVersion=1
17+
jctoolsVersion=2.1.2
18+
junitJupiterVersion=5.4.0
19+
junitVersion=4.12
20+
log4j2Version=2.11.2
21+
micrometerVersion=1.0.6
22+
mockitoVersion=2.25.0
23+
nettyTcnativeVersion=2.0.18.Final
24+
nettyVersion=4.1.31.Final
25+
opentracingVersion=0.31.0
26+
postgresqlVersion=42.2.5
27+
protobufVersion=3.6.1
28+
reactorBomVersion=Californium-SR5
29+
roaringbitmapVersion=0.7.42
30+
rxjava2JdbcVersion=0.2.4
31+
spectatorVersion=0.61.0
32+
typesafeConfigVersion=1.3.3
33+
slf4jVersion=1.7.25
34+
zipkinSenderVersion=2.7.6
35+
36+
rsocketVersion=0.11.17.2
37+
rsocketRpcVersion=0.2.13.3

‎proteus-auth/gradle/dependency-locks/compileClasspath.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
io.netty:netty-buffer:4.1.33.Final
5-
io.netty:netty-common:4.1.33.Final
4+
io.netty:netty-buffer:4.1.31.Final
5+
io.netty:netty-common:4.1.31.Final
66
javax.inject:javax.inject:1

‎proteus-auth/gradle/dependency-locks/testCompileClasspath.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.Final
1717
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
1818
io.projectreactor:reactor-core:3.2.6.RELEASE
1919
io.projectreactor:reactor-test:3.2.6.RELEASE

‎proteus-auth/gradle/dependency-locks/testRuntimeClasspath.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.Final
1717
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
1818
io.projectreactor:reactor-core:3.2.6.RELEASE
1919
io.projectreactor:reactor-test:3.2.6.RELEASE

‎proteus-bom/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ In Maven, you need to import the bom first:
1111
<dependency>
1212
<groupId>io.netifi.proteus</groupId>
1313
<artifactId>proteus-bom</artifactId>
14-
<version>1.6.0</version>
14+
<version>1.6.1</version>
1515
<type>pom</type>
1616
<scope>import</scope>
1717
</dependency>
@@ -67,7 +67,7 @@ Then use it to import the BOM:
6767
```groovy
6868
dependencyManagement {
6969
imports {
70-
mavenBom "io.netifi.proteus:proteus-bom:1.6.0"
70+
mavenBom "io.netifi.proteus:proteus-bom:1.6.1"
7171
}
7272
}
7373
```

‎proteus-broker-info-idl/gradle/dependency-locks/testCompile.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.Final
1717
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
1818
io.projectreactor:reactor-core:3.2.6.RELEASE
1919
io.projectreactor:reactor-test:3.2.6.RELEASE

‎proteus-broker-info-idl/gradle/dependency-locks/testCompileClasspath.lockfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
44
com.google.protobuf:protobuf-java:3.6.1
5-
io.netty:netty-buffer:4.1.33.Final
6-
io.netty:netty-codec-http2:4.1.33.Final
7-
io.netty:netty-codec-http:4.1.33.Final
8-
io.netty:netty-codec-socks:4.1.33.Final
9-
io.netty:netty-codec:4.1.33.Final
10-
io.netty:netty-common:4.1.33.Final
11-
io.netty:netty-handler-proxy:4.1.33.Final
12-
io.netty:netty-handler:4.1.33.Final
13-
io.netty:netty-resolver:4.1.33.Final
14-
io.netty:netty-transport-native-epoll:4.1.33.Final
15-
io.netty:netty-transport-native-unix-common:4.1.33.Final
16-
io.netty:netty-transport:4.1.33.Final
5+
io.netty:netty-buffer:4.1.31.Final
6+
io.netty:netty-codec-http2:4.1.31.Final
7+
io.netty:netty-codec-http:4.1.31.Final
8+
io.netty:netty-codec-socks:4.1.31.Final
9+
io.netty:netty-codec:4.1.31.Final
10+
io.netty:netty-common:4.1.31.Final
11+
io.netty:netty-handler-proxy:4.1.31.Final
12+
io.netty:netty-handler:4.1.31.Final
13+
io.netty:netty-resolver:4.1.31.Final
14+
io.netty:netty-transport-native-epoll:4.1.31.Final
15+
io.netty:netty-transport-native-unix-common:4.1.31.Final
16+
io.netty:netty-transport:4.1.31.Final
1717
io.projectreactor.netty:reactor-netty:0.8.5.RELEASE
1818
io.projectreactor:reactor-core:3.2.6.RELEASE
1919
io.projectreactor:reactor-test:3.2.6.RELEASE

0 commit comments

Comments
 (0)