Merge branch 'master' into 7.0.x

.github/workflows/build.yml

@@ -30,12 +30,13 @@ jobs:
       with:
         path: |
           ~/.m2/repository
+          ~/.gradle/caches
           ~/.cache
           ~/work/pmd/target/repositories
           vendor/bundle
-        key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+        key: v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
-          ${{ runner.os }}-
+          v1-${{ runner.os }}-
     - name: Set up Ruby 2.7
       uses: actions/setup-ruby@v1
       with:

.github/workflows/troubleshooting.yml

@@ -16,12 +16,14 @@ jobs:
       - uses: actions/cache@v2
         with:
           path: |
-            ~/.m2/repository
-            ~/.cache
-            vendor/bundle
-          key: push-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
+              ~/.m2/repository
+              ~/.gradle/caches
+              ~/.cache
+              ~/work/pmd/target/repositories
+              vendor/bundle
+          key: v1-${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            push-${{ runner.os }}-
+            v1-${{ runner.os }}-
       - name: Set up Ruby 2.7
         uses: actions/setup-ruby@v1
         with:

docs/pages/release_notes.md

@@ -36,6 +36,8 @@ This is a {{ site.pmd.release_type }} release.
     *   [#3230](https://github.com/pmd/pmd/issues/3230): \[doc] Remove "Edit me" button for language index pages
 *   dist
     *   [#2466](https://github.com/pmd/pmd/issues/2466): \[dist] Distribution archive doesn't include all batch scripts
+*   java
+    *   [#3269](https://github.com/pmd/pmd/pull/3269): \[java] Fix NPE in MethodTypeResolution
 *   java-bestpractices
     *   [#2737](https://github.com/pmd/pmd/issues/2737): \[java] Fix misleading rule message on rule SwitchStmtsShouldHaveDefault with non-exhaustive enum switch
     *   [#3236](https://github.com/pmd/pmd/issues/3236): \[java] LiteralsFirstInComparisons should consider constant fields (cont'd)