You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2011/12/28 09:59:13 UTC
[2/2] git commit: set language level to Java6 and fix checkstyle-rules
set language level to Java6 and fix checkstyle-rules
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/b0c9571d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/b0c9571d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/b0c9571d
Branch: refs/heads/master
Commit: b0c9571d441f7b47dc33faa595ebc6e43daa2814
Parents: 0c1a76b
Author: Mark Struberg <st...@apache.org>
Authored: Wed Dec 28 09:55:36 2011 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Wed Dec 28 09:55:36 2011 +0100
----------------------------------------------------------------------
.../main/resources/deltaspike/default-checks.xml | 8 +++++---
deltaspike/parent/pom.xml | 10 +++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b0c9571d/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml
----------------------------------------------------------------------
diff --git a/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml b/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml
index 4d129ec..fa5b355 100644
--- a/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml
+++ b/deltaspike/checkstyle-rules/src/main/resources/deltaspike/default-checks.xml
@@ -60,9 +60,14 @@
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="FileTabCharacter"/>
+ <!-- allow usage of CHECKSTYLE:OFF and CHECKSTYLE:ON -->
+ <module name="SuppressionCommentFilter"/>
+
<module name="TreeWalker">
+ <module name="FileContentsHolder"/>
+
<property name="cacheFile" value="${checkstyle.cache.file}"/>
<!-- Checks for Javadoc comments. -->
@@ -80,9 +85,6 @@
</module>
-->
- <!-- allow usage of CHECKSTYLE:OFF and CHECKSTYLE:ON -->
- <module name="SuppressionCommentFilter"/>
-
<module name="ConstantName">
<!-- Normal rules, except that:
- * any name can start with an underscore.
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/b0c9571d/deltaspike/parent/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml
index 2554acf..41d867f 100644
--- a/deltaspike/parent/pom.xml
+++ b/deltaspike/parent/pom.xml
@@ -353,7 +353,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
<executions>
<execution>
<id>verify-style</id>
@@ -364,7 +364,7 @@
</execution>
</executions>
<configuration>
- <configLocation>deltaspike/standard-checks.xml</configLocation>
+ <configLocation>deltaspike/default-checks.xml</configLocation>
<headerLocation>deltaspike/asf-header.txt</headerLocation>
</configuration>
<dependencies>
@@ -396,8 +396,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
<optimize>false</optimize>
</configuration>
</plugin>
@@ -417,7 +417,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
- <configLocation>deltaspike/standard-checks.xml</configLocation>
+ <configLocation>deltaspike/default-checks.xml</configLocation>
<headerLocation>deltaspike/asf-header.txt</headerLocation>
</configuration>
</plugin>