Merge branch 'main' into lib-toml

cwperks · Oct 11, 2024 · aaee06f · aaee06f
2 parents 221104d + 43399ff
commit aaee06f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,7 +11,8 @@ updates:
     open-pull-requests-limit: 1
     package-ecosystem: "github-actions"
     schedule:
-      interval: "weekly"
+      interval: "daily"
+      time: "21:10"
     labels:
       - "dependabot"
       - "dependencies"

diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
@@ -10,3 +10,11 @@
  */
 
 include 'reaper'
+
+dependencyResolutionManagement {
+  versionCatalogs {
+    libs {
+      from(files("../gradle/libs.versions.toml"))
+    }
+  }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -77,3 +77,6 @@ resteasy          = "6.2.4.Final"
 # opentelemetry dependencies
 opentelemetry         = "1.41.0"
 opentelemetrysemconv  = "1.27.0-alpha"
+
+#[libraries]
+#joda-time = { group = "joda-time", name = "joda-time", version.ref = "joda" }
diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
@@ -79,7 +79,7 @@ dependencies {
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
   api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
   api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
-  api "joda-time:joda-time:${versions.joda}"
+  api "joda-time:joda-time:${libs.versions.joda.get()}"
   api "org.slf4j:slf4j-api:${versions.slf4j}"
 
   runtimeOnly "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"

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:${versions.joda}"
+  api "joda-time:joda-time:${libs.versions.joda.get()}"
 
   // percentiles aggregation
   api "com.tdunning:t-digest:${versions.tdigest}"

diff --git a/settings.gradle b/settings.gradle
@@ -139,14 +139,6 @@ include projects.toArray(new String[0])
 project(':build-tools').projectDir = new File(rootProject.projectDir, 'buildSrc')
 project(':build-tools:reaper').projectDir = new File(rootProject.projectDir, 'buildSrc/reaper')
 
-//dependencyResolutionManagement {
-//  versionCatalogs {
-//    libs {
-//      from(files("gradle/libs.versions.toml"))
-//    }
-//  }
-//}
-
 project(":libs").children.each { libsProject ->
   libsProject.name = "opensearch-${libsProject.name}"
 }