Merge pull request #861 from hazendaz/master

Update actions and prepare for central

Author: hazendaz

.github/workflows/ci.yaml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         cache: [maven]
         distribution: [temurin]
-        java: [17, 21, 23, 24-ea, 25-ea]
+        java: [17, 21, 24, 25-ea]
         os: [ubuntu-latest, macos-latest, windows-latest]
       fail-fast: false
       max-parallel: 4

.github/workflows/site.yaml

@@ -5,6 +5,9 @@ on:
     branches:
       - site
 
+permissions:
+  contents: write
+
 jobs:
   build:
     if: github.repository_owner == 'mybatis' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
@@ -20,12 +23,10 @@ jobs:
       - name: Build site
         run: ./mvnw site site:stage -DskipTests -Dlicense.skip=true -B -V --no-transfer-progress --settings ./.mvn/settings.xml
         env:
-          CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
       - name: Deploy Site to gh-pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages
           folder: target/staging
-          ssh-key: ${{ secrets.DEPLOY_KEY }}

.mvn/extensions.xml

@@ -20,6 +20,6 @@
     <extension>
       <groupId>fr.jcgay.maven</groupId>
       <artifactId>maven-profiler</artifactId>
-      <version>3.2</version>
+      <version>3.3</version>
     </extension>
 </extensions>

.mvn/settings.xml

@@ -22,7 +22,7 @@
   <servers>
     <!-- Used for sonatype snapshots and releases -->
     <server>
-      <id>ossrh</id>
+      <id>central</id>
       <username>${env.CI_DEPLOY_USERNAME}</username>
       <password>${env.CI_DEPLOY_PASSWORD}</password>
     </server>
@@ -39,7 +39,6 @@
     <!-- Github deployments (site) -->
     <server>
       <id>github</id>
-      <username>${env.CI_DEPLOY_USERNAME}</username>
       <password>${env.GITHUB_TOKEN}</password>
     </server>
 

pom.xml

@@ -245,13 +245,9 @@
     <url>https://github.com/mybatis/parent/actions</url>
   </ciManagement>
   <distributionManagement>
-    <repository>
-      <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
     <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>
     <site>
       <id>gh-pages-scm</id>
@@ -345,7 +341,6 @@
     <license.plugin>5.0.0</license.plugin>
     <lifecycle.plugin>1.0.0</lifecycle.plugin>
     <modernizer.plugin>3.1.0</modernizer.plugin>
-    <pdf.plugin>1.6.2</pdf.plugin>
     <pmd.plugin>3.26.0</pmd.plugin>
     <project-info.plugin>3.9.0</project-info.plugin>
     <release.plugin>3.1.1</release.plugin>
@@ -712,25 +707,6 @@
           <version>${jxr.plugin}</version>
         </plugin>
 
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-pdf-plugin</artifactId>
-          <version>${pdf.plugin}</version>
-          <!-- Execution such as this in plugin management requires plugin definition in build to work -->
-          <executions>
-            <execution>
-              <id>pdf</id>
-              <goals>
-                <goal>pdf</goal>
-              </goals>
-              <phase>prepare-package</phase>
-              <configuration>
-                <includeReports>false</includeReports>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-pmd-plugin</artifactId>
@@ -898,7 +874,6 @@
           <artifactId>modernizer-maven-plugin</artifactId>
           <version>${modernizer.plugin}</version>
           <configuration>
-            <failOnViolations>false</failOnViolations>
             <javaVersion>${maven.compiler.target}</javaVersion>
           </configuration>
           <dependencies>
@@ -915,6 +890,17 @@
           <artifactId>rewrite-maven-plugin</artifactId>
           <version>${rewrite.plugin}</version>
         </plugin>
+
+        <!-- Sonatype Provided Plugins -->
+        <plugin>
+          <groupId>org.sonatype.central</groupId>
+          <artifactId>central-publishing-maven-plugin</artifactId>
+          <version>0.7.0</version>
+          <extensions>true</extensions>
+          <configuration>
+            <publishingServerId>central</publishingServerId>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -1024,6 +1010,16 @@
           </execution>
         </executions>
       </plugin>
+
+      <!-- Sonatype Provided Plugins -->
+      <plugin>
+        <groupId>org.sonatype.central</groupId>
+        <artifactId>central-publishing-maven-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <publishingServerId>central</publishingServerId>
+        </configuration>
+      </plugin>
     </plugins>
   </build>