ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #7252 from corda/cc/release/os/4.10/ent-7034/upgrade_apache_commons_text

Browse Source 
ENT-7034 - Upgraded shiro and apache commons-text, to address security issues.
This commit is contained in:
Adel El-Beik 2022-10-18 09:43:30 +01:00 committed by GitHub
commit 4638df0a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -122,6 +122,7 @@ buildscript {
ext.detekt_version = constants.getProperty('detektVersion')
ext.docker_java_version = constants.getProperty("dockerJavaVersion")
ext.commons_configuration2_version = constants.getProperty("commonsConfiguration2Version")
ext.commons_text_version = constants.getProperty("commonsTextVersion")
if (JavaVersion.current().isJava8()) {
ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsJava8Version")
ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeJava8Version")
@ -455,8 +456,12 @@ allprojects {
}
}
if (details.requested.group == 'org.apache.commons' && details.requested.name == "commons-configuration2") {
details.useVersion commons_configuration2_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
}
}
}

3
constants.properties
View File

@ -39,6 +39,7 @@ jolokiaAgentVersion=1.6.1
detektVersion=1.0.1
tcnativeVersion=2.0.48.Final
commonsConfiguration2Version=2.8.0
commonsTextVersion=1.10.0
# ENT-6607 all third party version in here now
@ -83,7 +84,7 @@ eddsaVersion=0.3.0
dependencyCheckerVersion=5.2.0
commonsCollectionsVersion=4.3
beanutilsVersion=1.9.4
shiroVersion=1.9.1
shiroVersion=1.10.0
hikariVersion=3.3.1
liquibaseVersion=3.6.3
dockerComposeRuleVersion=1.5.0