From 3eef73020a3adc067010dc749719e019b08167dd Mon Sep 17 00:00:00 2001 From: Joel Dudley Date: Wed, 27 Jun 2018 12:10:22 +0100 Subject: [PATCH 1/3] Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 913744e51d..16ec11d03f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -67,6 +67,7 @@ see changes to this list. * Dave Hudson (R3) * David John Grundy (Dankse Bank) * David Lee (BCS) +* Dinesh Rivankar (Persistent Systems Limited) * Dirk Hermans (KBC) * Edward Greenwood (State Street) * Elendu Uche (APPZONE) From 7e05e373d7ac10b1b817199083a413377c441e7b Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Wed, 27 Jun 2018 12:52:36 +0100 Subject: [PATCH 2/3] CORDA-1687: Remove unwanted hibernate-core from DemoBench and Node Explorer. (#3449) --- tools/demobench/build.gradle | 31 ++++++++++++++++++++----------- tools/explorer/build.gradle | 11 +++++++++-- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/tools/demobench/build.gradle b/tools/demobench/build.gradle index 86000dd4a0..45d4c21292 100644 --- a/tools/demobench/build.gradle +++ b/tools/demobench/build.gradle @@ -1,15 +1,17 @@ buildscript { - ext.tornadofx_version = '1.7.15' - ext.jna_version = '4.1.0' - ext.purejavacomm_version = '0.0.18' - ext.controlsfx_version = '8.40.12' + ext { + tornadofx_version = '1.7.15' + jna_version = '4.1.0' + purejavacomm_version = '0.0.18' + controlsfx_version = '8.40.12' - ext.java_home = System.properties.'java.home' - ext.pkg_source = "$buildDir/packagesrc" - ext.pkg_outDir = "$buildDir/javapackage" - ext.dist_source = "$pkg_source/demobench-$version" - ext.pkg_version = version.indexOf('-') >= 0 ? version.substring(0, version.indexOf('-')) : version - ext.pkg_macosxKeyUserName = 'R3CEV' + java_home = System.properties.'java.home' + pkg_source = "$buildDir/packagesrc" + pkg_outDir = "$buildDir/javapackage" + dist_source = "$pkg_source/demobench-$version" + pkg_version = version.indexOf('-') >= 0 ? version.substring(0, version.indexOf('-')) : version + pkg_macosxKeyUserName = 'R3CEV' + } repositories { mavenLocal() @@ -40,6 +42,13 @@ repositories { } } +configurations { + compile { + // We don't need Hibernate just for its @Type annotation. + exclude group: 'org.hibernate', module: 'hibernate-core' + } +} + dependencies { // TornadoFX: A lightweight Kotlin framework for working with JavaFX UI's. compile "no.tornado:tornadofx:$tornadofx_version" @@ -74,7 +83,7 @@ dependencies { testCompile "junit:junit:$junit_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" - testCompile "org.assertj:assertj-core:${assertj_version}" + testCompile "org.assertj:assertj-core:$assertj_version" } jar { diff --git a/tools/explorer/build.gradle b/tools/explorer/build.gradle index 2b843e3b1a..065625a789 100644 --- a/tools/explorer/build.gradle +++ b/tools/explorer/build.gradle @@ -15,6 +15,13 @@ processResources { from file("$rootDir/config/dev/log4j2.xml") } +configurations { + compile { + // We don't need Hibernate just for its @Type annotation. + exclude group: 'org.hibernate', module: 'hibernate-core' + } +} + dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version" @@ -54,12 +61,12 @@ dependencies { compile 'com.yuvimasory:orange-extensions:1.3.0' } -task(runDemoNodes, dependsOn: 'classes', type: JavaExec) { +task runDemoNodes(dependsOn: 'classes', type: JavaExec) { main = 'net.corda.explorer.MainKt' classpath = sourceSets.main.runtimeClasspath } -task(runSimulationNodes, dependsOn: 'classes', type: JavaExec) { +task runSimulationNodes(dependsOn: 'classes', type: JavaExec) { main = 'net.corda.explorer.MainKt' classpath = sourceSets.main.runtimeClasspath args '-S' From 66cb0e389b5ab8162d02d6ccb55e12336bb2c644 Mon Sep 17 00:00:00 2001 From: Thomas Schroeter Date: Wed, 27 Jun 2018 12:57:37 +0100 Subject: [PATCH 3/3] Warning timer thread should run as a daemon (#3450) --- .../net/corda/nodeapi/internal/network/NetworkBootstrapper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt index 3dbc6589bf..e064c5f627 100644 --- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt +++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/network/NetworkBootstrapper.kt @@ -77,7 +77,7 @@ class NetworkBootstrapper val numParallelProcesses = Runtime.getRuntime().availableProcessors() val timePerNode = 40.seconds // On the test machine, generating the node info takes 7 seconds for a single node. val tExpected = maxOf(timePerNode, timePerNode * nodeDirs.size.toLong() / numParallelProcesses.toLong()) - val warningTimer = Timer("WarnOnSlowMachines", false).schedule(tExpected.toMillis()) { + val warningTimer = Timer("WarnOnSlowMachines", true).schedule(tExpected.toMillis()) { println("... still waiting. If this is taking longer than usual, check the node logs.") } val executor = Executors.newFixedThreadPool(numParallelProcesses)