From 329515497bfddb865c1a8f728bd51d7e847495a0 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 10 Oct 2024 22:34:15 -0400 Subject: [PATCH] Try w/o libraries section Signed-off-by: Craig Perkins --- buildSrc/settings.gradle | 14 +++++++------- gradle/libs.versions.toml | 4 ++-- server/build.gradle | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index 199cb8fe175f8..f220dda2d1aca 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -11,10 +11,10 @@ include 'reaper' -dependencyResolutionManagement { - versionCatalogs { - libs { - from(files("../gradle/libs.versions.toml")) - } - } -} +//dependencyResolutionManagement { +// versionCatalogs { +// libs { +// from(files("../gradle/libs.versions.toml")) +// } +// } +//} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52d7eff1512b9..5a0766c11a2ed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -78,5 +78,5 @@ resteasy = "6.2.4.Final" opentelemetry = "1.41.0" opentelemetrysemconv = "1.27.0-alpha" -[libraries] -jodatime = { group = "joda-time", name = "joda-time", version.ref = "joda" } +#[libraries] +#jodatime = { group = "joda-time", name = "joda-time", version.ref = "joda" } diff --git a/server/build.gradle b/server/build.gradle index efab2ada4a8a4..cd35745694b71 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -94,7 +94,7 @@ dependencies { api project(":libs:opensearch-cli") // time handling, remove with java 8 time - api(libs.jodatime) + api "joda-time:joda-time:${libs.versions.joda.get()}" // percentiles aggregation api "com.tdunning:t-digest:${versions.tdigest}"