Skip to content

Commit 78d443a

Browse files
ljnelsonljnelson
committed
Upgrades workflows. Strips spurious imports. General cleanup.
Signed-off-by: Laird Nelson <ljnelson@gmail.com>
1 parent 17d3ffc commit 78d443a

File tree

10 files changed

+120
-234
lines changed

10 files changed

+120
-234
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ jobs:
2424
steps:
2525
- id: 'checkout'
2626
name: 'Step: Check Out Project'
27-
uses: 'actions/checkout@v4'
27+
uses: 'actions/checkout@v6'
2828
with:
2929
fetch-depth: 1
3030
persist-credentials: false
3131
- id: 'setup-java'
3232
name: 'Step: Set Up Java and Maven'
33-
uses: 'actions/setup-java@v4'
33+
uses: 'actions/setup-java@v5'
3434
with:
3535
cache: 'maven'
3636
distribution: 'temurin'
3737
gpg-passphrase: 'GPG_PASSPHRASE'
3838
gpg-private-key: '${{ secrets.GPG_PRIVATE_KEY }}'
39-
java-version: '23'
40-
mvn-toolchain-id: 'Temurin 23'
39+
java-version: '25'
40+
mvn-toolchain-id: 'Temurin 25'
4141
mvn-toolchain-vendor: 'openjdk' # see ../../pom.xml
4242
server-id: 'sonatype-oss-repository-hosting' # see https://github.com/microbean/microbean-parent/blob/master/pom.xml#L38
4343
server-password: 'SONATYPE_OSSRH_PASSWORD'

‎.github/workflows/mvn-verify.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ jobs:
1212
steps:
1313
- id: 'checkout'
1414
name: 'Step: Checkout'
15-
uses: 'actions/checkout@v4'
15+
uses: 'actions/checkout@v6'
1616
with:
1717
fetch-depth: 1
1818
persist-credentials: false
1919
- id: 'setup-java'
2020
name: 'Step: Set Up Java and Maven'
21-
uses: 'actions/setup-java@v4'
21+
uses: 'actions/setup-java@v5'
2222
with:
2323
cache: 'maven'
2424
distribution: 'temurin'
25-
java-version: '23'
26-
mvn-toolchain-id: 'Temurin 23'
25+
java-version: '25'
26+
mvn-toolchain-id: 'Temurin 25'
2727
mvn-toolchain-vendor: 'openjdk' # see ../../pom.xml
2828
- id: 'mvn-verify'
2929
name: 'Step: Maven Verify'

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependency:
2828
<groupId>org.microbean</groupId>
2929
<artifactId>microbean-proxy</artifactId>
3030
<!-- Always check https://central.sonatype.com/artifact/org.microbean/microbean-proxy for up-to-date available versions. -->
31-
<version>0.0.2</version>
31+
<version>0.0.3</version>
3232
</dependency>
3333
```
3434

‎pom.xml‎

Lines changed: 30 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,11 @@
5252
</issueManagement>
5353

5454
<distributionManagement>
55-
<repository>
56-
<id>sonatype-oss-repository-hosting</id>
57-
<!-- See https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication -->
58-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
59-
</repository>
6055
<site>
6156
<id>Github Pages</id>
6257
<name>microBean™ Proxy Site</name>
6358
<url>https://microbean.github.io/microbean-proxy/</url>
6459
</site>
65-
<snapshotRepository>
66-
<id>sonatype-oss-repository-hosting</id>
67-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
68-
</snapshotRepository>
6960
</distributionManagement>
7061

7162
<properties>
@@ -89,7 +80,6 @@
8980
<releaseProfiles>deployment</releaseProfiles>
9081
<scmCommentPrefix>[maven-release-plugin] [skip ci]</scmCommentPrefix>
9182
<tagNameFormat>v@{project.version}</tagNameFormat>
92-
<useReleaseProfile>false</useReleaseProfile>
9383

9484
<!-- maven-scm-publish-plugin properties;
9585
see https://maven.apache.org/plugins/maven-scm-publish-plugin/publish-scm-mojo.html -->
@@ -101,12 +91,8 @@
10191
<maven.site.deploy.skip>true</maven.site.deploy.skip>
10292
<relativizeDecorationLinks>false</relativizeDecorationLinks>
10393

104-
<!-- nexus-staging-maven-plugin properties -->
105-
<!-- 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 -->
106-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
107-
<!-- <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl> -->
108-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
109-
<stagingProgressTimeoutMinutes>10</stagingProgressTimeoutMinutes>
94+
<!-- central-publishing-maven-plugin properties -->
95+
<deploymentName>${project.name} v${project.version}</deploymentName>
11096

11197
<!-- Other properties -->
11298
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
@@ -125,7 +111,7 @@
125111
<dependency>
126112
<groupId>org.junit</groupId>
127113
<artifactId>junit-bom</artifactId>
128-
<version>5.12.2</version>
114+
<version>6.0.1</version>
129115
<type>pom</type>
130116
<scope>import</scope>
131117
</dependency>
@@ -135,19 +121,19 @@
135121
<dependency>
136122
<groupId>org.microbean</groupId>
137123
<artifactId>microbean-attributes</artifactId>
138-
<version>0.0.2</version>
124+
<version>0.0.5</version>
139125
</dependency>
140126

141127
<dependency>
142128
<groupId>org.microbean</groupId>
143129
<artifactId>microbean-bean</artifactId>
144-
<version>0.0.18</version>
130+
<version>0.0.20</version>
145131
</dependency>
146132

147133
<dependency>
148134
<groupId>org.microbean</groupId>
149135
<artifactId>microbean-construct</artifactId>
150-
<version>0.0.10</version>
136+
<version>0.0.18</version>
151137
</dependency>
152138

153139
</dependencies>
@@ -194,11 +180,11 @@
194180
<plugins>
195181
<plugin>
196182
<artifactId>maven-antrun-plugin</artifactId>
197-
<version>3.1.0</version>
183+
<version>3.2.0</version>
198184
</plugin>
199185
<plugin>
200186
<artifactId>maven-assembly-plugin</artifactId>
201-
<version>3.7.1</version>
187+
<version>3.8.0</version>
202188
</plugin>
203189
<plugin>
204190
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -308,13 +294,13 @@
308294
<dependency>
309295
<groupId>com.puppycrawl.tools</groupId>
310296
<artifactId>checkstyle</artifactId>
311-
<version>10.23.1</version>
297+
<version>12.1.2</version>
312298
</dependency>
313299
</dependencies>
314300
</plugin>
315301
<plugin>
316302
<artifactId>maven-clean-plugin</artifactId>
317-
<version>3.4.1</version>
303+
<version>3.5.0</version>
318304
<configuration>
319305
<filesets>
320306
<fileset>
@@ -329,7 +315,7 @@
329315
</plugin>
330316
<plugin>
331317
<artifactId>maven-compiler-plugin</artifactId>
332-
<version>3.14.0</version>
318+
<version>3.14.1</version>
333319
<configuration>
334320
<compilerArgs>
335321
<arg>-Xlint:all</arg>
@@ -339,32 +325,31 @@
339325
</plugin>
340326
<plugin>
341327
<artifactId>maven-dependency-plugin</artifactId>
342-
<version>3.8.1</version>
328+
<version>3.9.0</version>
343329
</plugin>
344330
<plugin>
345331
<artifactId>maven-deploy-plugin</artifactId>
346332
<version>3.1.4</version>
347333
</plugin>
348334
<plugin>
349335
<artifactId>maven-enforcer-plugin</artifactId>
350-
<version>3.5.0</version>
336+
<version>3.6.2</version>
351337
</plugin>
352338
<plugin>
353339
<artifactId>maven-gpg-plugin</artifactId>
354-
<!-- <version>3.1.0</version> -->
355-
<version>3.2.7</version>
340+
<version>3.2.8</version>
356341
</plugin>
357342
<plugin>
358343
<artifactId>maven-install-plugin</artifactId>
359344
<version>3.1.4</version>
360345
</plugin>
361346
<plugin>
362347
<artifactId>maven-jar-plugin</artifactId>
363-
<version>3.4.2</version>
348+
<version>3.5.0</version>
364349
</plugin>
365350
<plugin>
366351
<artifactId>maven-javadoc-plugin</artifactId>
367-
<version>3.11.2</version>
352+
<version>3.12.0</version>
368353
<configuration>
369354
<docfilessubdirs>true</docfilessubdirs>
370355
<tags>
@@ -396,16 +381,15 @@
396381
</plugin>
397382
<plugin>
398383
<artifactId>maven-release-plugin</artifactId>
399-
<!-- <version>3.0.0-M6</version> --> <!-- see https://issues.apache.org/jira/browse/MRELEASE-1038 -->
400-
<version>3.1.1</version>
384+
<version>3.3.1</version>
401385
</plugin>
402386
<plugin>
403387
<artifactId>maven-resources-plugin</artifactId>
404-
<version>3.3.1</version>
388+
<version>3.4.0</version>
405389
</plugin>
406390
<plugin>
407391
<artifactId>maven-scm-plugin</artifactId>
408-
<version>2.1.0</version>
392+
<version>2.2.1</version>
409393
</plugin>
410394
<plugin>
411395
<artifactId>maven-scm-publish-plugin</artifactId>
@@ -417,7 +401,7 @@
417401
</plugin>
418402
<plugin>
419403
<artifactId>maven-source-plugin</artifactId>
420-
<version>3.3.1</version>
404+
<version>3.4.0</version>
421405
<executions>
422406
<execution>
423407
<id>attach-sources</id>
@@ -429,7 +413,7 @@
429413
</plugin>
430414
<plugin>
431415
<artifactId>maven-surefire-plugin</artifactId>
432-
<version>3.5.3</version>
416+
<version>3.5.4</version>
433417
</plugin>
434418
<plugin>
435419
<artifactId>maven-toolchains-plugin</artifactId>
@@ -438,35 +422,25 @@
438422
<plugin>
439423
<groupId>com.github.spotbugs</groupId>
440424
<artifactId>spotbugs-maven-plugin</artifactId>
441-
<version>4.9.3.0</version>
425+
<version>4.9.8.2</version>
442426
</plugin>
443427
<plugin>
444428
<groupId>org.codehaus.mojo</groupId>
445429
<artifactId>versions-maven-plugin</artifactId>
446-
<version>2.18.0</version>
430+
<version>2.20.1</version>
447431
</plugin>
448432
<plugin>
449433
<groupId>io.smallrye</groupId>
450434
<artifactId>jandex-maven-plugin</artifactId>
451-
<version>3.3.0</version>
435+
<version>3.5.3</version>
452436
</plugin>
453437
<plugin>
454-
<groupId>org.sonatype.plugins</groupId>
455-
<artifactId>nexus-staging-maven-plugin</artifactId>
456-
<version>1.6.13</version>
438+
<groupId>org.sonatype.central</groupId>
439+
<artifactId>central-publishing-maven-plugin</artifactId>
440+
<version>0.9.0</version>
457441
<extensions>true</extensions>
458-
<dependencies>
459-
<!-- https://issues.sonatype.org/browse/NEXUS-26993?focusedCommentId=1098136&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-1098136 -->
460-
<dependency>
461-
<groupId>com.thoughtworks.xstream</groupId>
462-
<artifactId>xstream</artifactId>
463-
<version>1.4.20</version>
464-
</dependency>
465-
</dependencies>
466442
<configuration>
467-
<serverId>sonatype-oss-repository-hosting</serverId>
468-
<nexusUrl>${nexusUrl}</nexusUrl>
469-
<autoReleaseAfterClose>${autoReleaseAfterClose}</autoReleaseAfterClose>
443+
<publishingServerId>central.sonatype.com</publishingServerId>
470444
</configuration>
471445
</plugin>
472446
</plugins>
@@ -512,8 +486,8 @@
512486
</configuration>
513487
</plugin>
514488
<plugin>
515-
<groupId>org.sonatype.plugins</groupId>
516-
<artifactId>nexus-staging-maven-plugin</artifactId>
489+
<groupId>org.sonatype.central</groupId>
490+
<artifactId>central-publishing-maven-plugin</artifactId>
517491
</plugin>
518492
</plugins>
519493

‎src/main/java/org/microbean/proxy/AbstractProxier.java‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
*/
1414
package org.microbean.proxy;
1515

16-
import java.util.Objects;
17-
1816
import java.util.function.Supplier;
1917

2018
import org.microbean.construct.Domain;
2119

20+
import static java.util.Objects.requireNonNull;
21+
2222
/**
2323
* An abstract base class for subclassses that create {@linkplain Proxy proxies}.
2424
*
@@ -29,8 +29,20 @@
2929
public abstract sealed class AbstractProxier<PS extends ProxySpecification>
3030
permits AbstractReflectiveProxier, AbstractToolkitProxier {
3131

32+
33+
/*
34+
* Instance fields.
35+
*/
36+
37+
3238
private final Domain domain;
3339

40+
41+
/*
42+
* Constructors.
43+
*/
44+
45+
3446
/**
3547
* Creates a new {@link AbstractProxier} implementation.
3648
*
@@ -39,9 +51,15 @@ public abstract sealed class AbstractProxier<PS extends ProxySpecification>
3951
* @exception NullPointerException if {@code domain} is {@code null}
4052
*/
4153
protected AbstractProxier(final Domain domain) {
42-
this.domain = Objects.requireNonNull(domain, "domain");
54+
this.domain = requireNonNull(domain, "domain");
4355
}
4456

57+
58+
/*
59+
* Instance methods.
60+
*/
61+
62+
4563
/**
4664
* Returns the {@link ClassLoader} for loading classes.
4765
*
@@ -55,7 +73,7 @@ protected AbstractProxier(final Domain domain) {
5573
protected ClassLoader classLoader() {
5674
return Thread.currentThread().getContextClassLoader();
5775
}
58-
76+
5977
/**
6078
* Returns the {@link Domain} supplied at construction time.
6179
*

0 commit comments

Comments
 (0)