mirror of
https://github.com/corda/corda.git
synced 2025-03-18 10:05:28 +00:00
Merge pull request #1450 from corda/cburlinchon-os-merge-041018
Merges: 04/10/2018 at 13:22
This commit is contained in:
commit
f94aedec25
@ -79,6 +79,7 @@ dependencies {
|
||||
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
|
||||
|
||||
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||
runtime "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
|
||||
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
|
||||
|
||||
|
@ -11,13 +11,6 @@ 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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user