maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gb...@apache.org
Subject [maven-checkstyle-plugin] branch master updated: Fix ITs on Windows by ignoring the NewlineAtEndOfFile check
Date Sat, 24 Feb 2018 21:25:18 GMT
This is an automated email from the ASF dual-hosted git repository.

gboue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 2113b86  Fix ITs on Windows by ignoring the NewlineAtEndOfFile check
2113b86 is described below

commit 2113b8677f7d1c4e3f78ba2069bbe690d9c8cfd6
Author: Guillaume Boué <gboue@apache.org>
AuthorDate: Sat Feb 24 21:58:47 2018 +0100

    Fix ITs on Windows by ignoring the NewlineAtEndOfFile check
---
 .../src/main/resources/com/company/build-tools/checkstyle.xml           | 1 -
 src/it/MCHECKSTYLE-169/pom.xml                                          | 1 -
 src/it/MCHECKSTYLE-220/pom.xml                                          | 1 +
 src/it/check-fail/verify.groovy                                         | 2 +-
 src/it/multi-modules/pom.xml                                            | 2 +-
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
b/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
index f90738b..bdfae83 100644
--- a/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
+++ b/src/it/MCHECKSTYLE-169/build-tools/src/main/resources/com/company/build-tools/checkstyle.xml
@@ -23,7 +23,6 @@ under the License.
     "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
     "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
-  <module name="NewlineAtEndOfFile"/>
   <module name="SuppressionFilter">
     <property name="file" value="${checkstyle.suppressions.file}"/>
   </module>
diff --git a/src/it/MCHECKSTYLE-169/pom.xml b/src/it/MCHECKSTYLE-169/pom.xml
index aa5a512..abfa9e7 100644
--- a/src/it/MCHECKSTYLE-169/pom.xml
+++ b/src/it/MCHECKSTYLE-169/pom.xml
@@ -32,7 +32,6 @@ under the License.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <checkstyleVersion>@project.version@</checkstyleVersion>
-    <checkstyle.violation.ignore>NewlineAtEndOfFile</checkstyle.violation.ignore>
   </properties>
 
   <build>
diff --git a/src/it/MCHECKSTYLE-220/pom.xml b/src/it/MCHECKSTYLE-220/pom.xml
index 7bc1d04..586ebed 100644
--- a/src/it/MCHECKSTYLE-220/pom.xml
+++ b/src/it/MCHECKSTYLE-220/pom.xml
@@ -31,6 +31,7 @@
   <url>https://issues.apache.org/jira/browse/MCHECKSTYLE-220</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <checkstyle.violation.ignore>NewlineAtEndOfFile</checkstyle.violation.ignore>
   </properties>
   <build>
     <plugins>
diff --git a/src/it/check-fail/verify.groovy b/src/it/check-fail/verify.groovy
index f9ee9c9..8e191e9 100644
--- a/src/it/check-fail/verify.groovy
+++ b/src/it/check-fail/verify.groovy
@@ -19,4 +19,4 @@
  */
 def buildLog = new File( basedir, 'build.log' )
 
-assert buildLog.text.contains( "[INFO] There is 1 error reported by Checkstyle" )
+assert buildLog.text.contains( "You have 1 Checkstyle violation" )
diff --git a/src/it/multi-modules/pom.xml b/src/it/multi-modules/pom.xml
index a4df2f7..1539b19 100644
--- a/src/it/multi-modules/pom.xml
+++ b/src/it/multi-modules/pom.xml
@@ -29,7 +29,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <checkstyle.violation.ignore>JavadocPackage</checkstyle.violation.ignore>
+    <checkstyle.violation.ignore>NewlineAtEndOfFile,JavadocPackage</checkstyle.violation.ignore>
   </properties>
 
   <build>

-- 
To stop receiving notification emails like this one, please contact
gboue@apache.org.

Mime
View raw message