ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-07 11:27:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Exclude old version of Javassist in favour of Hibernate's version from Node. (#320)

Browse Source 
* Exclude old version of Javassist in favour of Hibernate's version.

* Comment why we are excluding javassist:javassist, and add TODO for when junit-quickcheck 0.8 is released.
This commit is contained in:
Chris Rankin 2017-03-07 11:43:06 +00:00 committed by GitHub
parent 4d10682f62
commit 0a5080a4e4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/build.gradle
View File

@ -57,6 +57,9 @@ dependencies {
// AssertJ: for fluent assertions for testing
testCompile "org.assertj:assertj-core:${assertj_version}"
// TODO: Upgrade to junit-quickcheck 0.8, once it is released,
// because it depends on org.javassist:javassist instead
// of javassist:javassist.
compile "com.pholser:junit-quickcheck-core:$quickcheck_version"
compile "com.pholser:junit-quickcheck-generators:$quickcheck_version"

12
node/build.gradle
View File

@ -52,8 +52,16 @@ sourceSets {
dependencies {
compile project(':finance')
compile project(':node-schemas')
// Excluding javassist:javassist (which is a transitive dependency of core)
// because it clashes with Hibernate's transitive org.javassist:javassist
// dependency.
// TODO: Remove both of these exclusions once junit-quickcheck 0.8 is released.
compile (project(':finance')) {
exclude group: 'javassist', module: 'javassist'
}
compile (project(':node-schemas')) {
exclude group: 'javassist', module: 'javassist'
}
compile "com.google.code.findbugs:jsr305:3.0.1"