CORDA-1687: Remove unwanted hibernate-core from DemoBench and Node Explorer. (#3449)

This commit is contained in:
Chris Rankin 2018-06-27 12:52:36 +01:00 committed by GitHub
parent 3eef73020a
commit 7e05e373d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 13 deletions

View File

@ -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 {

View File

@ -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'