Merge branch 'pmd7-merge-master' into text-utils-simple

2022-03-05 18:16:49 +01:00 · 2022-03-05 18:16:49 +01:00 · af5aceeff8
commit af5aceeff8
parent f4f7f4b65d 6349f134a7
642 changed files with 14546 additions and 8072 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -5482,7 +5482,8 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/403174?v=4",
      "profile": "https://github.com/snuyanzin",
      "contributions": [
-        "bug"
+        "bug",
+        "code"
      ]
    },
    {
@ -6483,6 +6484,88 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "babula",
+      "name": "Steve Babula",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5806843?v=4",
+      "profile": "https://www.linkedin.com/in/sbabula/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vgalloy",
+      "name": "Vincent Galloy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11443605?v=4",
+      "profile": "https://github.com/vgalloy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "squaresurf",
+      "name": "Daniel Paul Searles",
+      "avatar_url": "https://avatars.githubusercontent.com/u/863076?v=4",
+      "profile": "https://github.com/squaresurf",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dykov",
+      "name": "Oleksii Dykov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36415196?v=4",
+      "profile": "https://github.com/dykov",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Vyom-Yadav",
+      "name": "Vyom Yadav",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73882557?v=4",
+      "profile": "https://www.linkedin.com/in/vyom-yadav-66a97918b/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gredler",
+      "name": "Daniel Gredler",
+      "avatar_url": "https://avatars.githubusercontent.com/u/178883?v=4",
+      "profile": "https://github.com/gredler",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "filiprafalowicz",
+      "name": "filiprafalowicz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24355557?v=4",
+      "profile": "https://github.com/filiprafalowicz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JerritEic",
+      "name": "JerritEic",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60690273?v=4",
+      "profile": "https://github.com/JerritEic",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "karel1980",
+      "name": "Karel Vervaeke",
+      "avatar_url": "https://avatars.githubusercontent.com/u/153021?v=4",
+      "profile": "https://github.com/karel1980",
+      "contributions": [
+        "bug"
+      ]
    }
  ],
  "contributorsPerLine": 7,
--- a/.ci/build.sh
+++ b/.ci/build.sh
@ -30,7 +30,7 @@ function build() {

    if pmd_ci_utils_is_fork_or_pull_request; then
        pmd_ci_log_group_start "Build with mvnw"
-            ./mvnw clean verify --show-version --errors --batch-mode --no-transfer-progress "${PMD_MAVEN_EXTRA_OPTS[@]}"
+            ./mvnw clean install --show-version --errors --batch-mode --no-transfer-progress "${PMD_MAVEN_EXTRA_OPTS[@]}"
        pmd_ci_log_group_end

        # Danger is executed only on the linux runner
@ -39,6 +39,11 @@ function build() {
                regression_tester_setup_ci
                regression_tester_executeDanger
            pmd_ci_log_group_end
+
+            # also run dogfood for PRs (only on linux)
+            pmd_ci_log_group_start "Executing PMD dogfood test with ${PMD_CI_MAVEN_PROJECT_VERSION}"
+                pmd_ci_dogfood
+            pmd_ci_log_group_end
        fi

        exit 0
@ -86,23 +91,13 @@ function build() {
        regression_tester_uploadBaseline
    pmd_ci_log_group_end

+    #
+    # everything from here runs only on snapshots, not on release builds
+    #
    if pmd_ci_maven_isSnapshotBuild; then
-    if [ "${PMD_CI_MAVEN_PROJECT_VERSION}" != "7.0.0-SNAPSHOT" ]; then
-        pmd_ci_log_group_start "Executing PMD dogfood test with ${PMD_CI_MAVEN_PROJECT_VERSION}"
-            ./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}-dogfood" -DgenerateBackupPoms=false
-            sed -i 's/<version>[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}.*<\/version>\( *<!-- pmd.dogfood.version -->\)/<version>'"${PMD_CI_MAVEN_PROJECT_VERSION}"'<\/version>\1/' pom.xml
-            ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress "${PMD_MAVEN_EXTRA_OPTS[@]}" \
-                -DskipTests \
-                -Dmaven.javadoc.skip=true \
-                -Dmaven.source.skip=true \
-                -Dcheckstyle.skip=true
-            ./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}" -DgenerateBackupPoms=false
-            git checkout -- pom.xml
-        pmd_ci_log_group_end
-    else
-        # current maven-pmd-plugin is not compatible with PMD 7 yet.
-        pmd_ci_log_info "Skipping PMD dogfood test with ${PMD_CI_MAVEN_PROJECT_VERSION}"
-    fi
+    pmd_ci_log_group_start "Executing PMD dogfood test with ${PMD_CI_MAVEN_PROJECT_VERSION}"
+        pmd_ci_dogfood
+    pmd_ci_log_group_end

    pmd_ci_log_group_start "Executing build with sonar"
        # Note: Sonar also needs GITHUB_TOKEN (!)
@ -246,6 +241,24 @@ ${rendered_release_notes}"
    fi
 }

+#
+# Runs the dogfood ruleset with the currently built pmd against itself
+#
+function pmd_ci_dogfood() {
+    ./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}-dogfood" -DgenerateBackupPoms=false
+    sed -i 's/<version>[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}.*<\/version>\( *<!-- pmd.dogfood.version -->\)/<version>'"${PMD_CI_MAVEN_PROJECT_VERSION}"'<\/version>\1/' pom.xml
+    if [ "${PMD_CI_MAVEN_PROJECT_VERSION}" = "7.0.0-SNAPSHOT" ]; then
+        sed -i 's/pmd-dogfood-config\.xml/pmd-dogfood-config7.xml/' pom.xml
+    fi
+    ./mvnw verify --show-version --errors --batch-mode --no-transfer-progress "${PMD_MAVEN_EXTRA_OPTS[@]}" \
+        -DskipTests \
+        -Dmaven.javadoc.skip=true \
+        -Dmaven.source.skip=true \
+        -Dcheckstyle.skip=true
+    ./mvnw versions:set -DnewVersion="${PMD_CI_MAVEN_PROJECT_VERSION}" -DgenerateBackupPoms=false
+    git checkout -- pom.xml
+}
+
 build

 exit 0
--- a/.ci/files/all-java.xml
+++ b/.ci/files/all-java.xml
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@ -1,117 +0,0 @@
-/*
- * Copyright 2007-present the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import java.net.*;
-import java.io.*;
-import java.nio.channels.*;
-import java.util.Properties;
-
-public class MavenWrapperDownloader {
-
-    private static final String WRAPPER_VERSION = "0.5.6";
-    /**
-     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
-     */
-    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
-        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
-
-    /**
-     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
-     * use instead of the default one.
-     */
-    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
-            ".mvn/wrapper/maven-wrapper.properties";
-
-    /**
-     * Path where the maven-wrapper.jar will be saved to.
-     */
-    private static final String MAVEN_WRAPPER_JAR_PATH =
-            ".mvn/wrapper/maven-wrapper.jar";
-
-    /**
-     * Name of the property which should be used to override the default download url for the wrapper.
-     */
-    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
-
-    public static void main(String args[]) {
-        System.out.println("- Downloader started");
-        File baseDirectory = new File(args[0]);
-        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
-
-        // If the maven-wrapper.properties exists, read it and check if it contains a custom
-        // wrapperUrl parameter.
-        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
-        String url = DEFAULT_DOWNLOAD_URL;
-        if(mavenWrapperPropertyFile.exists()) {
-            FileInputStream mavenWrapperPropertyFileInputStream = null;
-            try {
-                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
-                Properties mavenWrapperProperties = new Properties();
-                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
-                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
-            } catch (IOException e) {
-                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
-            } finally {
-                try {
-                    if(mavenWrapperPropertyFileInputStream != null) {
-                        mavenWrapperPropertyFileInputStream.close();
-                    }
-                } catch (IOException e) {
-                    // Ignore ...
-                }
-            }
-        }
-        System.out.println("- Downloading from: " + url);
-
-        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
-        if(!outputFile.getParentFile().exists()) {
-            if(!outputFile.getParentFile().mkdirs()) {
-                System.out.println(
-                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
-            }
-        }
-        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
-        try {
-            downloadFileFromURL(url, outputFile);
-            System.out.println("Done");
-            System.exit(0);
-        } catch (Throwable e) {
-            System.out.println("- Error downloading");
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
-        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
-            String username = System.getenv("MVNW_USERNAME");
-            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
-            Authenticator.setDefault(new Authenticator() {
-                @Override
-                protected PasswordAuthentication getPasswordAuthentication() {
-                    return new PasswordAuthentication(username, password);
-                }
-            });
-        }
-        URL website = new URL(urlString);
-        ReadableByteChannel rbc;
-        rbc = Channels.newChannel(website.openStream());
-        FileOutputStream fos = new FileOutputStream(destination);
-        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
-        fos.close();
-        rbc.close();
-    }
-
-}
--- a/.mvn/wrapper/maven-wrapper.jar
+++ b/.mvn/wrapper/maven-wrapper.jar
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@ -1,2 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
--- a/BUILDING.md
+++ b/BUILDING.md
@ -4,7 +4,7 @@ PMD uses [Maven](https://maven.apache.org/) and requires at least Java 11 for bu
 You can get Java 11 from [Oracle](http://www.oracle.com/technetwork/java/javase/downloads/index.html)
 or from [AdoptOpenJdk](https://adoptopenjdk.net/).

-PMD uses the [maven wrapper](https://github.com/takari/maven-wrapper), so you can simply build PMD as following:
+PMD uses the [maven wrapper](https://maven.apache.org/wrapper/), so you can simply build PMD as following:

 *   `./mvnw clean verify` (on Unix-like platform such as Linux and Mac OS X)
 *   `mvnw.cmd clean verify` (on Windows)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -3,7 +3,7 @@ GEM
  specs:
    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
-    claide (1.0.3)
+    claide (1.1.0)
    claide-plugins (0.9.2)
      cork
      nap
@ -12,7 +12,7 @@ GEM
    concurrent-ruby (1.1.9)
    cork (0.3.0)
      colored2 (~> 3.1)
-    danger (8.4.0)
+    danger (8.4.3)
      claide (~> 1.0)
      claide-plugins (>= 0.9.2)
      colored2 (~> 3.1)
@ -26,18 +26,19 @@ GEM
      octokit (~> 4.7)
      terminal-table (>= 1, < 4)
    differ (0.1.2)
-    et-orbi (1.2.5)
+    et-orbi (1.2.6)
      tzinfo
-    faraday (1.8.0)
+    faraday (1.10.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
      faraday-patron (~> 1.0)
      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
      ruby2_keywords (>= 0.0.4)
    faraday-em_http (1.0.0)
    faraday-em_synchrony (1.0.0)
@ -45,14 +46,17 @@ GEM
    faraday-http-cache (2.2.0)
      faraday (>= 0.8)
    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
    fugit (1.5.2)
      et-orbi (~> 1.1, >= 1.1.8)
      raabro (~> 1.4)
-    git (1.9.1)
+    git (1.10.2)
      rchardet (~> 1.8)
    kramdown (2.3.1)
      rexml
@ -60,18 +64,18 @@ GEM
      kramdown (~> 2.0)
    liquid (5.1.0)
    logger-colors (1.0.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
    multipart-post (2.1.1)
    nap (1.1.0)
    no_proxy_fix (0.1.2)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
-    octokit (4.21.0)
+    octokit (4.22.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
    open4 (1.3.4)
-    pmdtester (1.2.0)
+    pmdtester (1.3.0)
      differ (~> 0.1)
      liquid (>= 4.0)
      logger-colors (~> 1.0)
@ -80,12 +84,12 @@ GEM
      slop (~> 4.6)
    public_suffix (4.0.6)
    raabro (1.4.0)
-    racc (1.5.2)
+    racc (1.6.0)
    rchardet (1.8.0)
    rexml (3.2.5)
-    rouge (3.26.1)
+    rouge (3.28.0)
    ruby2_keywords (0.0.5)
-    rufus-scheduler (3.8.0)
+    rufus-scheduler (3.8.1)
      fugit (~> 1.1, >= 1.1.6)
    safe_yaml (1.0.5)
    sawyer (0.8.2)
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@ -1,7 +1,7 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (6.0.4.1)
+    activesupport (6.0.4.6)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
@ -17,39 +17,43 @@ GEM
    commonmarker (0.17.13)
      ruby-enum (~> 0.5)
    concurrent-ruby (1.1.9)
-    dnsruby (1.61.7)
+    dnsruby (1.61.9)
      simpleidn (~> 0.1)
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
      eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.14.0)
+      http_parser.rb (~> 0)
+    ethon (0.15.0)
      ffi (>= 1.15.0)
    eventmachine (1.2.7)
    execjs (2.8.1)
-    faraday (1.8.0)
+    faraday (1.10.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
      faraday-patron (~> 1.0)
      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
      ruby2_keywords (>= 0.0.4)
    faraday-em_http (1.0.0)
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
    faraday-rack (1.0.0)
-    ffi (1.15.4)
+    faraday-retry (1.0.3)
+    ffi (1.15.5)
    forwardable-extended (2.6.0)
    gemoji (3.0.1)
-    github-pages (219)
-      github-pages-health-check (= 1.17.7)
+    github-pages (223)
+      github-pages-health-check (= 1.17.9)
      jekyll (= 3.9.0)
      jekyll-avatar (= 0.7.0)
      jekyll-coffeescript (= 1.1.1)
@ -58,6 +62,7 @@ GEM
      jekyll-feed (= 0.15.1)
      jekyll-gist (= 1.5.0)
      jekyll-github-metadata (= 2.13.0)
+      jekyll-include-cache (= 0.2.1)
      jekyll-mentions (= 1.6.0)
      jekyll-optional-front-matter (= 0.3.2)
      jekyll-paginate (= 1.1.0)
@ -89,10 +94,10 @@ GEM
      liquid (= 4.0.3)
      mercenary (~> 0.3)
      minima (= 2.5.1)
-      nokogiri (>= 1.10.4, < 2.0)
+      nokogiri (>= 1.12.5, < 2.0)
      rouge (= 3.26.0)
      terminal-table (~> 1.4)
-    github-pages-health-check (1.17.7)
+    github-pages-health-check (1.17.9)
      addressable (~> 2.3)
      dnsruby (~> 1.60)
      octokit (~> 4.0)
@ -101,7 +106,7 @@ GEM
    html-pipeline (2.14.0)
      activesupport (>= 2)
      nokogiri (>= 1.4)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
    i18n (0.9.5)
      concurrent-ruby (~> 1.0)
    jekyll (3.9.0)
@ -138,6 +143,8 @@ GEM
    jekyll-github-metadata (2.13.0)
      jekyll (>= 3.4, < 5.0)
      octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.2.1)
+      jekyll (>= 3.7, < 5.0)
    jekyll-mentions (1.6.0)
      html-pipeline (~> 2.3)
      jekyll (>= 3.7, < 5.0)
@ -215,28 +222,28 @@ GEM
    kramdown-parser-gfm (1.1.0)
      kramdown (~> 2.0)
    liquid (4.0.3)
-    listen (3.7.0)
+    listen (3.7.1)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    mercenary (0.3.6)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
    minima (2.5.1)
      jekyll (>= 3.5, < 5.0)
      jekyll-feed (~> 0.9)
      jekyll-seo-tag (~> 2.1)
-    minitest (5.14.4)
+    minitest (5.15.0)
    multipart-post (2.1.1)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
      racc (~> 1.4)
-    octokit (4.21.0)
+    octokit (4.22.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
    pathutil (0.16.2)
      forwardable-extended (~> 2.6)
    public_suffix (4.0.6)
-    racc (1.5.2)
-    rb-fsevent (0.11.0)
+    racc (1.6.0)
+    rb-fsevent (0.11.1)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    rexml (3.2.5)
@ -267,7 +274,7 @@ GEM
      unf_ext
    unf_ext (0.0.8)
    unicode-display_width (1.8.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)

 PLATFORMS
  ruby
--- a/docs/_config.yml
+++ b/docs/_config.yml
@ -2,7 +2,7 @@ repository: pmd/pmd

 pmd:
    version: 7.0.0-SNAPSHOT
-    previous_version: 6.41.0
+    previous_version: 6.43.0
    date: ??-?????-2022
    release_type: major

--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@ -9,26 +9,37 @@
 <div id="topbar-content-offset">
 {% include topnav.html %}
 <!-- Page Content -->
-<div class="container">
-    <div class="col-lg-12">&nbsp;</div>
-    <!-- Content Row -->
-    <div class="row">
-        {% assign content_col_size = "col-md-12" %}
-        {% unless page.hide_sidebar %}
-        <!-- Sidebar Column -->
-        <div class="col-md-3" id="tg-sb-sidebar">
-            {% include sidebar.html %}
-        </div>
-        {% assign content_col_size = "col-md-9" %}
-        {% endunless %}
+<div class="container-toc-wrapper">
+    <div class="container">
+        <div class="col-lg-12">&nbsp;</div>
+        <!-- Content Row -->
+        <div class="row">
+            {% assign content_col_size = "col-md-12" %}
+            {% unless page.hide_sidebar %}
+            <!-- Sidebar Column -->
+            <div class="col-md-3" id="tg-sb-sidebar">
+                {% include sidebar.html %}
+            </div>
+            {% assign content_col_size = "col-md-9" %}
+            {% endunless %}

-        <!-- Content Column -->
-        <div class="{{content_col_size}}" id="tg-sb-content">
-            {{content}}
+            <!-- Content Column -->
+            <div class="{{content_col_size}}" id="tg-sb-content">
+                {{content}}
+            </div>
+
+            <!-- /.row -->
        </div>
-        <!-- /.row -->
+        <!-- /.container -->
    </div>
-    <!-- /.container -->
+
+    {% unless page.toc == false %}
+    <!-- Sticky TOC column -->
+    <div class="toc-col">
+        {% include toc.html %}
+    </div>
+    {% endunless %}
+    <!-- /.toc-container-wrapper -->
 </div>
 </div>

--- a/docs/_layouts/page.html
+++ b/docs/_layouts/page.html
@ -12,9 +12,7 @@ layout: default
    <div class="summary">{{page.summary}}</div>
   {% endif %}

-    {% unless page.toc == false %}
-    {% include toc.html %}
-    {% endunless %}
+    <div id="inline-toc"><!-- empty, move TOC here when screen size too small --></div>


    {% if site.github_editme_path %}
--- a/docs/css/customstyles.css
+++ b/docs/css/customstyles.css
@ -1,6 +1,70 @@
 body {
    font-size:15px;
 }
+@media (max-width: 1349px) {
+    /* Small screen, inline TOC*/
+    .container-toc-wrapper {
+        display: block;
+    }
+
+    div.toc-col {
+        display: none;
+    }
+
+    div#toc{
+        margin-top: 15px;
+        margin-left: 0px;
+        margin-right: 0px;
+    }
+
+    .container {
+        margin-left: auto;
+        margin-right: auto;
+    }
+}
+
+@media (min-width: 1350px) {
+    /* Medium screens, keep sticky TOC but remove justify-content*/
+    div#toc{
+        margin-top: 60px;
+        margin-left: -15px;
+        margin-right: 15px;
+    }
+    .container {
+        margin-left: 15px;
+        margin-right: 15px;
+        width: 75%;
+    }
+
+    .container-toc-wrapper {
+        display: flex;
+        flex-wrap: wrap;
+        margin-left: auto;
+        margin-right: auto;
+    }
+}
+@media (min-width: 1600px) {
+    /* Sticky TOC functionality */
+    div#toc{
+        margin-top: 60px;
+        margin-left: -15px;
+        margin-right: 15px;
+    }
+    .container {
+        margin-left: 15px;
+        margin-right: 15px;
+        width: 75%;
+    }
+
+    .container-toc-wrapper {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: center;
+        margin-left: auto;
+        margin-right: auto;
+    }
+}
+

 .bs-callout {
    padding: 20px;
--- a/docs/js/customscripts.js
+++ b/docs/js/customscripts.js
@ -1,13 +1,23 @@
+
+// Detect small devices and move the TOC in line
+function moveToc(){
+    if(window.innerWidth < 1350){
+        $( "#toc" ).detach().appendTo("#inline-toc").removeClass("position-fixed");
+    } else {
+        $( "#toc" ).detach().appendTo(".toc-col").addClass("position-fixed");
+    }
+}
+
 $( document ).ready(function() {

    $('#mysidebar').height($(".nav").height());

-    // this script says, if the height of the viewport is greater than 800px, then insert position-fixed class,
+    // this script says, if the height of the viewport is greater than 600px, then insert position-fixed class,
    // which makes the nav bar float in a fixed position as your scroll. If you have a lot of nav items,
    // this height may not work for you.
    var h = $(window).height();
    //console.log (h);
-    if (h > 800) {
+    if (h > 600) {
        $( "#mysidebar" ).attr("class", "nav position-fixed");
    }

@ -20,6 +30,8 @@ $( document ).ready(function() {
     * AnchorJS
     */
    anchors.add('h2,h3,h4,h5');
+    // Check if TOC needs to be moved on page load
+    moveToc();

    // This highlights the active parent class in the navgoco sidebar. This is critical so that the parent expands
    // when you're viewing a page.
@ -71,3 +83,6 @@ $( document ).ready(function() {
        event.preventDefault();
    });
 });
+
+// Check if TOC needs to be moved on window resizing
+$(window).resize(function () {moveToc();});
--- a/docs/pages/7_0_0_release_notes.md
+++ b/docs/pages/7_0_0_release_notes.md
@ -101,6 +101,8 @@ conversions that may be made implicit.
  properly without a property.
 * {% rule "java/design/SingularField" %}: Properties `checkInnerClasses` and `disallowNotAssignment` are removed. The rule is now more precise and will check these cases properly.
 * {% rule "java/design/UseUtilityClass" %}: The property `ignoredAnnotations` has been removed.
+* {% rule "java/design/LawOfDemeter" %}: the rule has a new property `trustRadius`. This defines the maximum degree
+  of trusted data. The default of 1 is the most restrictive.

 #### Deprecated Rules

@ -150,11 +152,12 @@ The following previously deprecated rules have been finally removed:

 ### Fixed Issues

-*   apex-design
-    *   [#2667](https://github.com/pmd/pmd/issues/2667): \[apex] Integrate nawforce/ApexLink to build robust Unused rule
-*   core
+*   miscellaneous
+    *   [#896](https://github.com/pmd/pmd/issues/896): \[all] Use slf4j
    *   [#1451](https://github.com/pmd/pmd/issues/1451): \[core] RulesetFactoryCompatibility stores the whole ruleset file in memory as a string

+*   apex-design
+    *   [#2667](https://github.com/pmd/pmd/issues/2667): \[apex] Integrate nawforce/ApexLink to build robust Unused rule
 *   java-bestpractices
    * [#342](https://github.com/pmd/pmd/issues/342): \[java] AccessorMethodGeneration: Name clash with another public field not properly handled
    * [#755](https://github.com/pmd/pmd/issues/755): \[java] AccessorClassGeneration false positive for private constructors
@ -198,11 +201,21 @@ The following previously deprecated rules have been finally removed:
    * [#3221](https://github.com/pmd/pmd/issues/3221): \[java] PrematureDeclaration false positive for unused variables
    * [#3238](https://github.com/pmd/pmd/issues/3238): \[java] Improve ExprContext, fix FNs of UnnecessaryCast
 * java-design
+    * [#1014](https://github.com/pmd/pmd/issues/1014): \[java] LawOfDemeter: False positive with lambda expression
+    * [#1605](https://github.com/pmd/pmd/issues/1605): \[java] LawOfDemeter: False positive for standard UTF-8 charset name
+    * [#2175](https://github.com/pmd/pmd/issues/2175): \[java] LawOfDemeter: False positive for chained methods with generic method call
+    * [#2179](https://github.com/pmd/pmd/issues/2179): \[java] LawOfDemeter: False positive with static property access - should treat class-level property as global object, not dot-accessed property
+    * [#2180](https://github.com/pmd/pmd/issues/2180): \[java] LawOfDemeter: False positive with Thread and ThreadLocalRandom
+    * [#2182](https://github.com/pmd/pmd/issues/2182): \[java] LawOfDemeter: False positive with package-private access
+    * [#2188](https://github.com/pmd/pmd/issues/2188): \[java] LawOfDemeter: False positive with fields assigned to local vars
    * [#2536](https://github.com/pmd/pmd/issues/2536): \[java] ClassWithOnlyPrivateConstructorsShouldBeFinal can't detect inner class
+    * [#3786](https://github.com/pmd/pmd/issues/3786): \[java] SimplifyBooleanReturns should consider operator precedence
 * java-errorprone
    * [#659](https://github.com/pmd/pmd/issues/659): \[java] MissingBreakInSwitch - last default case does not contain a break
    * [#1005](https://github.com/pmd/pmd/issues/1005): \[java] CloneMethodMustImplementCloneable triggers for interfaces
+    * [#1669](https://github.com/pmd/pmd/issues/1669): \[java] NullAssignment - FP with ternay and null as constructor argument
    * [#1899](https://github.com/pmd/pmd/issues/1899): \[java] Recognize @SuppressWanings("fallthrough") for MissingBreakInSwitch
+    * [#2320](https://github.com/pmd/pmd/issues/2320): \[java] NullAssignment - FP with ternary and null as method argument
    * [#2532](https://github.com/pmd/pmd/issues/2532): \[java] AvoidDecimalLiteralsInBigDecimalConstructor can not detect the case `new BigDecimal(Expression)`
    * [#2579](https://github.com/pmd/pmd/issues/2579): \[java] MissingBreakInSwitch detects the lack of break in the last case
    * [#2716](https://github.com/pmd/pmd/issues/2716): \[java] CompareObjectsWithEqualsRule: False positive with Enums
--- a/docs/pages/next_major_development.md
+++ b/docs/pages/next_major_development.md
@ -246,6 +246,47 @@ 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.43.0
+
+##### Deprecated API
+
+Some API deprecations were performed in core PMD classes, to improve compatibility with PMD 7.
+- {% jdoc core::Report %}: the constructor and other construction methods like addViolation or createReport
+- {% jdoc core::RuleContext %}: all constructors, getters and setters. A new set
+of stable methods, matching those in PMD 7, was added to replace the `addViolation`
+overloads of {% jdoc core::lang.rule.AbstractRule %}. In PMD 7, `RuleContext` will
+be the API to report violations, and it can already be used as such in PMD 6.
+- The field {% jdoc core::PMD#configuration %} is unused and will be removed.
+
+##### 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::RuleSet %}: methods that serve to apply rules, including `apply`, `start`, `end`, `removeDysfunctionalRules`
+- {% jdoc !!core::renderers.AbstractAccumulatingRenderer#renderFileReport(Report) %} is internal API
+  and should not be overridden in own renderers.
+
+##### Changed API
+
+It is now forbidden to report a violation:
+- With a `null` node
+- With a `null` message
+- With a `null` set of format arguments (prefer a zero-length array)
+
+Note that the message is set from the XML rule declaration, so this is only relevant
+if you instantiate rules manually.
+
+{% jdoc core::RuleContext %} now requires setting the current rule before calling
+{% jdoc core::Rule#apply(java.util.List, core::RuleContext) %}. This is
+done automatically by `RuleSet#apply` and such. Creating and configuring a
+`RuleContext` manually is strongly advised against, as the lifecycle of `RuleContext`
+will change drastically in PMD 7.
+
+#### 6.42.0
+
+No changes.
+
 #### 6.41.0

 ##### Command Line Interface
--- a/docs/pages/pmd/devdocs/logging.md
+++ b/docs/pages/pmd/devdocs/logging.md
@ -0,0 +1,63 @@
+---
+title: Logging
+tags: [devdocs]
+permalink: pmd_devdocs_logging.html
+author: Andreas Dangel <andreas.dangel@pmd-code.org>
+---
+
+## Logging API is slf4j
+
+PMD uses [slf4j](https://www.slf4j.org/) as the logging API internally. Logging can be done also in
+(Java-based) rules.
+
+In order to log, get a logger. Usually the logger is stored in a static final field called `LOG`:
+
+```java
+    private static final Logger LOG = LoggerFactory.getLogger(MyClass.class);
+```
+
+## In Unit Tests
+
+If you need log output in unit tests, make sure to have a logging implementation on the test classpath.
+E.g. you can add (if it is missing) the following dependency:
+
+```xml
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+```
+
+To configure the logging, create the file `src/test/resources/simplelogger.properties`:
+
+```
+org.slf4j.simpleLogger.logFile=System.err
+org.slf4j.simpleLogger.showDateTime=false
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd'T'HH:mm:ss.SSSXXX
+org.slf4j.simpleLogger.showThreadName=true
+org.slf4j.simpleLogger.showThreadId=false
+org.slf4j.simpleLogger.showLogName=true
+org.slf4j.simpleLogger.showShortLogName=false
+org.slf4j.simpleLogger.levelInBrackets=false
+
+# Default log level for all loggers
+# Must be one of "trace", "debug", "info", "warn", "error" or "off"
+# Will be changed by "--debug" command line option
+org.slf4j.simpleLogger.defaultLogLevel=info
+
+# configure logging detail level for a single logger.
+# Must be one of "trace", "debug", "info", "warn", "error" or "off"
+#org.slf4j.simpleLogger.log.net.sourceforge.pmd.PMD=debug
+#org.slf4j.simpleLogger.log.com.example.rules.MyRule=debug
+```
+
+If you want to verify log output in unit tests, you can use `org.junit.contrib.java.lang.system.SystemErrRule`.
+Disabling the logging in this property file will the make the tests fail of course.
+
+## Binary distribution
+
+The binary distribution ships with also with `slf4j-simple` as the logger implementation.
+The default configuration is provided in `pmd-dist/src/main/resources/config/simplelogger.properties`.
+
+
--- a/docs/pages/pmd/projectdocs/credits.md
+++ b/docs/pages/pmd/projectdocs/credits.md
--- a/docs/pages/pmd/userdocs/cli_reference.md
+++ b/docs/pages/pmd/userdocs/cli_reference.md
@ -59,7 +59,7 @@ The tool comes with a rather extensive help text, simply running with `--help`!
                            This can greatly improve analysis performance and is **highly recommended**."
    %}
    {% include custom/cli_option_row.html options="--debug,--verbose,-D,-V"
-               description="Debug mode. Prints more log output."
+               description="Debug mode. Prints more log output. See also [Logging](#logging)."
    %}
    {% include custom/cli_option_row.html options="--encoding,-e"
               option_arg="charset"
@ -179,6 +179,15 @@ This behavior has been introduced to ease PMD integration into scripts or hooks,
 <tr><td>4</td><td>At least one violation has been detected, unless <code>--fail-on-violation false</code> is set.</td></tr>
 </table>

+## Logging
+
+PMD internally uses [slf4j](https://www.slf4j.org/) and ships with slf4j-simple as the logging implementation.
+Logging messages are printed to System.err, that's why you should use `--report-file` to specify an output for
+the report and not rely on redirecting the console output.
+
+The configuration for slf4j-simple is in the file `conf/simplelogger.properties`. There you can enable
+logging of specific classes if needed. The `--debug` command line option configures the default log level
+to be "debug".

 ## Supported Languages

--- a/docs/pages/pmd/userdocs/tools/ant.md
+++ b/docs/pages/pmd/userdocs/tools/ant.md
@ -122,6 +122,14 @@ The examples below won't repeat this taskdef element, as this is always required
      </td>
      <td>No</td>
    </tr>
+    <tr>
+      <td>threads</td>
+      <td>
+        Sets the number of threads used by PMD. Set threads to <code>0</code> to disable multi-threading processing.
+        Default: 1
+      </td>
+      <td>No</td>
+    </tr>
 </table>


--- a/docs/pages/pmd/userdocs/tools/ci.md
+++ b/docs/pages/pmd/userdocs/tools/ci.md
@ -10,17 +10,22 @@ author: Romain PELISSE <belaran@gmail.com>
 PMD can be integrate through some of the Continuous Integration tools that exist now.
 Here is a list of known (to us) plugin to do so.

-## Hudson Plugin
+## Jenkins Plugin

-Hafner Ullrich has developed a [PMD plugin][hudsonplugin] for Hudson.
-Please check the plugin homepage for more info.
+[Ullrich Hafner](https://github.com/uhafner) developed the
+[Warnings Next Generation](https://plugins.jenkins.io/warnings-ng/) plugin for Jenkins. It supports
+PMD among many other linting tools.

-[hudsonplugin]: http://hudson.gotdns.com/wiki/display/HUDSON/PMD+Plugin
+* Homepage: https://plugins.jenkins.io/warnings-ng/
+* Source: https://github.com/jenkinsci/warnings-ng-plugin and https://github.com/jenkinsci/analysis-model

 ## Continuum

 Continuum does not have a plugin for PMD per see, but can failed the build according to the
 result of the PMD maven plugin.

+## GitHub Action
+
+See [Other Tools / Integrations](pmd_userdocs_tools.html#github-actions)

 <!-- TODO: Find out about other plugins ? -->
--- a/docs/pages/pmd/userdocs/tools/java-api.md
+++ b/docs/pages/pmd/userdocs/tools/java-api.md
@ -70,7 +70,7 @@ public class PmdExample {
        configuration.setReportFormat("xml");
        configuration.setReportFile("/home/workspace/pmd-report.xml");

-        PMD.runPMD(configuration);
+        PMD.runPmd(configuration);
    }
 }
 ```
@ -80,7 +80,7 @@ public class PmdExample {
 This gives you more control over which files are processed, but is also more complicated.
 You can also provide your own custom renderers.

-1.  First we create a `PMDConfiguration`. This is currently the only way to specify a ruleset:
+1.  First we create a `PMDConfiguration` and configure it, first the rules:
    
    ```java
    PMDConfiguration configuration = new PMDConfiguration();
@ -88,58 +88,67 @@ You can also provide your own custom renderers.
    configuration.setRuleSets("rulesets/java/quickstart.xml");
    ```
    
-2.  In order to support type resolution, PMD needs to have access to the compiled classes and dependencies
-    as well. This is called "auxclasspath" and is also configured here.
+2.  Then we configure, which paths to analyze:
+    
+    ```java
+    configuration.setInputPaths("/home/workspace/src/main/java/code");
+    ```
+    
+3.  The we configure the default language version for Java. And in order to support type resolution,
+    PMD needs to have access to the compiled classes and dependencies as well. This is called
+    "auxclasspath" and is also configured here.
+
    Note: you can specify multiple class paths separated by `:` on Unix-systems or `;` under Windows.
    
    ```java
-    configuration.prependClasspath("/home/workspace/target/classes:/home/.m2/repository/my/dependency.jar");
+    configuration.setDefaultLanguageVersion(LanguageRegistry.findLanguageByTerseName("java").getVersion("11"));
+    configuration.prependAuxClasspath("/home/workspace/target/classes:/home/.m2/repository/my/dependency.jar");
    ```
    
-3.  Then we need to load the rulesets. This is done by using the configuration, taking the minimum priority into
-    account:
+4.  Then we configure the reporting. Configuring the report file is optional. If not specified, the report
+    will be written to `stdout`.
    
    ```java
-    RuleSetLoader ruleSetLoader = RuleSetLoader.fromPmdConfig(configuration);
-    List<RuleSet> ruleSets = ruleSetLoader.loadFromResources(Arrays.asList(configuration.getRuleSets().split(",")));
+    configuration.setReportFormat("xml");
+    configuration.setReportFile("/home/workspace/pmd-report.xml");
    ```
    
-4.  PMD operates on a list of `DataSource`. You can assemble a own list of `FileDataSource`, e.g.
+5.  Now an optional step: If you want to use additional renderers as in the example, set them up before
+    calling PMD. You can use a built-in renderer, e.g. `XMLRenderer` or a custom renderer implementing
+    `Renderer`. Note, that you must manually initialize the renderer by setting a suitable `Writer`:
    
    ```java
-    List<DataSource> files = Arrays.asList(new FileDataSource(new File("/path/to/src/MyClass.java")));
-    ```
-    
-5.  For reporting, you can use `GlobalAnalysisListener`, which receives events like violations and errors.
-    Useful implementations are provided by `Renderer` instances. To use a renderer, eg the built-in `XMLRenderer`,
-    create it and configure it with a suitable `Writer`.
+    Writer rendererOutput = new StringWriter();
+    Renderer renderer = createRenderer(rendererOutput);

-    ```java
-    StringWriter rendererOutput = new StringWriter();
-    Renderer xmlRenderer = new XMLRenderer("UTF-8");
-    xmlRenderer.setWriter(rendererOutput);
-    // The listener is created from the renderer in the next listing
+    // ...
+    private static Renderer createRenderer(Writer writer) {
+        XMLRenderer xml = new XMLRenderer("UTF-8");
+        xml.setWriter(writer);
+        return xml;
+    }
    ```

-6.  Now, all the preparations are done, and PMD can be executed. This is done by calling
-    `PMD.processFiles(...)`. This method call takes the configuration, the rulesets, the files
-    to process, and the list of renderers. Provide an empty list, if you don't want to use
-    any renderer. Note: The auxclasspath needs to be closed explicitly. Otherwise the class or jar files may
-    remain open and file resources are leaked.
+6.  Finally we can start the PMD analysis. There is the possibility to fine-tune the configuration
+    by adding additional files to analyze or adding additional rulesets or renderers:
    
    ```java
-    try (GlobalAnalysisListener listener = xmlRenderer.newListener()) {
-        PMD.processFiles(configuration, ruleSets, files, listener);
-    } finally {
-        ClassLoader auxiliaryClassLoader = configuration.getClassLoader();
-        if (auxiliaryClassLoader instanceof ClasspathClassLoader) {
-            ((ClasspathClassLoader) auxiliaryClassLoader).close();
-        }
+    try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
+        // optional: add more rulesets
+        pmd.addRuleSet(pmd.newRuleSetLoader().loadFromResource("custom-ruleset.xml"));
+        // optional: add more files
+        pmd.files().addFile(Paths.get("src", "main", "more-java", "ExtraSource.java"));
+        // optional: add more renderers
+        pmd.addRenderer(renderer);
+
+        // or just call PMD
+        pmd.performAnalysis();
    }
    ```
    
-7.  After the call, the renderer will have been flushed by PMD (through its `GlobalAnalysisListener`).
-    Then you can check the rendered output.
+    The renderer will be automatically flushed and closed at the end of the analysis.
+
+7.  Then you can check the rendered output.
    
    ``` java
    System.out.println("Rendered Report:");
@ -152,28 +161,15 @@ Here is a complete example:
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.nio.file.FileSystems;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.PathMatcher;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.nio.file.Paths;

-import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.PMDConfiguration;
+import net.sourceforge.pmd.PmdAnalysis;
 import net.sourceforge.pmd.RulePriority;
-import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.RuleSetLoader;
+import net.sourceforge.pmd.lang.LanguageRegistry;
 import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.renderers.XMLRenderer;
-import net.sourceforge.pmd.util.ClasspathClassLoader;
-import net.sourceforge.pmd.util.datasource.DataSource;
-import net.sourceforge.pmd.util.datasource.FileDataSource;

 public class PmdExample2 {

@ -181,22 +177,28 @@ public class PmdExample2 {
        PMDConfiguration configuration = new PMDConfiguration();
        configuration.setMinimumPriority(RulePriority.MEDIUM);
        configuration.setRuleSets("rulesets/java/quickstart.xml");
-        configuration.prependClasspath("/home/workspace/target/classes");
-        RuleSetLoader ruleSetLoader = RuleSetLoader.fromPmdConfig(configuration);
-        List<RuleSet> ruleSets = ruleSetLoader.loadFromResources(Arrays.asList(configuration.getRuleSets().split(",")));

-        List<DataSource> files = determineFiles("/home/workspace/src/main/java/code");
+        configuration.setInputPaths("/home/workspace/src/main/java/code");
+
+        configuration.setDefaultLanguageVersion(LanguageRegistry.findLanguageByTerseName("java").getVersion("11"));
+        configuration.prependAuxClasspath("/home/workspace/target/classes");
+
+        configuration.setReportFormat("xml");
+        configuration.setReportFile("/home/workspace/pmd-report.xml");

        Writer rendererOutput = new StringWriter();
        Renderer renderer = createRenderer(rendererOutput);

-        try (GlobalAnalysisListener listener = renderer.newListener()) {
-            PMD.processFiles(configuration, ruleSets, files, listener);
-        } finally {
-            ClassLoader auxiliaryClassLoader = configuration.getClassLoader();
-            if (auxiliaryClassLoader instanceof ClasspathClassLoader) {
-                ((ClasspathClassLoader) auxiliaryClassLoader).close();
-            }
+        try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {
+            // optional: add more rulesets
+            pmd.addRuleSet(RuleSetLoader.fromPmdConfig(configuration).loadFromResource("custom-ruleset.xml"));
+            // optional: add more files
+            pmd.files().addFile(Paths.get("src", "main", "more-java", "ExtraSource.java"));
+            // optional: add more renderers
+            pmd.addRenderer(renderer);
+
+            // or just call PMD
+            pmd.performAnalysis();
        }

        System.out.println("Rendered Report:");
@ -208,28 +210,6 @@ public class PmdExample2 {
        xml.setWriter(writer);
        return xml;
    }
-
-    private static List<DataSource> determineFiles(String basePath) throws IOException {
-        Path dirPath = FileSystems.getDefault().getPath(basePath);
-        final PathMatcher matcher = FileSystems.getDefault().getPathMatcher("glob:*.java");
-
-        final List<DataSource> files = new ArrayList<>();
-
-        Files.walkFileTree(dirPath, new SimpleFileVisitor<Path>() {
-            @Override
-            public FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {
-                if (matcher.matches(path.getFileName())) {
-                    System.out.printf("Using %s%n", path);
-                    files.add(new FileDataSource(path.toFile()));
-                } else {
-                    System.out.printf("Ignoring %s%n", path);
-                }
-                return super.visitFile(path, attrs);
-            }
-        });
-        System.out.printf("Analyzing %d files in %s%n", files.size(), basePath);
-        return files;
-    }
 }
 ```

--- a/docs/pages/pmd/userdocs/tools/tools.md
+++ b/docs/pages/pmd/userdocs/tools/tools.md
@ -31,6 +31,17 @@ Codiga uses PMD to check Java and Apex code.
 * Homepage: [https://www.codiga.io](https://www.codiga.io)
 * Documentation: [https://doc.codiga.io](https://doc.codiga.io)

+### GitHub Actions
+
+PMD provides its own GitHub Action, that can be integrated in custom workflows.
+
+It can execute PMD with your own ruleset against your project. It creates a [SARIF](https://docs.oasis-open.org/sarif/sarif/v2.1.0/sarif-v2.1.0.html)
+report which is uploaded as a build artifact. Furthermore the build can be failed based on the number of violations.
+
+The action can also be used as a code scanner to create "Code scanning alerts".
+
+* Homepage: [pmd/pmd-github-action](https://github.com/pmd/pmd-github-action)
+

 ## IDE Integrations

--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@ -19,16 +19,78 @@ This is a {{ site.pmd.release_type }} release.

 ### New and noteworthy

+
+#### New programmatic API
+
+This release introduces a new programmatic API to replace the inflexible {% jdoc core::PMD %} class.
+Programmatic execution of PMD should now be done with a {% jdoc core::PMDConfiguration %}
+and a {% jdoc core::PmdAnalysis %}, for instance:
+
+```java
+PMDConfiguration config = new PMDConfiguration();
+config.setDefaultLanguageVersion(LanguageRegistry.findLanguageByTerseName("java").getVersion("11"));
+config.setInputPaths("src/main/java");
+config.prependAuxClasspath("target/classes");
+config.setMinimumPriority(RulePriority.HIGH);
+config.addRuleSet("rulesets/java/quickstart.xml");
+config.setReportFormat("xml");
+config.setReportFile("target/pmd-report.xml");
+
+try (PmdAnalysis pmd = PmdAnalysis.create(config)) {
+    // note: don't use `config` once a PmdAnalysis has been created.
+    // optional: add more rulesets
+    pmd.addRuleSet(pmd.newRuleSetLoader().loadFromResource("custom-ruleset.xml"));
+    // optional: add more files
+    pmd.files().addFile(Paths.get("src", "main", "more-java", "ExtraSource.java"));
+    // optional: add more renderers
+    pmd.addRenderer(renderer);
+
+    // or just call PMD
+    pmd.performAnalysis();
+}
+```
+
+The `PMD` class still supports methods related to CLI execution: `runPmd` and `main`.
+All other members are now deprecated for removal.
+The CLI itself remains compatible, if you run PMD via command-line, no action is required on your part.
+
 ### Fixed Issues

-*   java-performance
-    *   [#3492](https://github.com/pmd/pmd/issues/3492): \[java] UselessStringValueOf: False positive when there is no initial String to append to
+*   apex-performance
+    *   [#3773](https://github.com/pmd/pmd/pull/3773): \[apex] EagerlyLoadedDescribeSObjectResult false positives with SObjectField.getDescribe()

 ### API Changes

+#### Deprecated API
+
+* Several members of {% jdoc core::PMD %} have been newly deprecated, including:
+  - `PMD#EOL`: use `System#lineSeparator()`
+  - `PMD#SUPPRESS_MARKER`: use {% jdoc core::PMDConfiguration#DEFAULT_SUPPRESS_MARKER %}
+  - `PMD#processFiles`: use the [new programmatic API](#new-programmatic-api)
+  - `PMD#getApplicableFiles`: is internal
+* {% jdoc !!core::PMDConfiguration#prependClasspath(java.lang.String) %} is deprecated
+  in favour of {% jdoc core::PMDConfiguration#prependAuxClasspath(java.lang.String) %}.
+* {% jdoc !!core::PMDConfiguration#setRuleSets(java.lang.String) %} and
+  {% jdoc core::PMDConfiguration#getRuleSets() %} are deprecated. Use instead
+  {% jdoc core::PMDConfiguration#setRuleSets(java.util.List) %},
+  {% jdoc core::PMDConfiguration#addRuleSet(java.lang.String) %},
+  and {% jdoc core::PMDConfiguration#getRuleSetPaths() %}.
+* Several members of {% jdoc test::cli.BaseCLITest %} have been deprecated with replacements.
+
+#### Experimental APIs
+
+*   Together with the [new programmatic API](#new-programmatic-api) the interface
+    {% jdoc core::lang.document.TextFile %} has been added as *experimental*. It intends
+    to replace {% jdoc core::util.datasource.DataSource %} and {% jdoc core::cpd.SourceCode %} in the long term.
+    
+    This interface will change in PMD 7 to support read/write operations
+    and other things. You don't need to use it in PMD 6, as {% jdoc core::lang.document.FileCollector %}
+    decouples you from this. A file collector is available through {% jdoc !!core::PmdAnalysis#files() %}.
+
+
 ### External Contributions

-*   [#3631](https://github.com/pmd/pmd/pull/3631): \[java] Fixed False positive for UselessStringValueOf when there is no initial String to append to - [John Armgardt](https://github.com/johnra2)
+*   [#3773](https://github.com/pmd/pmd/pull/3773): \[apex] EagerlyLoadedDescribeSObjectResult false positives with SObjectField.getDescribe() - [@filiprafalowicz](https://github.com/filiprafalowicz)

 {% endtocmaker %}

--- a/docs/pages/release_notes_old.md
+++ b/docs/pages/release_notes_old.md
@ -5,6 +5,186 @@ permalink: pmd_release_notes_old.html

 Previous versions of PMD can be downloaded here: https://github.com/pmd/pmd/releases

+## 26-February-2022 - 6.43.0
+
+The PMD team is pleased to announce PMD 6.43.0.
+
+This is a minor release.
+
+### Table Of Contents
+
+* [New and noteworthy](#new-and-noteworthy)
+* [Fixed Issues](#fixed-issues)
+* [API Changes](#api-changes)
+    * [Deprecated API](#deprecated-api)
+    * [Internal API](#internal-api)
+    * [Changed API](#changed-api)
+* [External Contributions](#external-contributions)
+* [Stats](#stats)
+
+### New and noteworthy
+
+### Fixed Issues
+
+*   core
+    *   [#3427](https://github.com/pmd/pmd/issues/3427): \[core] Stop printing CLI usage text when exiting due to invalid parameters
+    *   [#3768](https://github.com/pmd/pmd/issues/3768): \[core] SARIF formatter reports multiple locations when it should report multiple results
+*   doc
+    *   [#2502](https://github.com/pmd/pmd/issues/2502): \[doc] Add floating table-of-contents (toc) on the right
+    *   [#3807](https://github.com/pmd/pmd/pull/3807): \[doc] Document Ant Task parameter `threads`
+*   java
+    *   [#3698](https://github.com/pmd/pmd/issues/3697): \[java] Parsing error with try-with-resources and qualified resource
+*   java-bestpractices
+    *   [#3605](https://github.com/pmd/pmd/issues/3605): \[java] SwitchStmtsShouldHaveDefault triggered when default case is present
+*   java-codestyle
+    *   [#278](https://github.com/pmd/pmd/issues/278): \[java] ConfusingTernary should treat `!= null` as positive condition
+*   java-performance
+    *   [#3374](https://github.com/pmd/pmd/issues/3374): \[java] UseStringBufferForStringAppends: Wrong example in documentation
+*   misc
+    *   [#3759](https://github.com/pmd/pmd/issues/3759): \[lang-test] Upgrade dokka maven plugin to 1.4.32
+*   plsql
+    *   [#3746](https://github.com/pmd/pmd/issues/3746): \[plsql] Parsing exception "Less than or equal to/Greater than or equal to" operators in DML statements
+
+### API Changes
+
+#### Deprecated API
+
+Some API deprecations were performed in core PMD classes, to improve compatibility with PMD 7.
+- <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/Report.html#"><code>Report</code></a>: the constructor and other construction methods like addViolation or createReport
+- <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/RuleContext.html#"><code>RuleContext</code></a>: all constructors, getters and setters. A new set
+of stable methods, matching those in PMD 7, was added to replace the `addViolation`
+overloads of <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/lang/rule/AbstractRule.html#"><code>AbstractRule</code></a>. In PMD 7, `RuleContext` will
+be the API to report violations, and it can already be used as such in PMD 6.
+- The field <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/PMD.html#configuration"><code>configuration</code></a> is unused and will be removed.
+
+#### 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.
+
+- <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/RuleSet.html#"><code>RuleSet</code></a>: methods that serve to apply rules, including `apply`, `start`, `end`, `removeDysfunctionalRules`
+- <a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/renderers/AbstractAccumulatingRenderer.html#renderFileReport(Report)"><code>AbstractAccumulatingRenderer#renderFileReport</code></a> is internal API
+  and should not be overridden in own renderers.
+
+#### Changed API
+
+It is now forbidden to report a violation:
+- With a `null` node
+- With a `null` message
+- With a `null` set of format arguments (prefer a zero-length array)
+
+Note that the message is set from the XML rule declaration, so this is only relevant
+if you instantiate rules manually.
+
+<a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/RuleContext.html#"><code>RuleContext</code></a> now requires setting the current rule before calling
+<a href="https://docs.pmd-code.org/apidocs/pmd-core/6.43.0/net/sourceforge/pmd/Rule.html#apply(java.util.List,net.sourceforge.pmd.RuleContext)"><code>apply</code></a>. This is
+done automatically by `RuleSet#apply` and such. Creating and configuring a
+`RuleContext` manually is strongly advised against, as the lifecycle of `RuleContext`
+will change drastically in PMD 7.
+
+### External Contributions
+
+*   [#3767](https://github.com/pmd/pmd/pull/3767): \[core] Update GUI.java - [Vyom Yadav](https://github.com/Vyom-Yadav)
+*   [#3804](https://github.com/pmd/pmd/pull/3804): \[doc] Add floating table of contents (issue #2502) - [JerritEic](https://github.com/JerritEic)
+
+### Stats
+* 49 commits
+* 22 closed tickets & PRs
+* Days since last release: 27
+
+## 29-January-2022 - 6.42.0
+
+The PMD team is pleased to announce PMD 6.42.0.
+
+This is a minor release.
+
+### Table Of Contents
+
+* [New and noteworthy](#new-and-noteworthy)
+    * [Javascript: Rhino updated to latest version 1.7.14](#javascript:-rhino-updated-to-latest-version-1.7.14)
+    * [New rules](#new-rules)
+    * [Modified rules](#modified-rules)
+* [Fixed Issues](#fixed-issues)
+* [API Changes](#api-changes)
+* [External Contributions](#external-contributions)
+* [Stats](#stats)
+
+### New and noteworthy
+
+#### Javascript: Rhino updated to latest version 1.7.14
+
+[Rhino](https://github.com/mozilla/rhino), the implementation of JavaScript we use
+for parsing JavaScript code, has been updated to the latest version 1.7.14.
+Now language features like template strings can be parsed. However Rhino does
+not support all features of the latest EcmaScript standard.
+
+#### New rules
+
+*   The new Java rule [`FinalParameterInAbstractMethod`](https://pmd.github.io/pmd-6.42.0/pmd_rules_java_codestyle.html#finalparameterinabstractmethod) detects parameters that are
+    declared as final in interfaces or abstract methods. Declaring the parameters as final is useless
+    because the implementation may choose to not respect it.
+
+```xml
+    <rule ref="category/java/codestyle.xml/FinalParameterInAbstractMethod" />
+```
+
+   The rule is part of the quickstart.xml ruleset.
+
+#### Modified rules
+
+*   The Apex rule [`ApexDoc`](https://pmd.github.io/pmd-6.42.0/pmd_rules_apex_documentation.html#apexdoc) has a new property `reportProperty`.
+    If set to `false` (default is `true` if unspecified) doesn't report missing ApexDoc comments on properties.
+    It allows you to enforce ApexDoc comments for classes and methods without requiring them for properties.
+
+### Fixed Issues
+
+*   core
+    *   [#3328](https://github.com/pmd/pmd/issues/3328): \[core] designer.bat errors when JAVAFX_HOME contains spaces
+*   java
+    *   [#3698](https://github.com/pmd/pmd/issues/3698): \[java] Error resolving Symbol Table
+*   java-bestpractices
+    *   [#3209](https://github.com/pmd/pmd/issues/3209): \[java] UnusedPrivateMethod false positive with static method and cast expression
+    *   [#3468](https://github.com/pmd/pmd/issues/3468): \[java] UnusedPrivateMethod false positive when outer class calls private static method on inner class
+*   java-design
+    *   [#3679](https://github.com/pmd/pmd/issues/3679): \[java] Make FinalFieldCouldBeStatic detect constant variable
+*   java-errorprone
+    *   [#3644](https://github.com/pmd/pmd/issues/3644): \[java] InvalidLogMessageFormat: false positives with logstash structured logging
+    *   [#3686](https://github.com/pmd/pmd/issues/3686): \[java] ReturnEmptyCollectionRatherThanNull - false negative with conditioned returns
+    *   [#3701](https://github.com/pmd/pmd/issues/3701): \[java] MissingStaticMethodInNonInstantiatableClass false positive with method inner classes
+    *   [#3721](https://github.com/pmd/pmd/issues/3721): \[java] ReturnEmptyCollectionRatherThanNull - false positive with stream and lambda
+*   java-performance
+    *   [#3492](https://github.com/pmd/pmd/issues/3492): \[java] UselessStringValueOf: False positive when there is no initial String to append to
+    *   [#3639](https://github.com/pmd/pmd/issues/3639): \[java] UseStringBufferLength: false negative with empty string variable
+    *   [#3712](https://github.com/pmd/pmd/issues/3712): \[java] InsufficientStringBufferDeclaration false positive with StringBuilder.setLength(0)
+*   javascript
+    *   [#3703](https://github.com/pmd/pmd/issues/3703): \[javascript] Error - no Node adapter class registered for XmlPropRef
+
+### API Changes
+
+No changes.
+
+### External Contributions
+
+*   [#3631](https://github.com/pmd/pmd/pull/3631): \[java] Fixed False positive for UselessStringValueOf when there is no initial String to append to - [John Armgardt](https://github.com/johnra2)
+*   [#3683](https://github.com/pmd/pmd/pull/3683): \[java] Fixed 3468 UnusedPrivateMethod false positive when outer class calls private static method on inner class - [John Armgardt](https://github.com/johnra2)
+*   [#3688](https://github.com/pmd/pmd/pull/3688): \[java] Bump log4j to 2.16.0 - [Sergey Nuyanzin](https://github.com/snuyanzin)
+*   [#3693](https://github.com/pmd/pmd/pull/3693): \[apex] ApexDoc: Add reportProperty property - [Steve Babula](https://github.com/babula)
+*   [#3704](https://github.com/pmd/pmd/pull/3704): \[java] Fix for #3686 - Fix ReturnEmptyCollectionRatherThanNull - [Oleksii Dykov](https://github.com/dykov)
+*   [#3713](https://github.com/pmd/pmd/pull/3713): \[java] Enhance UnnecessaryModifier to support records - [Vincent Galloy](https://github.com/vgalloy)
+*   [#3719](https://github.com/pmd/pmd/pull/3719): \[java] Upgrade log4j to 2.17.1 - [Daniel Paul Searles](https://github.com/squaresurf)
+*   [#3720](https://github.com/pmd/pmd/pull/3720): \[java] New rule: FinalParameterInAbstractMethod - [Vincent Galloy](https://github.com/vgalloy)
+*   [#3724](https://github.com/pmd/pmd/pull/3724): \[java] Fix for #3679 - fix FinalFieldCouldBeStatic - [Oleksii Dykov](https://github.com/dykov)
+*   [#3727](https://github.com/pmd/pmd/pull/3727): \[java] #3724 - fix FinalFieldCouldBeStatic: triggers only if the referenced name is static - [Oleksii Dykov](https://github.com/dykov)
+*   [#3742](https://github.com/pmd/pmd/pull/3742): \[java] Fix #3701 - fix MissingStaticMethodInNonInstantiatableClass for method local classes - [Oleksii Dykov](https://github.com/dykov)
+*   [#3744](https://github.com/pmd/pmd/pull/3744): \[core] Updated SaxonXPathRuleQueryTest.java - [Vyom Yadav](https://github.com/Vyom-Yadav)
+*   [#3745](https://github.com/pmd/pmd/pull/3745): \[java] Fix #3712: InsufficientStringBufferDeclaration setLength false positive - [Daniel Gredler](https://github.com/gredler)
+*   [#3747](https://github.com/pmd/pmd/pull/3747): \[visualforce] Updated DataType.java - [Vyom Yadav](https://github.com/Vyom-Yadav)
+
+### Stats
+* 88 commits
+* 35 closed tickets & PRs
+* Days since last release: 62
+
 ## 27-November-2021 - 6.41.0

 The PMD team is pleased to announce PMD 6.41.0.
--- a/18
+++ b/18
@ -36,6 +36,10 @@

 if [ -z "$MAVEN_SKIP_RC" ] ; then

+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
  if [ -f /etc/mavenrc ] ; then
    . /etc/mavenrc
  fi
@ -145,7 +149,7 @@ if [ -z "$JAVACMD" ] ; then
      JAVACMD="$JAVA_HOME/bin/java"
    fi
  else
-    JAVACMD="`which java`"
+    JAVACMD="`\\unset -f command; \\command -v java`"
  fi
 fi

@ -212,9 +216,9 @@ else
      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
    fi
    if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
    else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
    fi
    while IFS="=" read key value; do
      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@ -233,9 +237,9 @@ else
          echo "Found wget ... using wget"
        fi
        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget "$jarUrl" -O "$wrapperJarPath"
+            wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
        else
-            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
        fi
    elif command -v curl > /dev/null; then
        if [ "$MVNW_VERBOSE" = true ]; then
@ -305,6 +309,8 @@ WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

 exec "$JAVACMD" \
  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  "-Dmaven.home=${M2_HOME}" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
--- a/mvnw.cmd
+++ b/mvnw.cmd
@ -46,8 +46,8 @@ if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
 if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
 :skipRcPre

@setlocal
@ -120,9 +120,9 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"

-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
 )

@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
    )
 ) else (
    if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
    )
    if "%MVNW_VERBOSE%" == "true" (
        echo Couldn't find %WRAPPER_JAR%, downloading it ...
@ -158,7 +158,13 @@ if exist %WRAPPER_JAR% (
@REM work with both Windows and non-Windows executions.
 set MAVEN_CMD_LINE_ARGS=%*

-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end

@ -168,15 +174,15 @@ set ERROR_CODE=1
 :end
@endlocal & set ERROR_CODE=%ERROR_CODE%

-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
 :skipRcPost

@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
+if "%MAVEN_BATCH_PAUSE%"=="on" pause

-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%

-exit /B %ERROR_CODE%
+cmd /C exit /B %ERROR_CODE%
--- a/package-lock.json
+++ b/package-lock.json
@ -9,9 +9,9 @@
      }
    },
    "node_modules/@babel/runtime": {
-      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-      "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
      "dev": true,
      "dependencies": {
        "regenerator-runtime": "^0.13.4"
@ -84,9 +84,9 @@
      }
    },
    "node_modules/async": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
-      "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
      "dev": true
    },
    "node_modules/camelcase": {
@ -306,13 +306,13 @@
      }
    },
    "node_modules/json-fixer": {
-      "version": "1.6.12",
-      "resolved": "https://registry.npmjs.org/json-fixer/-/json-fixer-1.6.12.tgz",
-      "integrity": "sha512-BGO9HExf0ZUVYvuWsps71Re513Ss0il1Wp7wYWkir2NthzincvNJEUu82KagEfAkGdjOMsypj3t2JB7drBKWnA==",
+      "version": "1.6.13",
+      "resolved": "https://registry.npmjs.org/json-fixer/-/json-fixer-1.6.13.tgz",
+      "integrity": "sha512-DKQ71M+0uwAG3QsUkeVgh6XREw/OkpnTfHfM+sdmxRjHvYZ8PlcMVF4ibsHQ1ckR63NROs68qUr1I0u6yPVePQ==",
      "dev": true,
      "dependencies": {
        "@babel/runtime": "^7.14.6",
-        "chalk": "^4.1.1",
+        "chalk": "^4.1.2",
        "pegjs": "^0.10.0"
      },
      "engines": {
@ -353,15 +353,23 @@
      "dev": true
    },
    "node_modules/node-fetch": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
-      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
      "dev": true,
      "dependencies": {
        "whatwg-url": "^5.0.0"
      },
      "engines": {
        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
      }
    },
    "node_modules/onetime": {
@ -690,9 +698,9 @@
  },
  "dependencies": {
    "@babel/runtime": {
-      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz",
-      "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
      "dev": true,
      "requires": {
        "regenerator-runtime": "^0.13.4"
@ -741,9 +749,9 @@
      }
    },
    "async": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
-      "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
      "dev": true
    },
    "camelcase": {
@ -912,13 +920,13 @@
      "dev": true
    },
    "json-fixer": {
-      "version": "1.6.12",
-      "resolved": "https://registry.npmjs.org/json-fixer/-/json-fixer-1.6.12.tgz",
-      "integrity": "sha512-BGO9HExf0ZUVYvuWsps71Re513Ss0il1Wp7wYWkir2NthzincvNJEUu82KagEfAkGdjOMsypj3t2JB7drBKWnA==",
+      "version": "1.6.13",
+      "resolved": "https://registry.npmjs.org/json-fixer/-/json-fixer-1.6.13.tgz",
+      "integrity": "sha512-DKQ71M+0uwAG3QsUkeVgh6XREw/OkpnTfHfM+sdmxRjHvYZ8PlcMVF4ibsHQ1ckR63NROs68qUr1I0u6yPVePQ==",
      "dev": true,
      "requires": {
        "@babel/runtime": "^7.14.6",
-        "chalk": "^4.1.1",
+        "chalk": "^4.1.2",
        "pegjs": "^0.10.0"
      }
    },
@ -950,9 +958,9 @@
      "dev": true
    },
    "node-fetch": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz",
-      "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
      "dev": true,
      "requires": {
        "whatwg-url": "^5.0.0"
--- a/pmd-apex-jorje/pom.xml
+++ b/pmd-apex-jorje/pom.xml
@ -48,17 +48,7 @@
    <dependency>
        <groupId>cglib</groupId>
        <artifactId>cglib</artifactId>
-        <version>3.2.0</version>
-    </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-classic</artifactId>
-        <version>1.2.3</version>
-    </dependency>
-    <dependency>
-        <groupId>ch.qos.logback</groupId>
-        <artifactId>logback-core</artifactId>
-        <version>1.2.3</version>
+        <version>3.3.0</version> <!-- apex jorje actually depends on 3.2.0 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
    </dependency>
    <dependency>
        <groupId>com.google.code.findbugs</groupId>
@ -68,7 +58,7 @@
    <dependency>
        <groupId>com.google.code.gson</groupId>
        <artifactId>gson</artifactId>
-        <version>2.7</version>
+        <!-- apex jorje actually depends on 2.7 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
    </dependency>
    <dependency>
        <groupId>com.google.errorprone</groupId>
@ -78,6 +68,7 @@
    <dependency>
        <groupId>com.google.guava</groupId>
        <artifactId>guava</artifactId>
+        <!-- apex jorje actually depends on 26.0-jre (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
    </dependency>
    <dependency>
        <groupId>com.google.j2objc</groupId>
@ -111,12 +102,12 @@
    <dependency>
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-api</artifactId>
-        <version>1.7.20</version>
+        <!-- apex jorje actually depends on 1.7.20 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
    </dependency>
    <dependency>
        <groupId>org.yaml</groupId>
        <artifactId>snakeyaml</artifactId>
-        <version>1.26</version>
+        <!-- apex jorje actually depends on 1.17 (https://github.com/forcedotcom/salesforcedx-vscode/commit/631b8cfb85cff5e989bfea13bca681b6cedcb003) -->
    </dependency>
    <dependency>
        <groupId>aopalliance</groupId>
--- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexHandler.java
+++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/ApexHandler.java
@ -46,7 +46,7 @@ public class ApexHandler extends AbstractPmdLanguageVersionHandler {
        return myMetricsProvider;
    }

-    private static class ApexMetricsProvider implements LanguageMetricsProvider {
+    private static final class ApexMetricsProvider implements LanguageMetricsProvider {

        private final Set<Metric<?, ?>> metrics = setOf(
            ApexMetrics.COGNITIVE_COMPLEXITY,
--- a/Show More
+++ b/Show More