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
11 changes: 9 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
cache-enabled: true
settings-servers: |
[{
"id": "central",
"id": "sonatype-cp",
"username": "${{ secrets.CENTRAL_USERNAME }}",
"password": "${{ secrets.CENTRAL_PASSWORD }}"
}]
Expand All @@ -59,7 +59,14 @@ jobs:
ssh-private-key: ${{ secrets.RELEASE_SSH_KEY }}

- name: Maven release
run: mvn --batch-mode --update-snapshots -Dmaven.resolver.transport=wagon -DskipTests -Darguments="-DskipTests" release:prepare release:perform
run: >-
mvn --batch-mode --update-snapshots -Dmaven.resolver.transport=wagon -DskipTests
-Darguments="-DskipTests -DaltDeploymentRepository=sonatype-cp::njord:
-Dnjord.autoPublish=true -Dnjord.publisher=sonatype-cp
-Dnjord.publisher.sonatype-cp.publishingType=AUTOMATIC
-Dnjord.publisher.sonatype-cp.waitForStates=true
-Dnjord.publisher.sonatype-cp.waitForStatesTimeout=PT2H"
release:prepare release:perform
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
41 changes: 18 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,15 @@

<distributionManagement>
<repository>
<id>sonatype-cp</id>
<name>ORAS Maven Central Releases</name>
<url>https://repo.maven.apache.org/maven2</url>
</repository>
<snapshotRepository>
<id>central-snapshots</id>
<name>ORAS Maven Central SNAPSHOTS</name>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</repository>
</snapshotRepository>
</distributionManagement>

<properties>
Expand Down Expand Up @@ -89,7 +94,7 @@
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
<maven-release-plugin.version>3.3.1</maven-release-plugin.version>
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
<central-publishing-maven-plugin.version>0.11.0</central-publishing-maven-plugin.version>
<njord.version>0.9.10</njord.version>
<sigstore-maven-plugin.version>2.2.0</sigstore-maven-plugin.version>
<spdx-maven-plugin.version>1.0.4</spdx-maven-plugin.version>
<maven-license-plugin.version>2.7.1</maven-license-plugin.version>
Expand Down Expand Up @@ -338,6 +343,7 @@
</repositories>

<build>

<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -514,22 +520,9 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>

<!-- 2 hours. Default is 30 minutes which is too short -->
<waitMaxTime>7200</waitMaxTime>

<!-- Default is 5 seconds, which is too short and increase risk of request failing -->
<waitPollingInterval>30</waitPollingInterval>

</configuration>
<groupId>eu.maveniverse.maven.plugins</groupId>
<artifactId>njord</artifactId>
<version>${njord.version}</version>
</plugin>
<plugin>
<groupId>dev.sigstore</groupId>
Expand Down Expand Up @@ -693,7 +686,13 @@
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
</plugins>

<extensions>
<extension>
<groupId>eu.maveniverse.maven.njord</groupId>
<artifactId>extension3</artifactId>
<version>${njord.version}</version>
</extension>
</extensions>
</build>

<profiles>
Expand Down Expand Up @@ -734,10 +733,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down
Loading