Merge branch 'main' into lib-toml

cwperks · Oct 11, 2024 · 5a8f3d3 · 5a8f3d3
2 parents aaee06f + fc78a4c
commit 5a8f3d3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git 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/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
@@ -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
@@ -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}"