Skip to content

Commit

Permalink
Merge pull request #553 from robertroeser/perfTesting2
Browse files Browse the repository at this point in the history
More performance improvements
  • Loading branch information
rdegnan authored Nov 26, 2018
2 parents 8ae24c6 + 1f69879 commit c09beeb
Show file tree
Hide file tree
Showing 11 changed files with 743 additions and 456 deletions.
2 changes: 0 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ subprojects {
ext['netty.version'] = '4.1.29.Final'
ext['netty-boringssl.version'] = '2.0.18.Final'
ext['hdrhistogram.version'] = '2.1.10'
ext['jctool.version'] = '2.1.2'
ext['mockito.version'] = '2.23.0'
ext['slf4j.version'] = '1.7.25'
ext['jmh.version'] = '1.21'
Expand All @@ -56,7 +55,6 @@ subprojects {
dependency "io.micrometer:micrometer-core:${ext['micrometer.version']}"
dependency "org.assertj:assertj-core:${ext['assertj.version']}"
dependency "org.hdrhistogram:HdrHistogram:${ext['hdrhistogram.version']}"
dependency "org.jctools:jctools-core:${ext['jctool.version']}"
dependency "org.mockito:mockito-core:${ ext['mockito.version']}"
dependency "org.slf4j:slf4j-api:${ext['slf4j.version']}"

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# limitations under the License.
#

version=0.11.14.BUILD-SNAPSHOT
version=0.11.13
1 change: 0 additions & 1 deletion rsocket-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ dependencies {
testImplementation 'org.mockito:mockito-core'

testRuntimeOnly 'ch.qos.logback:logback-classic'
testRuntimeOnly 'org.jctools:jctools-core'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'

// TODO: Remove after JUnit5 migration
Expand Down
Loading

0 comments on commit c09beeb

Please sign in to comment.