From 07e7d1bd4b46cf5cfe728c21c7210131ff708ea6 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 10 Oct 2024 22:26:04 -0400 Subject: [PATCH 1/5] Use libraries Signed-off-by: Craig Perkins --- gradle/libs.versions.toml | 4 ++-- server/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f72eacad56b50..52d7eff1512b9 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] -#joda-time = { 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 cd35745694b71..efab2ada4a8a4 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 "joda-time:joda-time:${libs.versions.joda.get()}" + api(libs.jodatime) // percentiles aggregation api "com.tdunning:t-digest:${versions.tdigest}" From 0103e3206ac2951a38864899d371ced59c0f02e3 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 10 Oct 2024 22:28:08 -0400 Subject: [PATCH 2/5] Downgrade purposefully Signed-off-by: Craig Perkins --- 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 52d7eff1512b9..0db9e62214dd0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ hdrhistogram = "2.2.2" jna = "5.13.0" netty = "4.1.114.Final" -joda = "2.12.7" +joda = "2.12.4" # project reactor reactor_netty = "1.1.22" From fc10d68796e33f179a65271a8d49f0dd7e81fde7 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 10 Oct 2024 22:31:33 -0400 Subject: [PATCH 3/5] Add mavenCentral Signed-off-by: Craig Perkins --- build.gradle | 1 + gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d35a5898de7d0..042bad3616fd7 100644 --- a/build.gradle +++ b/build.gradle @@ -120,6 +120,7 @@ subprojects { } } repositories { + mavenCentral() maven { name = 'test' url = "${rootProject.buildDir}/local-test-repo" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0db9e62214dd0..52d7eff1512b9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ hdrhistogram = "2.2.2" jna = "5.13.0" netty = "4.1.114.Final" -joda = "2.12.4" +joda = "2.12.7" # project reactor reactor_netty = "1.1.22" From 329515497bfddb865c1a8f728bd51d7e847495a0 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 10 Oct 2024 22:34:15 -0400 Subject: [PATCH 4/5] 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}" From fc78a4c5c3e02c8dabbacf33145c2579b9e69c2e Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Thu, 10 Oct 2024 22:36:07 -0400 Subject: [PATCH 5/5] reinstate Signed-off-by: Craig Perkins --- gradle/libs.versions.toml | 4 ++-- server/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5a0766c11a2ed..52d7eff1512b9 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 cd35745694b71..efab2ada4a8a4 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 "joda-time:joda-time:${libs.versions.joda.get()}" + api(libs.jodatime) // percentiles aggregation api "com.tdunning:t-digest:${versions.tdigest}"