Merge branch 'main' into luc-veldhuis/69-resolvedtype-to-java-type

Author: cowtowncoder

.github/workflows/main.yml

@@ -2,44 +2,48 @@ name: Build
 on:
   push:
     branches:
-    - master
+    - main
     - "1.6"
+    - "1.7"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
-    - master
+    - main
     - "1.6"
+    - "1.7"
+
 permissions:
   contents: read
+
 jobs:
   build:
-    runs-on: 'ubuntu-22.04'
+    runs-on: 'ubuntu-latest'
     strategy:
       fail-fast: false
       matrix:
-        # Alas, JDK14 can't be yet used while build is for Java 6
+        # 26-Sep-2025, tatu: some test failures on 21 cannot yet enable
         java_version: ['8', '11', '17']
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up JDK
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: "temurin"
         java-version: ${{ matrix.java_version }}
         cache: 'maven'
     - name: Build
       run: ./mvnw -B -ff -ntp clean verify
     - name: Generate code coverage
-      if: github.event_name != 'pull_request' && matrix.java_version == '8'
+      if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }}
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
-      if: github.event_name != 'pull_request' && matrix.java_version == '8'
-      uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+      if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }}
+      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        file: ./target/site/jacoco/jacoco.xml
+        files: ./target/site/jacoco/jacoco.xml
         flags: unittests

VERSION.txt

@@ -3,6 +3,11 @@ Java ClassMate project: licensed under Apache License 2.0
 
 Release notes:
 
+1.7.1 (26-Sep-2025)
+
+- Branch "master" renamed as "main"
+- Update to `oss-parent` v69 to switch to Central Portal publishing
+
 1.7.0 (02-Jan-2024)
 
 #51: `TypeResolver.resolve(Long[].class)` should not return a `ResolvedType`

pom.xml

@@ -3,11 +3,11 @@
     <parent>
         <groupId>com.fasterxml</groupId>
         <artifactId>oss-parent</artifactId>
-        <version>56</version>
+        <version>69</version>
     </parent>
     <artifactId>classmate</artifactId>
     <name>ClassMate</name>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Library for introspecting types with full generic information
         including resolving of field and method types.
@@ -67,26 +67,11 @@ com.fasterxml.classmate.*;version=${project.version}
 
     <build>
         <plugins>
-
-          <!-- 19-Oct-2019, tatu: Copied from
-
-           https://github.com/stephenc/git-timestamp-maven-plugin/blob/master/pom.xml#L327-L337
-
-               to simplify releases. I hope.
-            -->
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
-            <extensions>true</extensions>
-            <configuration>
-              <serverId>sonatype-nexus-staging</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <!-- 19-Oct-2019, tatu: from output -->
-              <stagingProfileId>b34f19b9cc6224</stagingProfileId>
-            </configuration>
-          </plugin>
-
+            <!-- 26-Sep-2025, tatu: Ensure we use new Sonatype Central Portal: -->
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+            </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>