Skip to content

Commit 374df1a

Browse files
committed
Attempts to migrate to Sonatype's new publishing mechanism: attempt 3; just cleanup now
Signed-off-by: Laird Nelson <[email protected]>
1 parent ba72d23 commit 374df1a

File tree

3 files changed

+8
-48
lines changed

3 files changed

+8
-48
lines changed

.github/workflows/mvn-release-prepare-perform.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ jobs:
7474
git config --global user.name 'microbean'
7575
7676
echo "::group::Running mvn prepare"
77-
77+
7878
./mvnw --batch-mode ${MVN_DEBUG} --errors ${MVN_TRANSFER_LOGGING} release:prepare
7979
-DdryRun="${DRY_RUN}"
8080
-Darguments="${MVN_TRANSFER_LOGGING}"
8181
-Dscm.url="${SCM_GIT_HTTPS_URL}"
82-
82+
8383
scm_tag="$(grep '^scm.tag=' release.properties | cut -f 2 -d =)"
8484
8585
echo "Prepared ${scm_tag}" >> "${GITHUB_STEP_SUMMARY}"
@@ -89,13 +89,13 @@ jobs:
8989
echo "::endgroup::"
9090
9191
echo "::group::Running mvn perform"
92-
92+
9393
./mvnw --batch-mode ${MVN_DEBUG} --errors ${MVN_TRANSFER_LOGGING} release:perform
94-
-Darguments="${MVN_TRANSFER_LOGGING} -Dscmpublish.dryRun=${DRY_RUN} -Dscmpublish.pubScmUrl=${SCM_GIT_HTTPS_URL} -DskipTests -DautoPublish=true -DwaitUntil=published"
94+
-Darguments="${MVN_TRANSFER_LOGGING} -Dscmpublish.dryRun=${DRY_RUN} -Dscmpublish.pubScmUrl=${SCM_GIT_HTTPS_URL} -DskipTests -DautoPublish=true -DwaitUntil=published -DwaitMaxTime=3600"
9595
-DdryRun="${DRY_RUN}"
9696
-Dgoals="process-classes,post-site,scm-publish:publish-scm,deploy"
9797
-Dscm.url="${SCM_GIT_HTTPS_URL}"
9898
9999
echo "Released ${scm_tag} successfully" >> "${GITHUB_STEP_SUMMARY}";
100-
100+
101101
echo "::endgroup::"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ as a Maven dependency:
3131
Always check https://search.maven.org/artifact/org.microbean/microbean-construct
3232
for up-to-date available versions.
3333
-->
34-
<version>0.0.14</version>
34+
<version>0.0.15</version>
3535
</dependency>
3636
```
3737

pom.xml

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@
5252
</issueManagement>
5353

5454
<distributionManagement>
55-
<!-- See https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication (superseded) -->
56-
<!-- Ostensibly no longer needed with central-publishing-maven-plugin (see https://central.sonatype.org/publish/publish-portal-maven/) -->
57-
<!--
58-
<repository>
59-
<id>sonatype-oss-repository-hosting</id>
60-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
61-
</repository>
62-
-->
6355
<site>
6456
<id>Github Pages</id>
6557
<name>microBean™ Construct Site</name>
@@ -106,10 +98,8 @@
10698
<maven.site.deploy.skip>true</maven.site.deploy.skip>
10799
<relativizeDecorationLinks>false</relativizeDecorationLinks>
108100

109-
<!-- Superseded by central-publishing-maven-plugin -->
110-
<!-- nexus-staging-maven-plugin properties -->
111-
<!-- See https://github.com/sonatype/nexus-maven-plugins/blob/0aee3defb33cb133ff536aba59b11d32a368b1e6/staging/maven-plugin/src/main/java/org/sonatype/nexus/maven/staging/AbstractStagingMojo.java#L169-L175 -->
112-
<!-- <stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes> -->
101+
<!-- central-publishing-maven-plugin properties -->
102+
<deploymentName>${project.name} v${project.version}</deploymentName>
113103

114104
<!-- Other properties -->
115105
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
@@ -206,7 +196,6 @@
206196
</plugin>
207197
<plugin>
208198
<artifactId>maven-gpg-plugin</artifactId>
209-
<!-- <version>3.1.0</version> -->
210199
<version>3.2.7</version>
211200
</plugin>
212201
<plugin>
@@ -234,7 +223,6 @@
234223
</plugin>
235224
<plugin>
236225
<artifactId>maven-release-plugin</artifactId>
237-
<!-- <version>3.0.0-M6</version> --> <!-- see https://issues.apache.org/jira/browse/MRELEASE-1038 -->
238226
<version>3.1.1</version>
239227
</plugin>
240228
<plugin>
@@ -288,27 +276,6 @@
288276
<artifactId>jandex-maven-plugin</artifactId>
289277
<version>3.3.1</version>
290278
</plugin>
291-
<!-- Superseded by central-publishing-maven-plugin -->
292-
<!--
293-
<plugin>
294-
<groupId>org.sonatype.plugins</groupId>
295-
<artifactId>nexus-staging-maven-plugin</artifactId>
296-
<version>1.6.8</version>
297-
<extensions>true</extensions>
298-
<dependencies>
299-
<dependency>
300-
<groupId>com.thoughtworks.xstream</groupId>
301-
<artifactId>xstream</artifactId>
302-
<version>1.4.15</version>
303-
</dependency>
304-
</dependencies>
305-
<configuration>
306-
<serverId>sonatype-oss-repository-hosting</serverId>
307-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
308-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
309-
</configuration>
310-
</plugin>
311-
-->
312279
<plugin>
313280
<groupId>org.sonatype.central</groupId>
314281
<artifactId>central-publishing-maven-plugin</artifactId>
@@ -360,13 +327,6 @@
360327
</systemPropertyVariables>
361328
</configuration>
362329
</plugin>
363-
<!-- Superseded by central-publishing-maven-plugin -->
364-
<!--
365-
<plugin>
366-
<groupId>org.sonatype.plugins</groupId>
367-
<artifactId>nexus-staging-maven-plugin</artifactId>
368-
</plugin>
369-
-->
370330
<plugin>
371331
<groupId>org.sonatype.central</groupId>
372332
<artifactId>central-publishing-maven-plugin</artifactId>

0 commit comments

Comments
 (0)