From 73280fadd05c52e801b277f70bcc03f10a069aad Mon Sep 17 00:00:00 2001 From: Jonatan Ivanov Date: Tue, 4 Feb 2025 16:44:23 -0800 Subject: [PATCH] Publish milestones to Maven Central (#5892) Closes gh-5891 --- README.md | 2 +- build.gradle | 8 -------- docs/modules/ROOT/pages/installing.adoc | 3 +-- docs/src/test/resources/docs-generator-build.gradle | 3 +-- docs/src/test/resources/docs-generator-pom.xml | 8 -------- gradle/deploy.sh | 4 ++-- 6 files changed, 5 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 42c32ec262..bdac742b22 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ dependencies { ## Milestone releases -Starting with the 1.15.0-M2 release, milestone releases and release candidates will be publish to Maven Central. +Starting with the 1.15.0-M2 release, milestone releases and release candidates will be published to Maven Central. Note that milestone releases are for testing purposes and are not intended for production use. ## Documentation diff --git a/build.gradle b/build.gradle index 5bc13d7973..9803866127 100644 --- a/build.gradle +++ b/build.gradle @@ -262,14 +262,6 @@ subprojects { password findProperty('SNAPSHOT_REPO_PASSWORD') } } - maven { - name = 'Milestone' - url = 'https://repo.spring.io/milestone' - credentials { - username findProperty('MILESTONE_REPO_USER') - password findProperty('MILESTONE_REPO_PASSWORD') - } - } } } diff --git a/docs/modules/ROOT/pages/installing.adoc b/docs/modules/ROOT/pages/installing.adoc index a14aec350e..fa26b55d4e 100644 --- a/docs/modules/ROOT/pages/installing.adoc +++ b/docs/modules/ROOT/pages/installing.adoc @@ -70,6 +70,5 @@ Every successful https://app.circleci.com/pipelines/github/micrometer-metrics/mi == Milestones Milestone releases are made available for early testing purposes and are not intended for production use. -Milestone releases are published to https://repo.spring.io/milestone. -To use milestone releases, include that as a Maven repository in your build configuration. +Milestone releases are published to Maven Central. Milestones are marked as "`pre-releases`" on GitHub, and the version has a suffix, such as `-M1` or `-RC1` (milestone 1 or release candidate 1, respectively). diff --git a/docs/src/test/resources/docs-generator-build.gradle b/docs/src/test/resources/docs-generator-build.gradle index 0eb0e1fc6f..90b076a79f 100644 --- a/docs/src/test/resources/docs-generator-build.gradle +++ b/docs/src/test/resources/docs-generator-build.gradle @@ -16,8 +16,7 @@ // tag::main[] repositories { maven { url 'https://repo.spring.io/snapshot' } // for snapshots - maven { url 'https://repo.spring.io/milestone' } // for milestones - mavenCentral() // for GA + mavenCentral() // for GA and milestones } ext { diff --git a/docs/src/test/resources/docs-generator-pom.xml b/docs/src/test/resources/docs-generator-pom.xml index 1df612e0fc..7c14a4f15b 100644 --- a/docs/src/test/resources/docs-generator-pom.xml +++ b/docs/src/test/resources/docs-generator-pom.xml @@ -78,13 +78,5 @@ false - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - diff --git a/gradle/deploy.sh b/gradle/deploy.sh index 7aeb874e28..61f56867b9 100755 --- a/gradle/deploy.sh +++ b/gradle/deploy.sh @@ -14,11 +14,11 @@ elif [ $CIRCLE_TAG ]; then echo -e "Publishing Release => Branch ['$CIRCLE_BRANCH'] Tag ['$CIRCLE_TAG']" case "$CIRCLE_TAG" in *-M*) - ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true -Prelease.stage=milestone candidate publishNebulaPublicationToMilestoneRepository $SWITCHES + ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true -Prelease.stage=milestone candidate publishNebulaPublicationToMavenCentralRepository closeAndReleaseMavenCentralStagingRepository $SWITCHES ;; *-RC*) # -Prelease.stage=milestone instead of rc (should be rc), probably related to this bug: https://github.com/nebula-plugins/nebula-release-plugin/issues/213 - ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true -Prelease.stage=milestone candidate publishNebulaPublicationToMilestoneRepository $SWITCHES + ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true -Prelease.stage=milestone candidate publishNebulaPublicationToMavenCentralRepository closeAndReleaseMavenCentralStagingRepository $SWITCHES ;; *) ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true -Prelease.stage=final final publishNebulaPublicationToMavenCentralRepository closeAndReleaseMavenCentralStagingRepository $SWITCHES