diff --git a/build.gradle b/build.gradle index d9a2c54917..262c0320b7 100644 --- a/build.gradle +++ b/build.gradle @@ -122,6 +122,7 @@ buildscript { ext.controlsfx_version = constants.getProperty("controlsfxVersion") ext.detekt_version = constants.getProperty('detektVersion') ext.docker_java_version = constants.getProperty("dockerJavaVersion") + ext.commons_configuration2_version = constants.getProperty("commonsConfiguration2Version") if (JavaVersion.current().isJava8()) { ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsJava8Version") ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeJava8Version") @@ -435,7 +436,17 @@ allprojects { configurations { all { resolutionStrategy { - // Demand that everything uses our given version of Netty. + // Force dependencies to use the same version of Kotlin as Corda. + force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + force "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + force "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" + + // Force dependencies to use the same version of Guava as Corda. + force "com.google.guava:guava:$guava_version" + + // Demand that everything uses our given versions of: + // * Netty + // * Apache commons-configuration2 eachDependency { details -> if (details.requested.group == 'io.netty' && details.requested.name.startsWith('netty-')) { if (details.requested.name.startsWith('netty-tcnative')) { @@ -444,6 +455,10 @@ allprojects { details.useVersion netty_version } } + + if (details.requested.group == 'org.apache.commons' && details.requested.name == "commons-configuration2") { + details.useVersion commons_configuration2_version + } } dependencySubstitution { diff --git a/config/dev/log4j2.xml b/config/dev/log4j2.xml index fda43c56e6..2fe01ad13a 100644 --- a/config/dev/log4j2.xml +++ b/config/dev/log4j2.xml @@ -202,7 +202,7 @@ - + diff --git a/constants.properties b/constants.properties index 177ff91cd9..3f63879556 100644 --- a/constants.properties +++ b/constants.properties @@ -38,6 +38,7 @@ openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4 jolokiaAgentVersion=1.6.1 detektVersion=1.0.1 tcnativeVersion=2.0.48.Final +commonsConfiguration2Version=2.8.0 # ENT-6607 all third party version in here now diff --git a/testing/test-common/src/main/resources/log4j2-test.xml b/testing/test-common/src/main/resources/log4j2-test.xml index f6a24d2f5b..12041ff680 100644 --- a/testing/test-common/src/main/resources/log4j2-test.xml +++ b/testing/test-common/src/main/resources/log4j2-test.xml @@ -90,7 +90,7 @@ - +