Apache Lucene open-source search software
Move version catalog and enable dependabot scanning of gradle dependencies (#14495)
Dawid Weiss7ed18dc42569
diff --git a/.github/dependabot.yml b/.github/dependabot.ymlindex 201fc2f826a..c8f43ac66f3 100644--- a/.github/dependabot.yml+++ b/.github/dependabot.yml@@ -20,3 +20,13 @@ updates:prefix: build(deps)labels:- dependencies++ - package-ecosystem: gradle+ directory: /+ schedule:+ interval: weekly+ day: tuesday+ commit-message:+ prefix: deps(java)+ labels: [dependencies]+ open-pull-requests-limit: 1diff --git a/build-tools/build-infra/settings.gradle b/build-tools/build-infra/settings.gradleindex 92ad0654e87..7bd479fc167 100644--- a/build-tools/build-infra/settings.gradle+++ b/build-tools/build-infra/settings.gradle@@ -20,7 +20,7 @@ rootProject.name = 'build-infra'dependencyResolutionManagement {versionCatalogs {deps {- from(files('../../versions.toml'))+ from(files('../../gradle/libs.versions.toml'))}}}diff --git a/build-tools/missing-doclet/settings.gradle b/build-tools/missing-doclet/settings.gradleindex 2c272500fa6..cf029b9d81f 100644--- a/build-tools/missing-doclet/settings.gradle+++ b/build-tools/missing-doclet/settings.gradle@@ -18,7 +18,7 @@dependencyResolutionManagement {versionCatalogs {deps {- from(files('../../versions.toml'))+ from(files('../../gradle/libs.versions.toml'))}}}diff --git a/versions.toml b/gradle/libs.versions.tomlsimilarity index 100%rename from versions.tomlrename to gradle/libs.versions.tomldiff --git a/gradle/validation/dependencies.gradle b/gradle/validation/dependencies.gradleindex 5d9cc2e8d4a..aca1808ee74 100644--- a/gradle/validation/dependencies.gradle+++ b/gradle/validation/dependencies.gradle@@ -66,7 +66,7 @@ configure(rootProject) {versionCatalogs {deps {- catalogFile = file("versions.toml")+ catalogFile = file("gradle/libs.versions.toml")}}}diff --git a/help/dependencies.txt b/help/dependencies.txtindex 514cb946097..572406c514c 100644--- a/help/dependencies.txt+++ b/help/dependencies.txt@@ -35,7 +35,8 @@ Adding a library dependency---------------------------Lucene dependencies and their versions are managed globally using version-catalogs (in versions.toml) [https://docs.gradle.org/current/userguide/platforms.html].+catalogs (in gradle/libs.versions.toml)+[https://docs.gradle.org/current/userguide/platforms.html].Let's say we wish to add a dependency on library "foo.bar:baz" inversion 1.2 to :lucene:core. Let's assume this library is only@@ -61,7 +62,7 @@ baz = "1.2"baz = { module = "foo.bar:baz", version.ref = "baz" }The version defined in the "versions" section is the preferred version of the library-we wish to use. Finally, run tidy to sort all entries in versions.toml:+we wish to use. Finally, run tidy to sort all entries in libs.versions.toml:gradlew tidydiff --git a/settings.gradle b/settings.gradleindex 8543bab1619..f47db3b50c1 100644--- a/settings.gradle+++ b/settings.gradle@@ -33,7 +33,7 @@ plugins {dependencyResolutionManagement {versionCatalogs {deps {- from(files('versions.toml'))+ from(files('gradle/libs.versions.toml'))}}}