You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2015/02/09 14:22:29 UTC
[1/2] cxf-build-utils git commit: Update checkstyle configs to work
with Checkstyle 6
Repository: cxf-build-utils
Updated Branches:
refs/heads/master 20ec6f8e4 -> b3cb66677
Update checkstyle configs to work with Checkstyle 6
Project: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/commit/d43e340f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/tree/d43e340f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/diff/d43e340f
Branch: refs/heads/master
Commit: d43e340feff06292ed8c3575b58e30d1fd487b12
Parents: 20ec6f8
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 08:07:52 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 08:07:52 2015 -0500
----------------------------------------------------------------------
buildtools/src/main/resources/cxf-checkstyle-corba.xml | 4 +++-
buildtools/src/main/resources/cxf-checkstyle.xml | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-build-utils/blob/d43e340f/buildtools/src/main/resources/cxf-checkstyle-corba.xml
----------------------------------------------------------------------
diff --git a/buildtools/src/main/resources/cxf-checkstyle-corba.xml b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
index 0aae173..11ec9ce 100644
--- a/buildtools/src/main/resources/cxf-checkstyle-corba.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle-corba.xml
@@ -105,7 +105,7 @@
<property name="max" value="75" />
</module>
<module name="LineLength">
- <property name="max" value="110" />
+ <property name="max" value="120" />
</module>
<module name="MethodLength">
<property name="max" value="150" />
@@ -113,6 +113,7 @@
</module>
<module name="ParameterNumber">
<property name="max" value="7" />
+ <property name="ignoreOverriddenMethods" value="true"/>
</module>
<!-- Checks for whitespace -->
@@ -280,6 +281,7 @@
<!--module name="TrailingComment"/-->
<module name="Indentation">
<property name="caseIndent" value="0" />
+ <property name="lineWrappingIndentation" value="0"/>
</module>
<!--<module name="RequiredRegexp">-->
</module>
http://git-wip-us.apache.org/repos/asf/cxf-build-utils/blob/d43e340f/buildtools/src/main/resources/cxf-checkstyle.xml
----------------------------------------------------------------------
diff --git a/buildtools/src/main/resources/cxf-checkstyle.xml b/buildtools/src/main/resources/cxf-checkstyle.xml
index 2617a95..03176f1 100644
--- a/buildtools/src/main/resources/cxf-checkstyle.xml
+++ b/buildtools/src/main/resources/cxf-checkstyle.xml
@@ -108,6 +108,7 @@
</module>
<module name="ParameterNumber">
<property name="max" value="7" />
+ <property name="ignoreOverriddenMethods" value="true"/>
</module>
<!-- Checks for whitespace -->
@@ -274,7 +275,8 @@
<!--<module name="UncommentedMain"/>-->
<!--module name="TrailingComment"/-->
<module name="Indentation">
- <property name="caseIndent" value="0" />
+ <property name="caseIndent" value="0" />
+ <property name="lineWrappingIndentation" value="0"/>
</module>
<!--<module name="RequiredRegexp">-->
</module>
[2/2] cxf-build-utils git commit: Update PMD rulesets to work without
warnings with latest maven-pmd-plugin and in eclipse
Posted by dk...@apache.org.
Update PMD rulesets to work without warnings with latest maven-pmd-plugin and in eclipse
Project: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/commit/b3cb6667
Tree: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/tree/b3cb6667
Diff: http://git-wip-us.apache.org/repos/asf/cxf-build-utils/diff/b3cb6667
Branch: refs/heads/master
Commit: b3cb66677d88d9ca1fa1ca965d6c6140477755cb
Parents: d43e340
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 08:21:55 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 08:21:55 2015 -0500
----------------------------------------------------------------------
buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml | 8 ++++----
buildtools/src/main/resources/cxf-pmd-ruleset.xml | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-build-utils/blob/b3cb6667/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
----------------------------------------------------------------------
diff --git a/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml b/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
index 349a8cc..0967dad 100644
--- a/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
+++ b/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
@@ -46,7 +46,7 @@
<!--<rule ref="rulesets/java/basic.xml/EmptyCatchBlock"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptyFinallyBlock"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptyIfStmt"/>-->
- <rule ref="rulesets/java/basic.xml/EmptyStatementNotInLoop"/>
+ <rule ref="rulesets/java/empty.xml/EmptyStatementNotInLoop"/>
<!--<rule ref="rulesets/java/basic.xml/EmptyStaticInitializer"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptySwitchStatements"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptySynchronizedBlock"/>-->
@@ -57,9 +57,9 @@
<!--<rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode"/>-->
<rule ref="rulesets/java/basic.xml/ReturnFromFinallyBlock"/>
<rule ref="rulesets/java/basic.xml/UnconditionalIfStatement"/>
- <rule ref="rulesets/java/basic.xml/UnnecessaryConversionTemporary"/>
- <rule ref="rulesets/java/basic.xml/UnnecessaryFinalModifier"/>
- <rule ref="rulesets/java/basic.xml/UnnecessaryReturn"/>
+ <rule ref="rulesets/java/unnecessary.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/java/unnecessary.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/java/unnecessary.xml/UnnecessaryReturn"/>
<!--<rule ref="rulesets/java/basic.xml/UselessOverridingMethod"/>-->
<!--<rule ref="rulesets/java/braces.xml/ForLoopsMustUseBraces"/>-->
http://git-wip-us.apache.org/repos/asf/cxf-build-utils/blob/b3cb6667/buildtools/src/main/resources/cxf-pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/buildtools/src/main/resources/cxf-pmd-ruleset.xml b/buildtools/src/main/resources/cxf-pmd-ruleset.xml
index afefe51..195ff96 100644
--- a/buildtools/src/main/resources/cxf-pmd-ruleset.xml
+++ b/buildtools/src/main/resources/cxf-pmd-ruleset.xml
@@ -37,7 +37,7 @@
<!--<rule ref="rulesets/java/basic.xml/EmptyCatchBlock"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptyFinallyBlock"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptyIfStmt"/>-->
- <rule ref="rulesets/java/basic.xml/EmptyStatementNotInLoop"/>
+ <rule ref="rulesets/java/empty.xml/EmptyStatementNotInLoop"/>
<!--<rule ref="rulesets/java/basic.xml/EmptyStaticInitializer"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptySwitchStatements"/>-->
<!--<rule ref="rulesets/java/basic.xml/EmptySynchronizedBlock"/>-->
@@ -48,9 +48,9 @@
<!--<rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode"/>-->
<rule ref="rulesets/java/basic.xml/ReturnFromFinallyBlock"/>
<rule ref="rulesets/java/basic.xml/UnconditionalIfStatement"/>
- <rule ref="rulesets/java/basic.xml/UnnecessaryConversionTemporary"/>
- <rule ref="rulesets/java/basic.xml/UnnecessaryFinalModifier"/>
- <rule ref="rulesets/java/basic.xml/UnnecessaryReturn"/>
+ <rule ref="rulesets/java/unnecessary.xml/UnnecessaryConversionTemporary"/>
+ <rule ref="rulesets/java/unnecessary.xml/UnnecessaryFinalModifier"/>
+ <rule ref="rulesets/java/unnecessary.xml/UnnecessaryReturn"/>
<!--<rule ref="rulesets/java/basic.xml/UselessOverridingMethod"/>-->
<!--<rule ref="rulesets/java/braces.xml/ForLoopsMustUseBraces"/>-->