mirror of
https://github.com/corda/corda.git
synced 2024-12-18 20:47:57 +00:00
ENT-6885: Added build option to specify the version of Apache commons-configuration2 (#7224)
Added a build.gradle option to specify the version of Apache commons-configuration2 to build with, overriding whatever version is pulled in by Artemis Server. This is to address Nexus security vulnerability reported for Apache commons-configuration2 v2.7. This change was previously applied in Ent-4.9 and was shown to remove the critical security issues reported by Nexus. See [PR-4652](https://github.com/corda/enterprise/pull/4562) for more info about that. The Corda jar was built locally and then scrutinised, revealing that it had Apache commons-configuration2 v2.8.0 included within.
This commit is contained in:
parent
24c3e53435
commit
878f0bba8b
@ -129,6 +129,7 @@ buildscript {
|
||||
ext.controlsfx_version = '8.40.15'
|
||||
ext.detekt_version = constants.getProperty('detektVersion')
|
||||
ext.docker_java_version = constants.getProperty("dockerJavaVersion")
|
||||
ext.commons_configuration2_version = "2.8.0"
|
||||
if (JavaVersion.current().isJava8()) {
|
||||
ext.fontawesomefx_commons_version = '8.15'
|
||||
ext.fontawesomefx_fontawesome_version = '4.7.0-5'
|
||||
@ -450,7 +451,9 @@ allprojects {
|
||||
// Force dependencies to use the same version of Guava as Corda.
|
||||
force "com.google.guava:guava:$guava_version"
|
||||
|
||||
// Demand that everything uses our given version of Netty.
|
||||
// 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')){
|
||||
@ -459,6 +462,10 @@ allprojects {
|
||||
details.useVersion netty_version
|
||||
}
|
||||
}
|
||||
|
||||
if (details.requested.group == 'org.apache.commons' && details.requested.name == "commons-configuration2") {
|
||||
details.useVersion commons_configuration2_version
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user