From abcb55d3700a295880633ce61517d9fc9bbdc18a Mon Sep 17 00:00:00 2001 From: chriscochrane Date: Wed, 4 Dec 2024 15:04:20 +0000 Subject: [PATCH 1/2] Dependency updates --- build.gradle | 6 +++--- constants.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 49ecb40285..96b0ceb8c7 100644 --- a/build.gradle +++ b/build.gradle @@ -501,9 +501,9 @@ allprojects { details.useVersion commons_text_version } } - if (details.requested.group == 'org.yaml' && details.requested.name == 'snakeyaml') { - details.useVersion snake_yaml_version - } +// if (details.requested.group == 'org.yaml' && details.requested.name == 'snakeyaml') { +// details.useVersion snake_yaml_version +// } } dependencySubstitution { diff --git a/constants.properties b/constants.properties index e0b739b370..4dc46d8dc2 100644 --- a/constants.properties +++ b/constants.properties @@ -51,7 +51,7 @@ capsuleVersion=1.0.3 asmVersion=7.1 artemisVersion=2.19.1 # TODO Upgrade Jackson only when corda is using kotlin 1.3.10 -jacksonVersion=2.13.5 +jacksonVersion=2.14.0 jacksonKotlinVersion=2.9.7 jettyVersion=9.4.56.v20240826 jerseyVersion=2.25 From 316119b36818edc5dc9cae9d6db250b93fc43c03 Mon Sep 17 00:00:00 2001 From: chriscochrane Date: Fri, 6 Dec 2024 11:08:55 +0000 Subject: [PATCH 2/2] Removed superfluous force-override --- build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.gradle b/build.gradle index 96b0ceb8c7..b4f3e793ab 100644 --- a/build.gradle +++ b/build.gradle @@ -497,13 +497,8 @@ allprojects { 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 -// } } dependencySubstitution {