You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/10/03 09:23:17 UTC

[1/2] git commit: Aligning indents in checkstyle config file

Repository: jclouds
Updated Branches:
  refs/heads/fix-checkstyle [created] 4609082b5


Aligning indents in checkstyle config file


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9ca1a149
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9ca1a149
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9ca1a149

Branch: refs/heads/fix-checkstyle
Commit: 9ca1a149fed976ec104d627dfdb47a34d884d1ff
Parents: a32292f
Author: Andrew Phillips <an...@apache.org>
Authored: Fri Oct 3 02:20:39 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Fri Oct 3 02:20:39 2014 -0500

----------------------------------------------------------------------
 resources/checkstyle.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/9ca1a149/resources/checkstyle.xml
----------------------------------------------------------------------
diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml
index da62202..2c734ee 100644
--- a/resources/checkstyle.xml
+++ b/resources/checkstyle.xml
@@ -60,9 +60,9 @@
             <property name="tokens" value="COMMA, SEMI"/>
         </module>
         <module name="WhitespaceAround">
-          <property name="ignoreEnhancedForColon" value="false" />
-          <!-- TODO: enable LCURLY, RCURLY, SLIST -->
-          <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
+            <property name="ignoreEnhancedForColon" value="false" />
+            <!-- TODO: enable LCURLY, RCURLY, SLIST -->
+            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
         </module>
     </module>
     <module name="Header">


[2/2] git commit: Excluding checkstyle.xml from Checkstyle checking

Posted by an...@apache.org.
Excluding checkstyle.xml from Checkstyle checking

Since 5bac61d9 (update to Checkstyle 2.13), fails on itself
as it includes '@author' in a module definition.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4609082b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4609082b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4609082b

Branch: refs/heads/fix-checkstyle
Commit: 4609082b5efd088af57a3fddfcef9848df8396b3
Parents: 9ca1a14
Author: Andrew Phillips <an...@apache.org>
Authored: Fri Oct 3 02:20:51 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Fri Oct 3 02:20:51 2014 -0500

----------------------------------------------------------------------
 project/pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/4609082b/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 6caa1ba..5290894 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -1106,6 +1106,8 @@
               <configLocation>resources/checkstyle.xml</configLocation>
               <failOnViolation>true</failOnViolation>
               <failsOnError>true</failsOnError>
+              <!-- fails on itself as it uses the author tag in a module definition -->
+              <resourceExcludes>checkstyle.xml</resourceExcludes>
               <violationSeverity>warning</violationSeverity>
             </configuration>
             <executions>