From 4f4caf7accf072beb47809ef290a7bfef1904633 Mon Sep 17 00:00:00 2001 From: Cedric Champeau Date: Wed, 23 Nov 2022 17:32:49 +0100 Subject: [PATCH] Rename `bom` -> `platform` The name "bom" was confusing with regards to the old BOM and the new "core" BOM. We will now refer to the BOM which aggregates several Micronaut modules (including core), driving releases, as the "platform BOM". Each module should have its own BOM, included in this project, and this is where the "core BOM" is included. --- bom/README.md | 4 ---- gradle.properties | 6 +++--- parent/src/pom-template.xml | 4 ++-- platform/README.md | 5 +++++ {bom => platform}/build.gradle.kts | 2 +- settings.gradle | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 bom/README.md create mode 100644 platform/README.md rename {bom => platform}/build.gradle.kts (96%) diff --git a/bom/README.md b/bom/README.md deleted file mode 100644 index db8e4208..00000000 --- a/bom/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Micronaut BOM - -This module produces the Micronaut Bill of Materials (BOM). New Entries can be added in the root `build.gradle`. - diff --git a/gradle.properties b/gradle.properties index 34ba70bc..f072535e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ projectVersion=4.0.0-SNAPSHOT -projectGroup=io.micronaut.bom +projectGroup=io.micronaut.platform -title=Micronaut BOM +title=Micronaut Platform projectDesc=Bill-Of-Materials (BOM) and Gradle version catalogs for Micronaut projectUrl=https://micronaut.io -githubSlug=micronaut-projects/micronaut-bom +githubSlug=micronaut-projects/micronaut-platform developers=Cedric Champeau # Micronaut core branch for BOM pull requests diff --git a/parent/src/pom-template.xml b/parent/src/pom-template.xml index 55a4f9ad..946b9ed9 100644 --- a/parent/src/pom-template.xml +++ b/parent/src/pom-template.xml @@ -7,8 +7,8 @@ %%version%% pom - io.micronaut.bom - micronaut-bom + io.micronaut.platform + micronaut-platform %%version%% Micronaut diff --git a/platform/README.md b/platform/README.md new file mode 100644 index 00000000..34976885 --- /dev/null +++ b/platform/README.md @@ -0,0 +1,5 @@ +# Micronaut Platform BOM + +This module produces the Micronaut Bill of Materials (Platform BOM), which aggregates other Micronaut BOMs as well as recommended third-party dependencies. + +New Entries can be added in the `gradle/libs.versions.toml` file. diff --git a/bom/build.gradle.kts b/platform/build.gradle.kts similarity index 96% rename from bom/build.gradle.kts rename to platform/build.gradle.kts index 63541992..6282ae3b 100644 --- a/bom/build.gradle.kts +++ b/platform/build.gradle.kts @@ -8,7 +8,7 @@ repositories { } micronautBom { - propertyName.set("bom") + propertyName.set("platform") extraExcludedProjects.add("parent") suppressions { diff --git a/settings.gradle b/settings.gradle index 3abb4704..2284d709 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,9 +9,9 @@ plugins { id 'io.micronaut.build.shared.settings' version '6.1.0' } -rootProject.name = 'project-bom-parent' +rootProject.name = 'project-platform-parent' -include 'bom' +include 'platform' include 'parent' micronautBuild {