mirror of
https://github.com/corda/corda.git
synced 2024-12-24 07:06:44 +00:00
Merge pull request #7893 from corda/cc/dev/os/4.12/security_vulnerabilities
ENT-12327,ENT-12328,ENT-12428 - Dependency updates
This commit is contained in:
commit
d195984584
17
build.gradle
17
build.gradle
@ -114,9 +114,6 @@ buildscript {
|
|||||||
ext.controlsfx_version = constants.getProperty("controlsfxVersion")
|
ext.controlsfx_version = constants.getProperty("controlsfxVersion")
|
||||||
ext.detekt_version = constants.getProperty('detektVersion')
|
ext.detekt_version = constants.getProperty('detektVersion')
|
||||||
ext.docker_java_version = constants.getProperty("dockerJavaVersion")
|
ext.docker_java_version = constants.getProperty("dockerJavaVersion")
|
||||||
ext.commons_configuration2_version = constants.getProperty("commonsConfiguration2Version")
|
|
||||||
ext.commons_text_version = constants.getProperty("commonsTextVersion")
|
|
||||||
ext.snake_yaml_version = constants.getProperty("snakeYamlVersion")
|
|
||||||
ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsVersion")
|
ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsVersion")
|
||||||
ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeVersion")
|
ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeVersion")
|
||||||
ext.javaassist_version = constants.getProperty("javaassistVersion")
|
ext.javaassist_version = constants.getProperty("javaassistVersion")
|
||||||
@ -436,20 +433,6 @@ allprojects {
|
|||||||
details.useVersion netty_version
|
details.useVersion netty_version
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (details.requested.group == 'org.apache.commons') {
|
|
||||||
if (details.requested.name == "commons-configuration2") {
|
|
||||||
details.useVersion commons_configuration2_version
|
|
||||||
} else if (details.requested.name == "commons-text") {
|
|
||||||
details.useVersion commons_text_version
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (details.requested.group == 'org.yaml' && details.requested.name == 'snakeyaml') {
|
|
||||||
details.useVersion snake_yaml_version
|
|
||||||
}
|
|
||||||
if (details.requested.group == 'commons-io' && details.requested.name == "commons-io") {
|
|
||||||
details.useVersion commons_io_version
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencySubstitution {
|
dependencySubstitution {
|
||||||
|
@ -27,7 +27,6 @@ disruptorVersion=3.4.2
|
|||||||
typesafeConfigVersion=1.3.4
|
typesafeConfigVersion=1.3.4
|
||||||
jsr305Version=3.0.2
|
jsr305Version=3.0.2
|
||||||
artifactoryPluginVersion=4.16.1
|
artifactoryPluginVersion=4.16.1
|
||||||
snakeYamlVersion=2.2
|
|
||||||
caffeineVersion=3.1.8
|
caffeineVersion=3.1.8
|
||||||
metricsVersion=4.1.0
|
metricsVersion=4.1.0
|
||||||
metricsNewRelicVersion=1.1.1
|
metricsNewRelicVersion=1.1.1
|
||||||
@ -36,8 +35,6 @@ openSourceSamplesBranch=https://github.com/corda/samples/blob/release-V4
|
|||||||
jolokiaAgentVersion=1.6.1
|
jolokiaAgentVersion=1.6.1
|
||||||
detektVersion=1.0.1
|
detektVersion=1.0.1
|
||||||
tcnativeVersion=2.0.48.Final
|
tcnativeVersion=2.0.48.Final
|
||||||
commonsConfiguration2Version=2.11.0
|
|
||||||
commonsTextVersion=1.10.0
|
|
||||||
|
|
||||||
# ENT-6607 all third party version in here now
|
# ENT-6607 all third party version in here now
|
||||||
|
|
||||||
@ -56,7 +53,7 @@ assertjVersion=3.12.2
|
|||||||
slf4JVersion=2.0.12
|
slf4JVersion=2.0.12
|
||||||
log4JVersion=2.23.1
|
log4JVersion=2.23.1
|
||||||
okhttpVersion=4.12.0
|
okhttpVersion=4.12.0
|
||||||
nettyVersion=4.1.109.Final
|
nettyVersion=4.1.115.Final
|
||||||
fileuploadVersion=2.0.0-M1
|
fileuploadVersion=2.0.0-M1
|
||||||
kryoVersion=5.5.0
|
kryoVersion=5.5.0
|
||||||
kryoSerializerVersion=0.43
|
kryoSerializerVersion=0.43
|
||||||
|
Loading…
Reference in New Issue
Block a user