You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ad...@apache.org on 2020/03/01 11:18:40 UTC
[maven-pmd-plugin] branch MPMD-298 created (now 1e3a63f)
This is an automated email from the ASF dual-hosted git repository.
adangel pushed a change to branch MPMD-298
in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git.
at 1e3a63f Enable java.version specific integrations tests for newer versions
This branch includes the following new commits:
new 76cbfeb [MPMD-298] - Upgrade Doxia Sitetools to 1.9.2 to remove dependency on Struts
new 1e3a63f Enable java.version specific integrations tests for newer versions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-pmd-plugin] 01/02: [MPMD-298] - Upgrade Doxia Sitetools to
1.9.2 to remove dependency on Struts
Posted by 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" />' );
[maven-pmd-plugin] 02/02: Enable java.version specific integrations
tests for newer versions
Posted by 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 1e3a63f98636b396aaf544cf39a0c4b79b80fee3
Author: Andreas Dangel <ad...@apache.org>
AuthorDate: Sun Mar 1 12:17:50 2020 +0100
Enable java.version specific integrations tests for newer versions
---
src/it/MPMD-270-JDK11/invoker.properties | 2 +-
src/it/MPMD-280-JDK12/invoker.properties | 2 +-
src/it/MPMD-295-JDK13/invoker.properties | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/it/MPMD-270-JDK11/invoker.properties b/src/it/MPMD-270-JDK11/invoker.properties
index 6c4e161..841d0b9 100644
--- a/src/it/MPMD-270-JDK11/invoker.properties
+++ b/src/it/MPMD-270-JDK11/invoker.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 11
+invoker.java.version = 11+
invoker.goals = clean verify
\ No newline at end of file
diff --git a/src/it/MPMD-280-JDK12/invoker.properties b/src/it/MPMD-280-JDK12/invoker.properties
index 57be403..1be113e 100644
--- a/src/it/MPMD-280-JDK12/invoker.properties
+++ b/src/it/MPMD-280-JDK12/invoker.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 12
+invoker.java.version = 12+
invoker.goals = clean verify
\ No newline at end of file
diff --git a/src/it/MPMD-295-JDK13/invoker.properties b/src/it/MPMD-295-JDK13/invoker.properties
index b8338a7..7581147 100644
--- a/src/it/MPMD-295-JDK13/invoker.properties
+++ b/src/it/MPMD-295-JDK13/invoker.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version = 13
+invoker.java.version = 13+
invoker.goals = clean verify