diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 7c5e7f71..41704b49 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -49,8 +49,8 @@ jobs: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} # SONATYPE_USER= # * deploys snapshots and releases to Sonatype - # * needs access to io.zipkin via 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 ab04d7f5..4a802a6e 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 c6157559..bb9c490b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Gitter chat](http://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg)](https://gitter.im/openzipkin/zipkin) [![Build Status](https://github.com/openzipkin/zipkin-reporter-java/workflows/test/badge.svg)](https://github.com/openzipkin/zipkin/actions?query=workflow%3Atest) -[![Maven Central](https://img.shields.io/maven-central/v/io.zipkin.reporter2/zipkin-reporter.svg)](https://search.maven.org/search?q=g:io.zipkin.reporter2%20AND%20a:zipkin-reporter) +[![Maven Central](https://img.shields.io/maven-central/v/io.zipkin.reporter2/zipkin-reporter.svg)](https://central.sonatype.com/search?q=zipkin-reporter&namespace=io.zipkin.reporter2) Zipkin Reporter buffers and sends trace data collected from tracer libraries to a Zipkin compatible backend. @@ -158,11 +158,10 @@ All artifacts publish to the group ID "io.zipkin.zipkin.reporter2". We use a com release version for all components. ### Library Releases -Releases 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.zipkin.reporter2%22) +Releases are at [Maven Central](https://central.sonatype.com/search?q=zipkin-reporter&namespace=io.zipkin.reporter2) ### Library Snapshots -Snapshots are uploaded to [Sonatype](https://oss.sonatype.org/content/repositories/snapshots) after +Snapshots are uploaded to [Sonatype](https://central.sonatype.com/repository/maven-snapshots/) after commits to master. ### Version alignments diff --git a/RELEASE.md b/RELEASE.md index 4fcb24ea..780fc989 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 Notes: @@ -37,7 +37,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/bom/pom.xml b/bom/pom.xml index 469f2fab..47ea1c2a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -62,13 +62,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/ - @@ -142,14 +138,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.10.0 true - ossrh - https://oss.sonatype.org/ - true + central + true diff --git a/build-bin/mlc_config.json b/build-bin/mlc_config.json index 5c19fcd0..420d88ae 100644 --- a/build-bin/mlc_config.json +++ b/build-bin/mlc_config.json @@ -1,7 +1,4 @@ { "ignorePatterns": [ - { - "pattern": "https://oss.sonatype.org/content/repositories/snapshots" - } ] } diff --git a/pom.xml b/pom.xml index 2353fda3..28585229 100755 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ 3.1.1 3.3.1 3.5.3 - 1.7.0 + 0.10.0 Zipkin Reporter (Parent) @@ -128,13 +128,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/ - @@ -291,9 +287,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} @@ -578,21 +574,12 @@ - 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