ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-19 07:38:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'open/master'

Browse Source 
# Conflicts:
#	node/src/main/kotlin/net/corda/node/services/events/NodeSchedulerService.kt
#	node/src/test/kotlin/net/corda/node/services/events/NodeSchedulerServiceTest.kt
This commit is contained in:
Anthony Keenan
2018-03-26 15:46:26 +01:00
parent eb73a3b68e 329fa94a09
commit 7dbceaadcb
9 changed files with 213 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node-api/build.gradle
View File

@ -56,7 +56,7 @@ dependencies {
testCompile "org.apache.curator:curator-test:${curator_version}"
// FastClasspathScanner: classpath scanning - needed for the NetworkBootstraper
compile 'io.github.lukehutch:fast-classpath-scanner:2.0.21'
compile 'io.github.lukehutch:fast-classpath-scanner:2.12.3'
// Pure-Java Snappy compression
compile 'org.iq80.snappy:snappy:0.4'