Merge branch '7.0.x' into pmd7-language-lifecycle

pmd-xml/pom.xml

@@ -30,6 +30,7 @@
                     <delimiters>
                         <delimiter>${*}</delimiter>
                     </delimiters>
+                    <escapeString>\</escapeString>
                 </configuration>
             </plugin>
         </plugins>

pmd-xml/src/main/resources/category/pom/errorprone.xml

@@ -65,7 +65,7 @@ The following types are considered valid: pom, jar, maven-plugin, ejb, war, ear,
           externalInfoUrl="${pmd.website.baseurl}/pmd_rules_pom_errorprone.html#projectversionasdependencyversion">
         <description>
 Using that expression in dependency declarations seems like a shortcut, but it can go wrong.
-By far the most common problem is the use of &#x24;{project.version} in a BOM or parent POM.
+By far the most common problem is the use of \${project.version} in a BOM or parent POM.
         </description>
         <priority>3</priority>
         <properties>
@@ -89,7 +89,7 @@ By far the most common problem is the use of &#x24;{project.version} in a BOM or
   ...
   <dependency>
     ...
-    <version>${project.version}</version>
+    <version>\${project.version}</version>
   </dependency>
 </project>
 ]]>