Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ jobs:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
# SONATYPE_USER=<sonatype account token>
# - 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=<password to sonatype account token>
Expand Down
2 changes: 1 addition & 1 deletion .settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<passphrase>${env.GPG_PASSPHRASE}</passphrase>
</server>
<server>
<id>ossrh</id>
<id>central</id>
<username>${env.SONATYPE_USER}</username>
<password>${env.SONATYPE_PASSWORD}</password>
</server>
Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.

Expand Down
19 changes: 7 additions & 12 deletions brave-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,9 @@

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>central</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<issueManagement>
Expand Down Expand Up @@ -276,14 +272,13 @@
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>
</configuration>
</plugin>

Expand Down
34 changes: 11 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<central-publishing-maven-plugin.version>0.10.0</central-publishing-maven-plugin.version>
</properties>

<modules>
Expand All @@ -170,13 +170,9 @@

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<id>central</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<issueManagement>
Expand Down Expand Up @@ -329,9 +325,9 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -666,21 +662,13 @@
<build>
<plugins>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<!-- Increase timeouts due to recent load related failures described in OSSRH-76308:

A message body reader for Java class com.sonatype.nexus.staging.api.dto.StagingProfileRepositoryDTO,
and Java type class com.sonatype.nexus.staging.api.dto.StagingProfileRepositoryDTO,
and MIME media type text/html was not found -> [Help 1]
-->
<stagingProgressPauseDurationSeconds>20</stagingProgressPauseDurationSeconds>
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>
</configuration>
</plugin>

Expand Down
Loading