[maven-pmd-plugin] 01/02: [MPMD-298] - Upgrade Doxia Sitetools to 1.9.2 to remove dependency on Struts

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adangel pushed a commit to branch MPMD-298
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git

commit 76cbfebde2136350d130d343f352b11494d19606
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Sun Mar 1 12:09:55 2020 +0100

    [MPMD-298] - Upgrade Doxia Sitetools to 1.9.2 to remove dependency on Struts
---
 pom.xml                       | 7 ++++---
 src/it/MPMD-165/verify.groovy | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 187719e..9ae16eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,8 @@ under the License.
 
   <properties>
     <mavenVersion>3.0</mavenVersion>
-    <doxiaVersion>1.7</doxiaVersion>
+    <doxiaVersion>1.9.1</doxiaVersion>
+    <doxiaSitetoolsVersion>1.9.2</doxiaSitetoolsVersion>
     <javaVersion>7</javaVersion><!-- Because PMD 5.4+ requires Java 7 -->
     <pmdVersion>6.21.0</pmdVersion>
     <sitePluginVersion>3.7.1</sitePluginVersion>
@@ -159,12 +160,12 @@ under the License.
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-decoration-model</artifactId>
-      <version>${doxiaVersion}</version>
+      <version>${doxiaSitetoolsVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-site-renderer</artifactId>
-      <version>${doxiaVersion}</version>
+      <version>${doxiaSitetoolsVersion}</version>
       <!--
         Note: doxia-site-renderer needs to be defined AFTER pmd:
         doxia-site-renderer requires transitively dom4j 1.1 which provides a very old version of jaxen (same jar).
diff --git a/src/it/MPMD-165/verify.groovy b/src/it/MPMD-165/verify.groovy
index eaa0608..116a28f 100644
--- a/src/it/MPMD-165/verify.groovy
+++ b/src/it/MPMD-165/verify.groovy
@@ -23,4 +23,4 @@ assert pmdHtml.exists()
 // Groovy's getText() automatically detects the correct encoding, so that UTF-16 works out of the box
 // see also http://groovy.codehaus.org/api/groovy/util/CharsetToolkit.html
 def html = pmdHtml.text;
-assert html.contains( '<meta http-equiv="Content-Type" content="text/html; charset=UTF-16" />' );
+assert html.contains( '<meta charset="UTF-16" />' );