Merge branch '2.x' into 3.x

Author: cowtowncoder

.github/workflows/main.yml

@@ -29,7 +29,7 @@ jobs:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
         cache: 'maven'
-        server-id: sonatype-nexus-snapshots
+        server-id: central-snapshots
         server-username: CI_DEPLOY_USERNAME
         server-password: CI_DEPLOY_PASSWORD
         # See https://github.com/actions/setup-java/blob/v2/docs/advanced-usage.md#Publishing-using-Apache-Maven
@@ -43,8 +43,7 @@ jobs:
     - name: Deploy snapshot
       if: ${{ github.event_name != 'pull_request' && matrix.java_version == '17' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT') }}
       env:
-        # 17-Jun-2024, tatu: Do NOT use v3 credentials since namespace still "com.fasterxml"
-        CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
-        CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+        CI_DEPLOY_USERNAME: ${{ secrets.CENTRAL_DEPLOY_USERNAME }}
+        CI_DEPLOY_PASSWORD: ${{ secrets.CENTRAL_DEPLOY_PASSWORD }}
         # MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       run: ./mvnw -B -ff -DskipTests -ntp source:jar deploy

pom.xml

@@ -71,25 +71,7 @@ https://stackoverflow.com/questions/16302247/maven-property-project-artifact-sel
 
   <!-- Alas, need to include snapshot reference since otherwise can not find
        snapshot of parent... -->
-  <!-- 13-Jul-2022, tatu: This gets tricky; we need to publish via OLD repo, as per
-         here, but resolve dependency of "jackson-base" from the NEW repo.
-    -->
   <distributionManagement>
-    <snapshotRepository>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>sonatype-nexus-staging</id>
-      <name>Nexus Release Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-  <!-- 13-May-2025, tatu: And yet more! Tools.jackson comes from the new
-      Sonatype Central Portal: so yet more needed
-    -->
   <repositories>
     <!-- New Sonatype Central Portal (2025/5+) snapshots -->
     <repository>
@@ -99,37 +81,14 @@ https://stackoverflow.com/questions/16302247/maven-property-project-artifact-sel
       <releases><enabled>false</enabled></releases>
       <snapshots><enabled>true</enabled></snapshots>
     </repository>
-    <!-- "Old new" Snapshot repo -->
-    <repository>
-      <id>sonatype-nexus-new-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-      <releases><enabled>false</enabled></releases>
-      <snapshots><enabled>true</enabled></snapshots>
-    </repository>
   </repositories>
 
   <build>
     <plugins>
-      <!-- 13-May-2025, tatu: Left in place until "com.fasterxml" namespace moved
-             to Sonatype Central Portal
-        -->
-      <!-- 08-Nov-2019, tatu: Copied from
-           https://github.com/stephenc/git-timestamp-maven-plugin/blob/master/pom.xml#L327-L337
-         -->
+      <!-- 26-May-2025: Enable Sonatype Central Portal publishing -->
       <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>nexus-staging-maven-plugin</artifactId>
-        <version>1.7.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <serverId>sonatype-nexus-staging</serverId>
-          <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-	  <!-- 07-Mar-2025, tatu: NOTE! "OLD" staging profile since we are
-                still under "com.fasterxml" unlike all other components
-            -->
-          <stagingProfileId>b34f19b9cc6224</stagingProfileId>
-        </configuration>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
       </plugin>
 
       <!-- 20-Oct-2020, tatu: [annotations#178] copy full LICENSE from main dir -->