Merge branch 'master' into filecollector-language

.all-contributorsrc

@@ -1053,7 +1053,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/86377278?v=4",
       "profile": "https://github.com/aaronhurst-google",
       "contributions": [
-        "bug"
+        "bug",
+        "code"
       ]
     },
     {
@@ -5917,7 +5918,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/35368290?v=4",
       "profile": "https://github.com/tprouvot",
       "contributions": [
-        "bug"
+        "bug",
+        "code"
       ]
     },
     {
@@ -6768,6 +6770,42 @@
         "code",
         "financial"
       ]
+    },
+    {
+      "login": "abyss638",
+      "name": "Simon Abykov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/90252673?v=4",
+      "profile": "https://github.com/abyss638",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "eklimo",
+      "name": "Edward Klimoshenko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39220927?v=4",
+      "profile": "https://github.com/eklimo",
+      "contributions": [
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "nvuillam",
+      "name": "Nicolas Vuillamy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17500430?v=4",
+      "profile": "https://github.com/nvuillam",
+      "contributions": [
+        "doc"
+      ]
+    },{
+      "login": "pacvz",
+      "name": "pacvz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/35453365?v=4",
+      "profile": "https://github.com/pacvz",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.ci/build.sh

@@ -27,6 +27,15 @@ function build() {
     pmd_ci_utils_determine_build_env pmd/pmd
     echo
 
+    if ! pmd_ci_utils_is_fork_or_pull_request; then
+      if [ "${PMD_CI_BRANCH}" = "experimental-apex-parser" ]; then
+        pmd_ci_log_group_start "Build with mvnw"
+            ./mvnw clean install --show-version --errors --batch-mode --no-transfer-progress "${PMD_MAVEN_EXTRA_OPTS[@]}"
+        pmd_ci_log_group_end
+        exit 0
+      fi
+    fi
+
     if pmd_ci_utils_is_fork_or_pull_request; then
         pmd_ci_log_group_start "Build with mvnw"
             ./mvnw clean install --show-version --errors --batch-mode --no-transfer-progress "${PMD_MAVEN_EXTRA_OPTS[@]}"

.github/workflows/build.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - master
+      - experimental-apex-parser
     tags:
       - '**'
   pull_request:

SPONSORS.md

@@ -0,0 +1,10 @@
+# PMD's sponsors
+
+Many thanks to all our sponsors:
+
+* [Matt Hargett](https://github.com/matthargett) (@matthargett)
+
+If you also want to sponsor PMD, you have two options:
+
+* [Sponsor @pmd on GitHub Sponsors](https://github.com/sponsors/pmd)
+* [PMD - Open Collective](https://opencollective.com/pmd)

docs/_config.yml

@@ -1,9 +1,9 @@
 repository: pmd/pmd
 
 pmd:
-    version: 6.48.0-SNAPSHOT
-    previous_version: 6.47.0
-    date: 30-July-2022
+    version: 6.49.0-SNAPSHOT
+    previous_version: 6.48.0
+    date: 31-August-2022
     release_type: minor
 
 # release types: major, minor, bugfix

docs/pages/next_major_development.md

@@ -125,6 +125,59 @@ the breaking API changes will be performed in 7.0.0.
 an API is tagged as `@Deprecated` or not in the latest minor release. During the development of 7.0.0,
 we may decide to remove some APIs that were not tagged as deprecated, though we'll try to avoid it." %}
 
+#### 6.48.0
+
+##### CPD CLI
+
+* CPD has a new CLI option `--debug`. This option has the same behavior as in PMD. It enables more verbose
+  logging output.
+
+##### Rule Test Framework
+
+* The module "pmd-test", which contains support classes to write rule tests, now **requires Java 8**. If you depend on
+  this module for testing your own custom rules, you'll need to make sure to use at least Java 8.
+* The new module "pmd-test-schema" contains now the XSD schema and the code to parse the rule test XML files. The
+  schema has been extracted in order to easily share it with other tools like the Rule Designer or IDE plugins.
+* Test schema changes:
+    * The attribute `isRegressionTest` of `test-code` is deprecated. The new
+      attribute `disabled` should be used instead for defining whether a rule test should be skipped or not.
+    * The attributes `reinitializeRule` and `useAuxClasspath` of `test-code` are deprecated and assumed true.
+      They will not be replaced.
+    * The new attribute `focused` of `test-code` allows disabling all tests except the focused one temporarily.
+* More information about the rule test framework can be found in the documentation:
+  [Testing your rules](pmd_userdocs_extending_testing.html)
+
+##### Deprecated API
+
+* The experimental Java AST class {% jdoc java::lang.java.ast.ASTGuardedPattern %} has been deprecated and
+  will be removed. It was introduced for Java 17 and Java 18 Preview as part of pattern matching for switch,
+  but it is no longer supported with Java 19 Preview.
+* The interface {% jdoc core::cpd.renderer.CPDRenderer %} is deprecated. For custom CPD renderers
+  the new interface {% jdoc core::cpd.renderer.CPDReportRenderer %} should be used.
+* The class {% jdoc test::testframework.TestDescriptor %} is deprecated, replaced with {% jdoc test-schema::test.schema.RuleTestDescriptor %}.
+* Many methods of {% jdoc test::testframework.RuleTst %} have been deprecated as internal API.
+
+##### Experimental APIs
+
+* To support the Java preview language features "Pattern Matching for Switch" and "Record Patterns", the following
+  AST nodes have been introduced as experimental:
+    * {% jdoc java::lang.java.ast.ASTSwitchGuard %}
+    * {% jdoc java::lang.java.ast.ASTRecordPattern %}
+    * {% jdoc java::lang.java.ast.ASTComponentPatternList %}
+
+##### Internal API
+
+Those APIs are not intended to be used by clients, and will be hidden or removed with PMD 7.0.0.
+You can identify them with the `@InternalApi` annotation. You'll also get a deprecation warning.
+
+* {%jdoc !!core::cpd.CPDConfiguration#setRenderer(net.sourceforge.pmd.cpd.Renderer) %}
+* {%jdoc !!core::cpd.CPDConfiguration#setCPDRenderer(net.sourceforge.pmd.cpd.renderer.CPDRenderer) %}
+* {%jdoc !!core::cpd.CPDConfiguration#getRenderer() %}
+* {%jdoc !!core::cpd.CPDConfiguration#getCPDRenderer() %}
+* {%jdoc !!core::cpd.CPDConfiguration#getRendererFromString(java.lang.String,java.lang.String) %}
+* {%jdoc !!core::cpd.CPDConfiguration#getCPDRendererFromString(java.lang.String,java.lang.String) %}
+* {%jdoc core::cpd.renderer.CPDRendererAdapter %}
+
 #### 6.47.0
 
 No changes.