Skip to content

Spring messaging integration #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OlegDokuka wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

Spring messaging integration #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
60b5fbb
provides updates to latest rsocket and rsocket-rpc
OlegDokuka Dec 17, 2019
21bec77
Merge remote-tracking branch 'rebranded/develop' into develop
OlegDokuka Dec 20, 2019
0a9fbde
updates to the lates RSocket version
OlegDokuka Oct 10, 2019
f8d60ac
partial
OlegDokuka May 15, 2019
ce3a562
latest fixes and tests
OlegDokuka Jun 5, 2019
e025d14
google format and test fixes
OlegDokuka Jun 5, 2019
3698358
Merge remote-tracking branch 'rebranded/develop' into develop
OlegDokuka Nov 18, 2019
6b3b267
provides final spring messaging integration
OlegDokuka Jan 7, 2020
a5e7612
provides tests fixes
OlegDokuka Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 11 additions & 15 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
buildscript {
configurations.classpath {
resolutionStrategy.activateDependencyLocking()
}
// configurations.classpath {
// resolutionStrategy.activateDependencyLocking()
// }
}

plugins {
id 'com.gradle.build-scan' version '2.0.2' // declare before any other plugin
id 'com.google.osdetector' version '1.4.0'
id "com.github.hierynomus.license" version '0.15.0'
id 'com.github.sherter.google-java-format' version '0.8' apply false
id 'me.champeau.gradle.jmh' version '0.4.7' apply false
id 'me.champeau.gradle.jmh' version '0.5.0' apply false
id 'io.morethan.jmhreport' version '0.6.2.1' apply false
id 'io.spring.dependency-management' version '1.0.7.RELEASE' apply false
id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
id 'com.google.protobuf' version '0.8.8' apply false
id 'com.palantir.git-version' version '0.12.0-rc2'
}

//buildScan { licenseAgreementUrl = 'https://gradle.com/terms-of-service'; licenseAgree = 'yes' }
buildScan {
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
termsOfServiceAgree = 'yes'
}

// TODO: make this a Gradle plugin someday
def details = versionDetails()
def versionSuffix = ""
Expand All @@ -44,9 +37,9 @@ if (details.branchName != null) {
}

allprojects {
dependencyLocking {
lockAllConfigurations()
}
// dependencyLocking {
// lockAllConfigurations()
// }
project.version += versionSuffix
ext {
uniqueVersion = "${tmpUniqueVersion}"
Expand All @@ -65,6 +58,9 @@ subprojects {
targetCompatibility = 1.8

repositories {
maven { url 'https://oss.jfrog.org/oss-snapshot-local' }
mavenCentral()
jcenter()
maven {
url 'https://nexus.netifi.com/repository/jcenter/'
credentials {
Expand Down
21 changes: 11 additions & 10 deletions dependency-management.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,29 @@
apply plugin: 'io.spring.dependency-management'

ext["rsocket.version"] = rsocketVersion

dependencyManagement {
imports {

mavenBom "io.rsocket:rsocket-bom:${rsocketVersion}"
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}"
mavenBom "io.rsocket:rsocket-bom:${rsocketVersion}"
mavenBom "com.google.protobuf:protobuf-bom:${protobufVersion}"
mavenBom "org.springframework.boot:spring-boot-dependencies:${springBootDependenciesVersion}"
}

dependencies {
dependency "org.slf4j:slf4j-api:${slf4jVersion}"


dependency 'org.openjdk.jmh:jmh-core:0.9'
dependency 'org.openjdk.jmh:jmh-generator-annprocess:0.9'
dependency "com.github.davidmoten:rxjava2-jdbc:${rxjava2JdbcVersion}"
Copy link
Contributor

@mostroverkhov mostroverkhov Jun 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

duplicate dependency

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}"
Expand Down Expand Up @@ -59,12 +65,6 @@ dependencyManagement {
dependency "io.rsocket.rpc:rsocket-rpc-metrics-idl:${rsocketRpcVersion}"
dependency "io.rsocket.rpc:rsocket-rpc-protobuf-idl:${rsocketRpcVersion}"
dependency "io.rsocket.rpc:rsocket-rpc-protobuf:${rsocketRpcVersion}"
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-local:${rsocketVersion}"
dependency "io.rsocket:rsocket-transport-netty:${rsocketVersion}"
dependency "io.zipkin.reporter2:zipkin-sender-okhttp3:${zipkinSenderVersion}"
dependency "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"
dependency "javax.inject:javax.inject:${javaxInjectVersion}"
Expand All @@ -81,5 +81,6 @@ dependencyManagement {
dependency "org.postgresql:postgresql:${postgresqlVersion}"
dependency "org.roaringbitmap:RoaringBitmap:${roaringbitmapVersion}"
dependency "org.springframework.boot:spring-boot-starter:${springBootDependenciesVersion}"
dependency "org.testcontainers:testcontainers:${testcontainersVersion}"
}
}
13 changes: 7 additions & 6 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=com.netifi
version=1.6.11
version=1.6.11-prioritization

netifiProtoExternalVersion=1.6.11-SNAPSHOT
assertjVersion=3.12.1
Expand All @@ -25,14 +25,15 @@ nettyTcnativeVersion=2.0.25.Final
nettyVersion=4.1.36.Final
opentracingVersion=0.31.0
postgresqlVersion=42.2.5
protobufVersion=3.6.1
reactorBomVersion=Californium-SR8
protobufVersion=3.7.1
reactorBomVersion=Dysprosium-RELEASE
roaringbitmapVersion=0.7.42
rsocketRpcVersion=0.2.18
rsocketVersion=0.12.2-RC4
rsocketRpcVersion=0.3.0-feature-routing-SNAPSHOT
rsocketVersion=1.0.0-RC6-bugfix-prioritization-SNAPSHOT
rxjava2JdbcVersion=0.2.4
slf4jVersion=1.7.25
spectatorVersion=0.61.0
typesafeConfigVersion=1.3.3
zipkinSenderVersion=2.7.6
springBootDependenciesVersion=2.1.5.RELEASE
springBootDependenciesVersion=2.2.2.RELEASE
testcontainersVersion=1.11.3
4 changes: 2 additions & 2 deletions gradle/dependency-locks/buildscript-classpath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0
gradle.plugin.com.palantir.gradle.gitversion:gradle-git-version:0.12.0-rc2
gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.6.2.1
io.morethan.jmhreport:io.morethan.jmhreport.gradle.plugin:0.6.2.1
io.spring.dependency-management:io.spring.dependency-management.gradle.plugin:1.0.7.RELEASE
io.spring.gradle:dependency-management-plugin:1.0.7.RELEASE
io.spring.dependency-management:io.spring.dependency-management.gradle.plugin:1.0.8.RELEASE
io.spring.gradle:dependency-management-plugin:1.0.8.RELEASE
javax.annotation:jsr250-api:1.0
javax.enterprise:cdi-api:1.0
javax.inject:javax.inject:1
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 19 additions & 3 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions netifi-broker-auth-jwt/gradle/dependency-locks/testCompileClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ io.netty:netty-resolver:4.1.36.Final
io.netty:netty-transport-native-epoll:4.1.36.Final
io.netty:netty-transport-native-unix-common:4.1.36.Final
io.netty:netty-transport:4.1.36.Final
io.projectreactor.netty:reactor-netty:0.8.8.RELEASE
io.projectreactor:reactor-core:3.2.9.RELEASE
io.projectreactor:reactor-test:3.2.9.RELEASE
io.rsocket:rsocket-core:0.12.2-RC4
io.rsocket:rsocket-transport-local:0.12.2-RC4
io.rsocket:rsocket-transport-netty:0.12.2-RC4
io.projectreactor.addons:reactor-pool:0.1.0.RELEASE
io.projectreactor.netty:reactor-netty:0.9.0.RELEASE
io.projectreactor:reactor-core:3.3.0.RELEASE
io.projectreactor:reactor-test:3.3.0.RELEASE
io.rsocket:rsocket-core:1.0.0-RC5
io.rsocket:rsocket-transport-local:1.0.0-RC5
io.rsocket:rsocket-transport-netty:1.0.0-RC5
javax.inject:javax.inject:1
junit:junit:4.12
net.bytebuddy:byte-buddy-agent:1.9.7
Expand All @@ -32,5 +33,5 @@ org.hamcrest:hamcrest-core:1.3
org.hdrhistogram:HdrHistogram:2.1.10
org.mockito:mockito-core:2.25.0
org.objenesis:objenesis:2.6
org.reactivestreams:reactive-streams:1.0.2
org.reactivestreams:reactive-streams:1.0.3
org.slf4j:slf4j-api:1.7.25
15 changes: 8 additions & 7 deletions netifi-broker-auth-jwt/gradle/dependency-locks/testRuntimeClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ io.netty:netty-resolver:4.1.36.Final
io.netty:netty-transport-native-epoll:4.1.36.Final
io.netty:netty-transport-native-unix-common:4.1.36.Final
io.netty:netty-transport:4.1.36.Final
io.projectreactor.netty:reactor-netty:0.8.8.RELEASE
io.projectreactor:reactor-core:3.2.9.RELEASE
io.projectreactor:reactor-test:3.2.9.RELEASE
io.rsocket:rsocket-core:0.12.2-RC4
io.rsocket:rsocket-transport-local:0.12.2-RC4
io.rsocket:rsocket-transport-netty:0.12.2-RC4
io.projectreactor.addons:reactor-pool:0.1.0.RELEASE
io.projectreactor.netty:reactor-netty:0.9.0.RELEASE
io.projectreactor:reactor-core:3.3.0.RELEASE
io.projectreactor:reactor-test:3.3.0.RELEASE
io.rsocket:rsocket-core:1.0.0-RC5
io.rsocket:rsocket-transport-local:1.0.0-RC5
io.rsocket:rsocket-transport-netty:1.0.0-RC5
javax.inject:javax.inject:1
junit:junit:4.12
net.bytebuddy:byte-buddy-agent:1.9.7
Expand All @@ -32,5 +33,5 @@ org.hamcrest:hamcrest-core:1.3
org.hdrhistogram:HdrHistogram:2.1.10
org.mockito:mockito-core:2.25.0
org.objenesis:objenesis:2.6
org.reactivestreams:reactive-streams:1.0.2
org.reactivestreams:reactive-streams:1.0.3
org.slf4j:slf4j-api:1.7.25
15 changes: 8 additions & 7 deletions netifi-broker-auth/gradle/dependency-locks/testCompileClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ io.netty:netty-resolver:4.1.36.Final
io.netty:netty-transport-native-epoll:4.1.36.Final
io.netty:netty-transport-native-unix-common:4.1.36.Final
io.netty:netty-transport:4.1.36.Final
io.projectreactor.netty:reactor-netty:0.8.8.RELEASE
io.projectreactor:reactor-core:3.2.9.RELEASE
io.projectreactor:reactor-test:3.2.9.RELEASE
io.rsocket:rsocket-core:0.12.2-RC4
io.rsocket:rsocket-transport-local:0.12.2-RC4
io.rsocket:rsocket-transport-netty:0.12.2-RC4
io.projectreactor.addons:reactor-pool:0.1.0.RELEASE
io.projectreactor.netty:reactor-netty:0.9.0.RELEASE
io.projectreactor:reactor-core:3.3.0.RELEASE
io.projectreactor:reactor-test:3.3.0.RELEASE
io.rsocket:rsocket-core:1.0.0-RC5
io.rsocket:rsocket-transport-local:1.0.0-RC5
io.rsocket:rsocket-transport-netty:1.0.0-RC5
javax.inject:javax.inject:1
junit:junit:4.12
net.bytebuddy:byte-buddy-agent:1.9.7
Expand All @@ -31,5 +32,5 @@ org.hamcrest:hamcrest-core:1.3
org.hdrhistogram:HdrHistogram:2.1.10
org.mockito:mockito-core:2.25.0
org.objenesis:objenesis:2.6
org.reactivestreams:reactive-streams:1.0.2
org.reactivestreams:reactive-streams:1.0.3
org.slf4j:slf4j-api:1.7.25
15 changes: 8 additions & 7 deletions netifi-broker-auth/gradle/dependency-locks/testRuntimeClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ io.netty:netty-resolver:4.1.36.Final
io.netty:netty-transport-native-epoll:4.1.36.Final
io.netty:netty-transport-native-unix-common:4.1.36.Final
io.netty:netty-transport:4.1.36.Final
io.projectreactor.netty:reactor-netty:0.8.8.RELEASE
io.projectreactor:reactor-core:3.2.9.RELEASE
io.projectreactor:reactor-test:3.2.9.RELEASE
io.rsocket:rsocket-core:0.12.2-RC4
io.rsocket:rsocket-transport-local:0.12.2-RC4
io.rsocket:rsocket-transport-netty:0.12.2-RC4
io.projectreactor.addons:reactor-pool:0.1.0.RELEASE
io.projectreactor.netty:reactor-netty:0.9.0.RELEASE
io.projectreactor:reactor-core:3.3.0.RELEASE
io.projectreactor:reactor-test:3.3.0.RELEASE
io.rsocket:rsocket-core:1.0.0-RC5
io.rsocket:rsocket-transport-local:1.0.0-RC5
io.rsocket:rsocket-transport-netty:1.0.0-RC5
javax.inject:javax.inject:1
junit:junit:4.12
net.bytebuddy:byte-buddy-agent:1.9.7
Expand All @@ -31,5 +32,5 @@ org.hamcrest:hamcrest-core:1.3
org.hdrhistogram:HdrHistogram:2.1.10
org.mockito:mockito-core:2.25.0
org.objenesis:objenesis:2.6
org.reactivestreams:reactive-streams:1.0.2
org.reactivestreams:reactive-streams:1.0.3
org.slf4j:slf4j-api:1.7.25
11 changes: 6 additions & 5 deletions netifi-broker-client/gradle/dependency-locks/compile.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ io.netty:netty-transport-native-epoll:4.1.36.Final
io.netty:netty-transport-native-unix-common:4.1.36.Final
io.netty:netty-transport:4.1.36.Final
io.opentracing:opentracing-api:0.31.0
io.projectreactor.netty:reactor-netty:0.8.8.RELEASE
io.projectreactor:reactor-core:3.2.9.RELEASE
io.projectreactor.addons:reactor-pool:0.1.0.RELEASE
io.projectreactor.netty:reactor-netty:0.9.0.RELEASE
io.projectreactor:reactor-core:3.3.0.RELEASE
io.rsocket.rpc:rsocket-rpc-core:0.2.18
io.rsocket:rsocket-core:0.12.2-RC4
io.rsocket:rsocket-transport-netty:0.12.2-RC4
io.rsocket:rsocket-core:1.0.0-RC5
io.rsocket:rsocket-transport-netty:1.0.0-RC5
javax.annotation:javax.annotation-api:1.3.2
javax.inject:javax.inject:1
org.hdrhistogram:HdrHistogram:2.1.10
org.latencyutils:LatencyUtils:2.0.3
org.reactivestreams:reactive-streams:1.0.2
org.reactivestreams:reactive-streams:1.0.3
org.slf4j:slf4j-api:1.7.25
11 changes: 6 additions & 5 deletions netifi-broker-client/gradle/dependency-locks/compileClasspath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ io.netty:netty-transport-native-epoll:4.1.36.Final
io.netty:netty-transport-native-unix-common:4.1.36.Final
io.netty:netty-transport:4.1.36.Final
io.opentracing:opentracing-api:0.31.0
io.projectreactor.netty:reactor-netty:0.8.8.RELEASE
io.projectreactor:reactor-core:3.2.9.RELEASE
io.projectreactor.addons:reactor-pool:0.1.0.RELEASE
io.projectreactor.netty:reactor-netty:0.9.0.RELEASE
io.projectreactor:reactor-core:3.3.0.RELEASE
io.rsocket.rpc:rsocket-rpc-core:0.2.18
io.rsocket:rsocket-core:0.12.2-RC4
io.rsocket:rsocket-transport-netty:0.12.2-RC4
io.rsocket:rsocket-core:1.0.0-RC5
io.rsocket:rsocket-transport-netty:1.0.0-RC5
javax.annotation:javax.annotation-api:1.3.2
javax.inject:javax.inject:1
org.hdrhistogram:HdrHistogram:2.1.10
org.latencyutils:LatencyUtils:2.0.3
org.reactivestreams:reactive-streams:1.0.2
org.reactivestreams:reactive-streams:1.0.3
org.slf4j:slf4j-api:1.7.25
Loading