diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e6544b668..18a960bdc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -58,8 +58,8 @@ jobs: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} # SONATYPE_USER= # - deploys snapshots and releases to Sonatype - # - needs access to io.zipkin via https://issues.sonatype.org/browse/OSSRH-16669 - # - generate via https://oss.sonatype.org/#profile;User%20Token + # - needs access to io.zipkin namespace + # - generate token at https://central.sonatype.com # - referenced in .settings.xml SONATYPE_USER: ${{ secrets.SONATYPE_USER }} # SONATYPE_PASSWORD= diff --git a/.settings.xml b/.settings.xml index ab04d7f58..4a802a6eb 100644 --- a/.settings.xml +++ b/.settings.xml @@ -15,7 +15,7 @@ ${env.GPG_PASSPHRASE} - ossrh + central ${env.SONATYPE_USER} ${env.SONATYPE_PASSWORD} diff --git a/README.md b/README.md index 888c4b1ed..c5244017e 100644 --- a/README.md +++ b/README.md @@ -74,14 +74,11 @@ All artifacts publish to the group ID "io.zipkin.brave". We use a common release version for all components. ### Library Releases -Snapshots are uploaded to -[Sonatype](https://oss.sonatype.org/content/repositories/releases) which -synchronizes with -[Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.zipkin.brave%22) +Releases are at [Maven Central](https://central.sonatype.com/search?q=brave&namespace=io.zipkin.brave) ### Library Snapshots Snapshots are uploaded to -[Sonatype](https://oss.sonatype.org/content/repositories/snapshots) after +[Sonatype](https://central.sonatype.com/repository/maven-snapshots/) after commits to master. ### Version alignments diff --git a/RELEASE.md b/RELEASE.md index f91d613ec..d5c10c36d 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -24,7 +24,7 @@ This repo uses semantic versions. Please keep this in mind when choosing version which creates commits, `MAJOR.MINOR.PATCH` tag, and increments the version (maven-release-plugin). The `MAJOR.MINOR.PATCH` tag triggers [`build-bin/deploy`](build-bin/deploy), which does the following: - * Publishes jars to https://oss.sonatype.org/content/repositories/releases [`build-bin/maven/maven_deploy`](build-bin/maven/maven_deploy) + * Publishes jars to Sonatype [`build-bin/maven/maven_deploy`](build-bin/maven/maven_deploy) * Later, the same jars synchronize to Maven Central * Publishes Javadoc to https://zipkin.io/brave into a versioned subdirectory @@ -38,7 +38,7 @@ look at the notes in [.github/workflows/deploy.yml] and check the [org secrets]( ### Troubleshooting invalid credentials -If you receive a '401 unauthorized' failure from OSSRH, it is likely +If you receive a '401 unauthorized' failure from Sonatype, it is likely `SONATYPE_USER` or `SONATYPE_PASSWORD` entries are invalid, or possibly the user associated with them does not have rights to upload. diff --git a/brave-bom/pom.xml b/brave-bom/pom.xml index 664e2867f..e386ca52a 100644 --- a/brave-bom/pom.xml +++ b/brave-bom/pom.xml @@ -56,13 +56,9 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots/ - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - @@ -276,14 +272,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin true - ossrh - https://oss.sonatype.org/ - true + central + true + published diff --git a/pom.xml b/pom.xml index f7a6ca1bf..dc36715af 100755 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 3.1.1 3.3.1 3.5.3 - 1.7.0 + 0.10.0 @@ -170,13 +170,9 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots/ - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - @@ -329,9 +325,9 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} @@ -666,21 +662,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin + org.sonatype.central + central-publishing-maven-plugin true - ossrh - https://oss.sonatype.org/ - - 20 - 30 - true + central + true + published