kaz 02/05/12 08:18:08
Modified: . jars.list project.xml
src/templates/build build-maven.xml default.properties
xdocs/ref properties.xml
Log:
"Kevin O'Neill" <[EMAIL PROTECTED]> points out that a new checkstyle
version is available. I've updated Maven to utilize the new properties
that are available.
Revision Changes Path
1.9 +1 -1 jakarta-turbine-maven/jars.list
Index: jars.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/jars.list,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jars.list 7 May 2002 20:47:54 -0000 1.8
+++ jars.list 12 May 2002 15:18:08 -0000 1.9
@@ -23,7 +23,7 @@
#-------------------------------------------------------------------------
antlr.jar
bcel.jar
-checkstyle-2.1.jar
+checkstyle-2.2.jar
commons-beanutils-dev.jar
commons-collections.jar
commons-graph.jar
1.78 +2 -2 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- project.xml 10 May 2002 12:50:42 -0000 1.77
+++ project.xml 12 May 2002 15:18:08 -0000 1.78
@@ -367,8 +367,8 @@
<dependency>
<name>checkstyle</name>
<type>required</type>
- <version>2.1</version>
- <jar>checkstyle-2.1.jar</jar>
+ <version>2.2</version>
+ <jar>checkstyle-2.2.jar</jar>
<url>http://checkstyle.sourceforge.net/</url>
</dependency>
1.49 +5 -0 jakarta-turbine-maven/src/templates/build/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-maven.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- build-maven.xml 12 May 2002 12:57:05 -0000 1.48
+++ build-maven.xml 12 May 2002 15:18:08 -0000 1.49
@@ -338,11 +338,14 @@
lcurlyMethod="${maven.checkstyle.lcurly.method}"
lcurlyOther="${maven.checkstyle.lcurly.other}"
rcurly="${maven.checkstyle.rcurly}"
+ parenPad="${maven.checkstyle.paren.pad}"
allowTabs="${maven.checkstyle.allow.tabs}"
allowProtected="${maven.checkstyle.allow.protected}"
allowPackage="${maven.checkstyle.allow.package}"
allowNoAuthor="${maven.checkstyle.allow.no.author}"
maxLineLen="${maven.checkstyle.max.line.len}"
+ tabWidth="${maven.checkstyle.tab.width}"
+ ignoreLineLengthPattern="${maven.checkstyle.ignore.line.len.pattern}"
maxMethodLen="${maven.checkstyle.max.method.len}"
maxConstructorLen="${maven.checkstyle.max.constructor.len}"
maxFileLen="${maven.checkstyle.max.file.len}"
@@ -361,9 +364,11 @@
javadocScope="${maven.checkstyle.javadoc.scope}"
requirePackageHtml="${maven.checkstyle.require.package.html}"
ignoreImports="${maven.checkstyle.ignore.imports}"
+ illegalImports="${maven.checkstyle.illegal.imports}"
ignoreWhitespace="${maven.checkstyle.ignore.whitespace}"
ignoreCastWhitespace="${maven.checkstyle.ignore.cast.whitespace}"
ignoreBraces="${maven.checkstyle.ignore.braces}"
+ ignorePublicInInterface="${maven.checkstyle.ignore.public.in.interface}"
failOnViolation="${maven.checkstyle.fail.on.violation}"
cacheFile="${maven.checkstyle.cache.file}" >
<fileset
1.37 +5 -0 jakarta-turbine-maven/src/templates/build/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/default.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- default.properties 11 May 2002 14:03:58 -0000 1.36
+++ default.properties 12 May 2002 15:18:08 -0000 1.37
@@ -80,11 +80,14 @@
maven.checkstyle.lcurly.method = nl
maven.checkstyle.lcurly.other = nl
maven.checkstyle.rcurly = alone
+maven.checkstyle.paren.pad = nospace
maven.checkstyle.allow.tabs = false
maven.checkstyle.allow.protected = false
maven.checkstyle.allow.package = false
maven.checkstyle.allow.no.author = false
maven.checkstyle.max.line.len = 80
+maven.checkstyle.tab.width = 8
+maven.checkstyle.ignore.line.len.pattern = ^$
maven.checkstyle.max.method.len = 150
maven.checkstyle.max.constructor.len = 150
maven.checkstyle.max.file.len = 2000
@@ -103,9 +106,11 @@
maven.checkstyle.javadoc.scope = private
maven.checkstyle.require.package.html = false
maven.checkstyle.ignore.imports = false
+maven.checkstyle.illegal.imports =
maven.checkstyle.ignore.whitespace = false
maven.checkstyle.ignore.cast.whitespace = false
maven.checkstyle.ignore.braces = false
+maven.checkstyle.ignore.public.in.interface = false
maven.checkstyle.fail.on.violation = false
maven.checkstyle.cache.file = ${maven.build.dir}/checkstyle-cachefile
1.14 +44 -0 jakarta-turbine-maven/xdocs/ref/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/properties.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- properties.xml 11 May 2002 14:03:58 -0000 1.13
+++ properties.xml 12 May 2002 15:18:08 -0000 1.14
@@ -576,6 +576,16 @@
</td>
</tr>
<tr>
+ <td>maven.checkstyle.paren.pad</td>
+ <td>Yes</td>
+ <td>
+ Specifies the policy for padding parenthesises.
+ The possible values are: <code>ignore</code> or
+ <code>nospace</code>. The default value is
+ <code>nospace</code>.
+ </td>
+ </tr>
+ <tr>
<td>maven.checkstyle.allow.tabs</td>
<td>Yes</td>
<td>
@@ -620,6 +630,23 @@
</td>
</tr>
<tr>
+ <td>maven.checkstyle.tab.width</td>
+ <td>Yes</td>
+ <td>
+ The distance between tab stops, used in line number and
+ column calculations. The default value is <code>8</code>.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.checkstyle.ignore.line.len.pattern</td>
+ <td>Yes</td>
+ <td>
+ Specifies a regular expression for lines to ignore in
+ maximum line length checks. The default value is
+ <code>^$"</code>.
+ </td>
+ </tr>
+ <tr>
<td>maven.checkstyle.max.method.len</td>
<td>Yes</td>
<td>
@@ -801,6 +828,15 @@
</td>
</tr>
<tr>
+ <td>maven.checkstyle.illegal.imports</td>
+ <td>Yes</td>
+ <td>
+ Comma separated list of package prefixes that are not
+ allowed in import statements. The default is to allow all
+ packages.
+ </td>
+ </tr>
+ <tr>
<td>maven.checkstyle.ignore.whitespace</td>
<td>Yes</td>
<td>
@@ -822,6 +858,14 @@
<td>
Specifies whether or not to ignore braces.
The default value is <code>false</code>.
+ </td>
+ </tr>
+ <tr>
+ <td>maven.checkstyle.ignore.public.in.interface</td>
+ <td>Yes</td>
+ <td>
+ Specifies whether to ignore the public keyword in interface
+ definitions. The default value is <code>false</code>.
</td>
</tr>
<tr>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
