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

Commit 02ee288

Browse files
robertroeserrobertroeser
committed
moves dep into project
1 parent c420915 commit 02ee288

File tree

55 files changed

+684
-589
lines changed

Some content is hidden

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

55 files changed

+684
-589
lines changed

‎build.gradle‎

Lines changed: 0 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 {

‎dependency-management.gradle‎

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

3-
ext['slf4j.version'] = '1.7.25'
4-
ext['proteus-common-dependencies.version'] = '1.6.1-SNAPSHOT'
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.netifi.proteus:proteus-rsocket-bom:${rsocketBomVersion}"
8+
mavenBom "io.netty:netty-bom:${nettyVersion}"
9+
mavenBom "io.projectreactor:reactor-bom:${reactorBomVersion}"
10+
mavenBom "org.apache.logging.log4j:log4j-bom:${log4j2Version}"
11+
mavenBom "org.junit:junit-bom:${junitJupiterVersion}"
12+
mavenBom "software.amazon.awssdk:bom:${awssdkVersion}"
13+
}
1014

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

‎gradle.properties‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,38 @@
11
group=io.netifi.proteus
2-
version=1.6.1
2+
version=1.6.1-BUILD-SNAPSHOT
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+
rsocketBomVersion=1.6.1-SNAPSHOT
31+
rxjava2JdbcVersion=0.2.4
32+
spectatorVersion=0.61.0
33+
typesafeConfigVersion=1.3.3
34+
slf4jVersion=1.7.25
35+
zipkinSenderVersion=2.7.6
36+
37+
rsocketVersion=0.11.17.2
38+
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: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
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
20-
io.rsocket:rsocket-core:0.12.2-RC1
21-
io.rsocket:rsocket-transport-local:0.12.2-RC1
22-
io.rsocket:rsocket-transport-netty:0.12.2-RC1
20+
io.rsocket:rsocket-core:0.11.17.2
21+
io.rsocket:rsocket-transport-local:0.11.17.2
22+
io.rsocket:rsocket-transport-netty:0.11.17.2
2323
javax.inject:javax.inject:1
2424
junit:junit:4.12
2525
net.bytebuddy:byte-buddy-agent:1.9.7

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
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
20-
io.rsocket:rsocket-core:0.12.2-RC1
21-
io.rsocket:rsocket-transport-local:0.12.2-RC1
22-
io.rsocket:rsocket-transport-netty:0.12.2-RC1
20+
io.rsocket:rsocket-core:0.11.17.2
21+
io.rsocket:rsocket-transport-local:0.11.17.2
22+
io.rsocket:rsocket-transport-netty:0.11.17.2
2323
javax.inject:javax.inject:1
2424
junit:junit:4.12
2525
net.bytebuddy:byte-buddy-agent:1.9.7

‎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

‎proteus-broker-mgmt-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-mgmt-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)