From ffbf33f7113d6c9da0c7d8c498857c2ae97fc163 Mon Sep 17 00:00:00 2001 From: Joseph Zuniga-Daly Date: Wed, 8 May 2024 11:32:29 +0100 Subject: [PATCH 1/3] CORE-15310: Update slf4j to v2 --- corda-api/build.gradle | 4 +--- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/corda-api/build.gradle b/corda-api/build.gradle index c59779b69e..b07515d07a 100644 --- a/corda-api/build.gradle +++ b/corda-api/build.gradle @@ -34,9 +34,7 @@ dependencies { } } api(libs.bundles.osgi) - api(libs.slf4j) { - because 'Corda 5.2 only supports SLF4J 1.x' - } + api(libs.slf4j) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3b018da0e5..47e2b9a170 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlinVersion = "1.8.21" # Logging -slf4jVersion = { strictly = "1.7.36" } +slf4jVersion = "2.0.12" # Main implementation dependencies avroVersion = "1.11.3" From 717b29a2ba563eae031092b90f9d3865f3aae26b Mon Sep 17 00:00:00 2001 From: Filipe Oliveira Date: Thu, 6 Jun 2024 10:46:41 +0100 Subject: [PATCH 2/3] Updated the `slf4jVersion` to match the one used in the runtime-os. --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 47e2b9a170..cae92f18d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ kotlinVersion = "1.8.21" # Logging -slf4jVersion = "2.0.12" +slf4jVersion = "2.0.13" # Main implementation dependencies avroVersion = "1.11.3" From fb12ee970202d9aa7932827ee0cda5aa34abf6fa Mon Sep 17 00:00:00 2001 From: Filipe Oliveira Date: Thu, 6 Jun 2024 10:47:37 +0100 Subject: [PATCH 3/3] Updated the corda api revision number. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2472247473..9a90ea9303 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ cordaProductVersion = 5.3.0 # NOTE: update this each time this module contains a breaking change ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to ## a per module property in which case module versions can change independently. -cordaApiRevision = 13 +cordaApiRevision = 14 # Main kotlin.stdlib.default.dependency = false