You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/02/01 00:55:06 UTC
svn commit: r1065868 - in /camel/trunk: buildingtools/camel-checkstyle.xml
buildingtools/src/main/resources/camel-checkstyle.xml parent/pom.xml pom.xml
Author: cmueller
Date: Mon Jan 31 23:55:05 2011
New Revision: 1065868
URL: http://svn.apache.org/viewvc?rev=1065868&view=rev
Log:
CAMEL-3268: Upgrading to maven-checkstyle-plugin 2.6 to resolve problems with Maven 3
Modified:
camel/trunk/buildingtools/camel-checkstyle.xml
camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
Modified: camel/trunk/buildingtools/camel-checkstyle.xml
URL: http://svn.apache.org/viewvc/camel/trunk/buildingtools/camel-checkstyle.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
==============================================================================
--- camel/trunk/buildingtools/camel-checkstyle.xml (original)
+++ camel/trunk/buildingtools/camel-checkstyle.xml Mon Jan 31 23:55:05 2011
@@ -40,6 +40,33 @@ lengths, if/try depths, etc...
<module name="Translation"/>
<!--<module name="StrictDuplicateCode"/>-->
+
+ <!-- Header checks -->
+ <module name="Header">
+ <property name="header"
+ value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
+ </module>
+
+ <module name="RegexpMultiline">
+ <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
+ <property name="ignoreCase" value="true"/>
+ </module>
+
+ <module name="FileLength">
+ <property name="max" value="3000"/>
+ </module>
+
+ <module name="FileTabCharacter">
+ <property name="fileExtensions" value="java"/>
+ </module>
+
+ <!--
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ </module>
+ -->
<module name="TreeWalker">
@@ -66,11 +93,6 @@ lengths, if/try depths, etc...
<module name="StaticVariableName"/>
<module name="TypeName"/>
- <!-- Header checks -->
- <module name="Header">
- <property name="header"
- value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
- </module>
<!-- <module name="RegexpHeader"/> -->
@@ -79,6 +101,9 @@ lengths, if/try depths, etc...
<module name="AvoidStarImport">
<property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
</module>
+ <!--
+ <module name="ConstantName"/>
+ -->
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
@@ -93,11 +118,6 @@ lengths, if/try depths, etc...
<property name="file" value="etc/import-control.xml"/>
</module>
-->
- <module name="GenericIllegalRegexp">
- <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
- <property name="ignoreComments" value="false"/>
- <property name="ignoreCase" value="true"/>
- </module>
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
@@ -105,11 +125,8 @@ lengths, if/try depths, etc...
<property name="max" value="200"/>
</module>
<module name="ExecutableStatementCount">
- <property name="max" value="75"/>
+ <property name="max" value="100"/>
</module>
- <module name="FileLength">
- <property name="max" value="3000"/>
- </module>
<module name="LineLength">
<property name="max" value="200"/>
</module>
@@ -135,7 +152,6 @@ lengths, if/try depths, etc...
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA, SEMI"/>
</module>
@@ -144,6 +160,9 @@ lengths, if/try depths, etc...
<!-- <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, LCURLY, 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, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>-->
</module>
+ <!--
+ <module name="GenericWhitespace"/>
+ -->
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
@@ -166,6 +185,10 @@ lengths, if/try depths, etc...
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
+
+ <!--
+ <module name="OuterTypeNumber"/>
+ -->
<!-- Checks for common coding problems -->
@@ -183,6 +206,9 @@ lengths, if/try depths, etc...
<property name="ignoreSetter" value="true"/>
</module>
-->
+ <!--
+ <module name="EqualsAvoidNull"/>
+ -->
<module name="IllegalInstantiation"/>
<!--<module name="IllegalToken"/>-->
<!--<module name="IllegalTokenText"/>-->
@@ -223,6 +249,15 @@ lengths, if/try depths, etc...
<module name="DeclarationOrder"/>
<!--<module name="ParameterAssignment"/>-->
<module name="ExplicitInitialization"/>
+ <!-- <module name="AnnotationUseStyle"/> -->
+ <!-- <module name="MissingDeprecated"/> -->
+ <!--
+ <module name="MissingOverride">
+ <property name="javaFiveCompatibility" value="true"/>
+ </module>
+ -->
+ <!-- <module name="PackageAnnotation"/> -->
+ <!-- <module name="SuppressWarnings"/> -->
<module name="DefaultComesLast"/>
<!--<module name="MissingCtor"/>-->
<module name="FallThrough"/>
@@ -305,4 +340,4 @@ lengths, if/try depths, etc...
<!--<module name="RequiredRegexp">-->
</module>
<module name="SuppressionCommentFilter"/>
-</module>
+</module>
\ No newline at end of file
Modified: camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml
URL: http://svn.apache.org/viewvc/camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
==============================================================================
--- camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml (original)
+++ camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml Mon Jan 31 23:55:05 2011
@@ -40,6 +40,33 @@ lengths, if/try depths, etc...
<module name="Translation"/>
<!--<module name="StrictDuplicateCode"/>-->
+
+ <!-- Header checks -->
+ <module name="Header">
+ <property name="header"
+ value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
+ </module>
+
+ <module name="RegexpMultiline">
+ <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
+ <property name="ignoreCase" value="true"/>
+ </module>
+
+ <module name="FileLength">
+ <property name="max" value="3000"/>
+ </module>
+
+ <module name="FileTabCharacter">
+ <property name="fileExtensions" value="java"/>
+ </module>
+
+ <!--
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$"/>
+ <property name="minimum" value="0"/>
+ <property name="maximum" value="0"/>
+ </module>
+ -->
<module name="TreeWalker">
@@ -66,11 +93,6 @@ lengths, if/try depths, etc...
<module name="StaticVariableName"/>
<module name="TypeName"/>
- <!-- Header checks -->
- <module name="Header">
- <property name="header"
- value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
- </module>
<!-- <module name="RegexpHeader"/> -->
@@ -79,6 +101,9 @@ lengths, if/try depths, etc...
<module name="AvoidStarImport">
<property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
</module>
+ <!--
+ <module name="ConstantName"/>
+ -->
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
@@ -93,11 +118,6 @@ lengths, if/try depths, etc...
<property name="file" value="etc/import-control.xml"/>
</module>
-->
- <module name="GenericIllegalRegexp">
- <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
- <property name="ignoreComments" value="false"/>
- <property name="ignoreCase" value="true"/>
- </module>
<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
@@ -107,9 +127,6 @@ lengths, if/try depths, etc...
<module name="ExecutableStatementCount">
<property name="max" value="100"/>
</module>
- <module name="FileLength">
- <property name="max" value="3000"/>
- </module>
<module name="LineLength">
<property name="max" value="200"/>
</module>
@@ -135,7 +152,6 @@ lengths, if/try depths, etc...
<module name="OperatorWrap"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter">
<property name="tokens" value="COMMA, SEMI"/>
</module>
@@ -144,6 +160,9 @@ lengths, if/try depths, etc...
<!-- <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, LCURLY, 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, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>-->
</module>
+ <!--
+ <module name="GenericWhitespace"/>
+ -->
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
@@ -166,6 +185,10 @@ lengths, if/try depths, etc...
<module name="LeftCurly"/>
<module name="NeedBraces"/>
<module name="RightCurly"/>
+
+ <!--
+ <module name="OuterTypeNumber"/>
+ -->
<!-- Checks for common coding problems -->
@@ -183,6 +206,9 @@ lengths, if/try depths, etc...
<property name="ignoreSetter" value="true"/>
</module>
-->
+ <!--
+ <module name="EqualsAvoidNull"/>
+ -->
<module name="IllegalInstantiation"/>
<!--<module name="IllegalToken"/>-->
<!--<module name="IllegalTokenText"/>-->
@@ -223,6 +249,15 @@ lengths, if/try depths, etc...
<module name="DeclarationOrder"/>
<!--<module name="ParameterAssignment"/>-->
<module name="ExplicitInitialization"/>
+ <!-- <module name="AnnotationUseStyle"/> -->
+ <!-- <module name="MissingDeprecated"/> -->
+ <!--
+ <module name="MissingOverride">
+ <property name="javaFiveCompatibility" value="true"/>
+ </module>
+ -->
+ <!-- <module name="PackageAnnotation"/> -->
+ <!-- <module name="SuppressWarnings"/> -->
<module name="DefaultComesLast"/>
<!--<module name="MissingCtor"/>-->
<module name="FallThrough"/>
@@ -305,4 +340,4 @@ lengths, if/try depths, etc...
<!--<module name="RequiredRegexp">-->
</module>
<module name="SuppressionCommentFilter"/>
-</module>
+</module>
\ No newline at end of file
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Jan 31 23:55:05 2011
@@ -1586,7 +1586,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
</plugin>
</plugins>
</reporting>
Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Mon Jan 31 23:55:05 2011
@@ -367,7 +367,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Re: svn commit: r1065868 - in /camel/trunk: buildingtools/camel-checkstyle.xml
buildingtools/src/main/resources/camel-checkstyle.xml parent/pom.xml pom.xml
Posted by Christian Müller <ch...@gmail.com>.
Ok, done.
Re: svn commit: r1065868 - in /camel/trunk: buildingtools/camel-checkstyle.xml
buildingtools/src/main/resources/camel-checkstyle.xml parent/pom.xml pom.xml
Posted by Claus Ibsen <cl...@gmail.com>.
On Tue, Feb 1, 2011 at 3:21 PM, Christian Müller
<ch...@gmail.com> wrote:
> Don't worry, I'm aware that Maven 2.2.1 is actual the prefered version...
>
> I found the failure:
> camel/buildingstools/pom.xml has the version 2.7-SNAPSHOT
> In camel/pom.xml, we have a property "camel-buildtools.version", which have
> the version "2.6.0". If I change this version to "2.7-SNAPSHOT", everyting
> goes well. Any objections?
>
Ah yeah that may be some commit willem did to have it work on some CI
server or whatnot.
Yeah I think you can revert his commit. He commented that on a JIRA
ticket today.
--
Claus Ibsen
-----------------
FuseSource
Email: cibsen@fusesource.com
Web: http://fusesource.com
Twitter: davsclaus
Blog: http://davsclaus.blogspot.com/
Author of Camel in Action: http://www.manning.com/ibsen/
Re: svn commit: r1065868 - in /camel/trunk: buildingtools/camel-checkstyle.xml
buildingtools/src/main/resources/camel-checkstyle.xml parent/pom.xml pom.xml
Posted by Christian Müller <ch...@gmail.com>.
Don't worry, I'm aware that Maven 2.2.1 is actual the prefered version...
I found the failure:
camel/buildingstools/pom.xml has the version 2.7-SNAPSHOT
In camel/pom.xml, we have a property "camel-buildtools.version", which have
the version "2.6.0". If I change this version to "2.7-SNAPSHOT", everyting
goes well. Any objections?
Re: svn commit: r1065868 - in /camel/trunk: buildingtools/camel-checkstyle.xml
buildingtools/src/main/resources/camel-checkstyle.xml parent/pom.xml pom.xml
Posted by Claus Ibsen <cl...@gmail.com>.
On Tue, Feb 1, 2011 at 2:10 PM, Christian Müller
<ch...@gmail.com> wrote:
> Sorry, I will check it again. I'm sure, I had a no problems with 2.2.1...
>
Well that's okay, just its still a bit important that the project
still works with Maven 2.2.1.
A lot is still building the project from the source within their
organization. So its important that maven dont start behaving badly.
I also notice willem did some buildtools commit for maven, maybe that
affects as well?
So I kinda just wanted to give a notice that we should try to
rememeber to give it a test with 2.2.1 as well.
Maybe sooner we can upgrade and require Maven 3.0.2+ as minimum.
For that to happen it would be nice to align with SMX, AMQ, CXF
projects so they all require and use the same version.
--
Claus Ibsen
-----------------
FuseSource
Email: cibsen@fusesource.com
Web: http://fusesource.com
Twitter: davsclaus
Blog: http://davsclaus.blogspot.com/
Author of Camel in Action: http://www.manning.com/ibsen/
Re: svn commit: r1065868 - in /camel/trunk: buildingtools/camel-checkstyle.xml
buildingtools/src/main/resources/camel-checkstyle.xml parent/pom.xml pom.xml
Posted by Christian Müller <ch...@gmail.com>.
Sorry, I will check it again. I'm sure, I had a no problems with 2.2.1...
Re: svn commit: r1065868 - in /camel/trunk: buildingtools/camel-checkstyle.xml
buildingtools/src/main/resources/camel-checkstyle.xml parent/pom.xml pom.xml
Posted by Claus Ibsen <cl...@gmail.com>.
Hi Christian
Have you checked with Maven 2.2.1 as well.
I think you broke that now!
If I do a
davsclaus:(svn)camel[trunk:1066012]/$ mvn clean install -Psourcecheck
I get this error:
davsclaus:(svn)camel[trunk:1066012]/$ mvn --version
Apache Maven 2.2.1 (r801777; 2009-08-06 21:16:01+0200)
Java version: 1.6.0_20
[INFO] Building Camel :: Parent
[INFO] task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
Downloading: http://localhost:8081/nexus/content/groups/public/org/apache/camel/camel-buildtools/2.6.0/camel-buildtools-2.6.0.pom
1K downloaded (camel-buildtools-2.6.0.pom)
Downloading: http://localhost:8081/nexus/content/groups/public/org/apache/camel/camel/2.6.0/camel-2.6.0.pom
34K downloaded (camel-2.6.0.pom)
Downloading: http://localhost:8081/nexus/content/groups/public/org/apache/camel/camel-buildtools/2.6.0/camel-buildtools-2.6.0.jar
16K downloaded (camel-buildtools-2.6.0.jar)
[INFO] [checkstyle:checkstyle {execution: validate}]
[INFO] [antrun:run {execution: create-prop}]
[INFO] Executing tasks
[echo] Maven version: 2.7-SNAPSHOT
[echo] OSGi version: 2.7.0.SNAPSHOT
[mkdir] Created dir: /Users/davsclaus/workspace/camel/parent/target
[INFO] Executed tasks
[INFO] [properties:read-project-properties {execution: default}]
[INFO] [remote-resources:process {execution: default}]
[INFO] [site:attach-descriptor {execution: default-attach-descriptor}]
[INFO] [ianal:verify-legal-files {execution: default}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing /Users/davsclaus/workspace/camel/parent/pom.xml to
/Users/davsclaus/.m2/repository/org/apache/camel/camel-parent/2.7-SNAPSHOT/camel-parent-2.7-SNAPSHOT.pom
[INFO] ------------------------------------------------------------------------
[INFO] Building Camel :: Core
[INFO] task-segment: [clean, install]
[INFO] ------------------------------------------------------------------------
[INFO] [clean:clean {execution: default-clean}]
[INFO] [checkstyle:checkstyle {execution: validate}]
[INFO] ------------------------------------------------------------------------
[ERROR] BUILD ERROR
[INFO] ------------------------------------------------------------------------
[INFO] An error has occurred in Checkstyle report generation.
Embedded error: Failed during checkstyle configuration
TreeWalker is not allowed as a parent of Header
[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 26 seconds
[INFO] Finished at: Tue Feb 01 13:10:08 CET 2011
[INFO] Final Memory: 138M/259M
[INFO] ------------------------------------------------------------------------
On Tue, Feb 1, 2011 at 12:55 AM, <cm...@apache.org> wrote:
> Author: cmueller
> Date: Mon Jan 31 23:55:05 2011
> New Revision: 1065868
>
> URL: http://svn.apache.org/viewvc?rev=1065868&view=rev
> Log:
> CAMEL-3268: Upgrading to maven-checkstyle-plugin 2.6 to resolve problems with Maven 3
>
> Modified:
> camel/trunk/buildingtools/camel-checkstyle.xml
> camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml
> camel/trunk/parent/pom.xml
> camel/trunk/pom.xml
>
> Modified: camel/trunk/buildingtools/camel-checkstyle.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/buildingtools/camel-checkstyle.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
> ==============================================================================
> --- camel/trunk/buildingtools/camel-checkstyle.xml (original)
> +++ camel/trunk/buildingtools/camel-checkstyle.xml Mon Jan 31 23:55:05 2011
> @@ -40,6 +40,33 @@ lengths, if/try depths, etc...
> <module name="Translation"/>
>
> <!--<module name="StrictDuplicateCode"/>-->
> +
> + <!-- Header checks -->
> + <module name="Header">
> + <property name="header"
> + value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
> + </module>
> +
> + <module name="RegexpMultiline">
> + <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
> + <property name="ignoreCase" value="true"/>
> + </module>
> +
> + <module name="FileLength">
> + <property name="max" value="3000"/>
> + </module>
> +
> + <module name="FileTabCharacter">
> + <property name="fileExtensions" value="java"/>
> + </module>
> +
> + <!--
> + <module name="RegexpSingleline">
> + <property name="format" value="\s+$"/>
> + <property name="minimum" value="0"/>
> + <property name="maximum" value="0"/>
> + </module>
> + -->
>
> <module name="TreeWalker">
>
> @@ -66,11 +93,6 @@ lengths, if/try depths, etc...
> <module name="StaticVariableName"/>
> <module name="TypeName"/>
>
> - <!-- Header checks -->
> - <module name="Header">
> - <property name="header"
> - value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
> - </module>
> <!-- <module name="RegexpHeader"/> -->
>
>
> @@ -79,6 +101,9 @@ lengths, if/try depths, etc...
> <module name="AvoidStarImport">
> <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
> </module>
> + <!--
> + <module name="ConstantName"/>
> + -->
> <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
> <module name="RedundantImport"/>
> <!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
> @@ -93,11 +118,6 @@ lengths, if/try depths, etc...
> <property name="file" value="etc/import-control.xml"/>
> </module>
> -->
> - <module name="GenericIllegalRegexp">
> - <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
> - <property name="ignoreComments" value="false"/>
> - <property name="ignoreCase" value="true"/>
> - </module>
>
> <!-- Checks for Size Violations. -->
> <!-- See http://checkstyle.sf.net/config_sizes.html -->
> @@ -105,11 +125,8 @@ lengths, if/try depths, etc...
> <property name="max" value="200"/>
> </module>
> <module name="ExecutableStatementCount">
> - <property name="max" value="75"/>
> + <property name="max" value="100"/>
> </module>
> - <module name="FileLength">
> - <property name="max" value="3000"/>
> - </module>
> <module name="LineLength">
> <property name="max" value="200"/>
> </module>
> @@ -135,7 +152,6 @@ lengths, if/try depths, etc...
> <module name="OperatorWrap"/>
> <module name="ParenPad"/>
> <module name="TypecastParenPad"/>
> - <module name="TabCharacter"/>
> <module name="WhitespaceAfter">
> <property name="tokens" value="COMMA, SEMI"/>
> </module>
> @@ -144,6 +160,9 @@ lengths, if/try depths, etc...
> <!-- <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, LCURLY, 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, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>-->
> </module>
>
> + <!--
> + <module name="GenericWhitespace"/>
> + -->
>
> <!-- Modifier Checks -->
> <!-- See http://checkstyle.sf.net/config_modifiers.html -->
> @@ -166,6 +185,10 @@ lengths, if/try depths, etc...
> <module name="LeftCurly"/>
> <module name="NeedBraces"/>
> <module name="RightCurly"/>
> +
> + <!--
> + <module name="OuterTypeNumber"/>
> + -->
>
>
> <!-- Checks for common coding problems -->
> @@ -183,6 +206,9 @@ lengths, if/try depths, etc...
> <property name="ignoreSetter" value="true"/>
> </module>
> -->
> + <!--
> + <module name="EqualsAvoidNull"/>
> + -->
> <module name="IllegalInstantiation"/>
> <!--<module name="IllegalToken"/>-->
> <!--<module name="IllegalTokenText"/>-->
> @@ -223,6 +249,15 @@ lengths, if/try depths, etc...
> <module name="DeclarationOrder"/>
> <!--<module name="ParameterAssignment"/>-->
> <module name="ExplicitInitialization"/>
> + <!-- <module name="AnnotationUseStyle"/> -->
> + <!-- <module name="MissingDeprecated"/> -->
> + <!--
> + <module name="MissingOverride">
> + <property name="javaFiveCompatibility" value="true"/>
> + </module>
> + -->
> + <!-- <module name="PackageAnnotation"/> -->
> + <!-- <module name="SuppressWarnings"/> -->
> <module name="DefaultComesLast"/>
> <!--<module name="MissingCtor"/>-->
> <module name="FallThrough"/>
> @@ -305,4 +340,4 @@ lengths, if/try depths, etc...
> <!--<module name="RequiredRegexp">-->
> </module>
> <module name="SuppressionCommentFilter"/>
> -</module>
> +</module>
> \ No newline at end of file
>
> Modified: camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
> ==============================================================================
> --- camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml (original)
> +++ camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml Mon Jan 31 23:55:05 2011
> @@ -40,6 +40,33 @@ lengths, if/try depths, etc...
> <module name="Translation"/>
>
> <!--<module name="StrictDuplicateCode"/>-->
> +
> + <!-- Header checks -->
> + <module name="Header">
> + <property name="header"
> + value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
> + </module>
> +
> + <module name="RegexpMultiline">
> + <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
> + <property name="ignoreCase" value="true"/>
> + </module>
> +
> + <module name="FileLength">
> + <property name="max" value="3000"/>
> + </module>
> +
> + <module name="FileTabCharacter">
> + <property name="fileExtensions" value="java"/>
> + </module>
> +
> + <!--
> + <module name="RegexpSingleline">
> + <property name="format" value="\s+$"/>
> + <property name="minimum" value="0"/>
> + <property name="maximum" value="0"/>
> + </module>
> + -->
>
> <module name="TreeWalker">
>
> @@ -66,11 +93,6 @@ lengths, if/try depths, etc...
> <module name="StaticVariableName"/>
> <module name="TypeName"/>
>
> - <!-- Header checks -->
> - <module name="Header">
> - <property name="header"
> - value="/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with\n * this work for additional information regarding copyright ownership.\n * The ASF licenses this file to You under the Apache License, Version 2.0\n * (the "License"); you may not use this file except in compliance with\n * the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an "AS IS" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n"/>
> - </module>
> <!-- <module name="RegexpHeader"/> -->
>
>
> @@ -79,6 +101,9 @@ lengths, if/try depths, etc...
> <module name="AvoidStarImport">
> <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/>
> </module>
> + <!--
> + <module name="ConstantName"/>
> + -->
> <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
> <module name="RedundantImport"/>
> <!-- When you javadoc {@link } an import is added that checkstyle thinks is unused import.
> @@ -93,11 +118,6 @@ lengths, if/try depths, etc...
> <property name="file" value="etc/import-control.xml"/>
> </module>
> -->
> - <module name="GenericIllegalRegexp">
> - <property name="format" value="(\bgpl\b)|(\bgplv2\b)|(\bgnu\sgeneral\spublic\s*license\b)|(\bwww\.gnu\.org\/licenses\/gpl\.txt\b)"/>
> - <property name="ignoreComments" value="false"/>
> - <property name="ignoreCase" value="true"/>
> - </module>
>
> <!-- Checks for Size Violations. -->
> <!-- See http://checkstyle.sf.net/config_sizes.html -->
> @@ -107,9 +127,6 @@ lengths, if/try depths, etc...
> <module name="ExecutableStatementCount">
> <property name="max" value="100"/>
> </module>
> - <module name="FileLength">
> - <property name="max" value="3000"/>
> - </module>
> <module name="LineLength">
> <property name="max" value="200"/>
> </module>
> @@ -135,7 +152,6 @@ lengths, if/try depths, etc...
> <module name="OperatorWrap"/>
> <module name="ParenPad"/>
> <module name="TypecastParenPad"/>
> - <module name="TabCharacter"/>
> <module name="WhitespaceAfter">
> <property name="tokens" value="COMMA, SEMI"/>
> </module>
> @@ -144,6 +160,9 @@ lengths, if/try depths, etc...
> <!-- <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, LCURLY, 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, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,TYPE_EXTENSION_AND"/>-->
> </module>
>
> + <!--
> + <module name="GenericWhitespace"/>
> + -->
>
> <!-- Modifier Checks -->
> <!-- See http://checkstyle.sf.net/config_modifiers.html -->
> @@ -166,6 +185,10 @@ lengths, if/try depths, etc...
> <module name="LeftCurly"/>
> <module name="NeedBraces"/>
> <module name="RightCurly"/>
> +
> + <!--
> + <module name="OuterTypeNumber"/>
> + -->
>
>
> <!-- Checks for common coding problems -->
> @@ -183,6 +206,9 @@ lengths, if/try depths, etc...
> <property name="ignoreSetter" value="true"/>
> </module>
> -->
> + <!--
> + <module name="EqualsAvoidNull"/>
> + -->
> <module name="IllegalInstantiation"/>
> <!--<module name="IllegalToken"/>-->
> <!--<module name="IllegalTokenText"/>-->
> @@ -223,6 +249,15 @@ lengths, if/try depths, etc...
> <module name="DeclarationOrder"/>
> <!--<module name="ParameterAssignment"/>-->
> <module name="ExplicitInitialization"/>
> + <!-- <module name="AnnotationUseStyle"/> -->
> + <!-- <module name="MissingDeprecated"/> -->
> + <!--
> + <module name="MissingOverride">
> + <property name="javaFiveCompatibility" value="true"/>
> + </module>
> + -->
> + <!-- <module name="PackageAnnotation"/> -->
> + <!-- <module name="SuppressWarnings"/> -->
> <module name="DefaultComesLast"/>
> <!--<module name="MissingCtor"/>-->
> <module name="FallThrough"/>
> @@ -305,4 +340,4 @@ lengths, if/try depths, etc...
> <!--<module name="RequiredRegexp">-->
> </module>
> <module name="SuppressionCommentFilter"/>
> -</module>
> +</module>
> \ No newline at end of file
>
> Modified: camel/trunk/parent/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
> ==============================================================================
> --- camel/trunk/parent/pom.xml (original)
> +++ camel/trunk/parent/pom.xml Mon Jan 31 23:55:05 2011
> @@ -1586,7 +1586,7 @@
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-checkstyle-plugin</artifactId>
> - <version>2.3</version>
> + <version>2.6</version>
> </plugin>
> </plugins>
> </reporting>
>
> Modified: camel/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1065868&r1=1065867&r2=1065868&view=diff
> ==============================================================================
> --- camel/trunk/pom.xml (original)
> +++ camel/trunk/pom.xml Mon Jan 31 23:55:05 2011
> @@ -367,7 +367,7 @@
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-checkstyle-plugin</artifactId>
> - <version>2.3</version>
> + <version>2.6</version>
> </plugin>
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
>
>
>
--
Claus Ibsen
-----------------
FuseSource
Email: cibsen@fusesource.com
Web: http://fusesource.com
Twitter: davsclaus
Blog: http://davsclaus.blogspot.com/
Author of Camel in Action: http://www.manning.com/ibsen/