Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5854B200D62 for ; Sat, 16 Dec 2017 17:46:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 56967160C01; Sat, 16 Dec 2017 16:46:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AFD67160C2A for ; Sat, 16 Dec 2017 17:46:18 +0100 (CET) Received: (qmail 35633 invoked by uid 500); 16 Dec 2017 16:46:17 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 35614 invoked by uid 99); 16 Dec 2017 16:46:17 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Dec 2017 16:46:17 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A4F9881C48; Sat, 16 Dec 2017 16:46:15 +0000 (UTC) Date: Sat, 16 Dec 2017 16:46:21 +0000 To: "commits@maven.apache.org" Subject: [maven-pmd-plugin] 07/07: Merge branch 'MPMD-247' MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: adangel@apache.org In-Reply-To: <151344277487.22503.6964887301091999305@gitbox.apache.org> References: <151344277487.22503.6964887301091999305@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: maven-pmd-plugin X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: b45547248cf595434f823a227e924394f0b043bc X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171216164615.A4F9881C48@gitbox.apache.org> archived-at: Sat, 16 Dec 2017 16:46:19 -0000 This is an automated email from the ASF dual-hosted git repository. adangel pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-pmd-plugin.git commit b45547248cf595434f823a227e924394f0b043bc Merge: a9c1a4f 866374a Author: Andreas Dangel AuthorDate: Sat Dec 16 17:28:55 2017 +0100 Merge branch 'MPMD-247' pom.xml | 9 +- src/it/MPMD-205-pmd-js-check/pom.xml | 6 +- src/it/MPMD-206-sourceDirectories-js/pom.xml | 6 +- .../src/main/pmd/ruleset.xml | 1 + .../mod-1/src/main/config/pmd/latin-1.xml | 8 +- .../mod-1/src/main/config/pmd/utf-8.xml | 8 +- src/it/multi-module/mod-2/rulesets/java/basic.xml | 8 +- .../multi-module/mod-3/src/main/config/pmd/abs.xml | 8 +- .../multi-module/mod-3/src/main/config/pmd/rel.xml | 8 +- .../org/apache/maven/plugins/pmd/PmdReport.java | 22 +++-- .../rulesets/java/maven-pmd-plugin-default.xml | 93 ++++++++++++++++++ src/main/resources/rulesets/maven.xml | 94 ++++++++++++++----- src/site/apt/examples/javascriptReport.apt.vm | 13 ++- src/site/apt/examples/jspReport.apt.vm | 14 ++- src/site/apt/examples/multi-module-config.apt.vm | 30 ++++-- .../apt/examples/upgrading-PMD-at-runtime.apt.vm | 2 +- src/site/apt/examples/usingRuleSets.apt.vm | 104 +++++++++++++++++++-- src/site/apt/index.apt.vm | 18 +++- src/site/apt/usage.apt.vm | 4 +- .../apache/maven/plugins/pmd/PmdReportTest.java | 29 +++--- .../custom-configuration-plugin-config.xml | 4 +- .../resources/rulesets/custom.xml | 30 +++--- .../javascript-configuration-plugin-config.xml | 6 +- .../jsp-configuration-plugin-config.xml | 6 +- .../rulesets/sonar-way-ruleset.xml | 9 +- 25 files changed, 407 insertions(+), 133 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@maven.apache.org" .