This is an automated email from the ASF dual-hosted git repository. olamy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git
commit 86a6e21c12c5db792c6d5b00bba78b73b75cc723 Author: olivier lamy <ol...@apache.org> AuthorDate: Fri Apr 10 18:31:37 2020 +1000 fix checkstyle configuration but that is too much too fix :) Signed-off-by: olivier lamy <ol...@apache.org> --- build-tools/src/main/resources/taglibs/checkstyle.xml | 6 ++++-- .../main/java/org/apache/taglibs/standard/util/XmlUtil.java | 1 + .../apache/taglibs/standard/lang/jstl/Resources.properties | 2 +- pom.xml | 13 +++++++++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/build-tools/src/main/resources/taglibs/checkstyle.xml b/build-tools/src/main/resources/taglibs/checkstyle.xml index 2bebc89..52c5727 100644 --- a/build-tools/src/main/resources/taglibs/checkstyle.xml +++ b/build-tools/src/main/resources/taglibs/checkstyle.xml @@ -24,7 +24,9 @@ <!-- http://checkstyle.sourceforge.net/config_coding.html --> <!-- Whitespace --> - <module name="FileTabCharacter"/> + <module name="FileTabCharacter"> + <property name="fileExtensions" value="java,xml"/> + </module> <module name="TreeWalker"> <!-- Coding --> @@ -61,4 +63,4 @@ <module name="EmptyForInitializerPad"/> <module name="EmptyForIteratorPad"/> </module> -</module> \ No newline at end of file +</module> diff --git a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java index 130f333..ee5ce3e 100644 --- a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java +++ b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java @@ -25,6 +25,7 @@ import java.security.PrivilegedAction; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import java.util.concurrent.Callable; + import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.PageContext; import javax.xml.XMLConstants; diff --git a/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties b/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties index 194e84b..59d9d26 100644 --- a/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties +++ b/jstlel/src/main/resources/org/apache/taglibs/standard/lang/jstl/Resources.properties @@ -14,7 +14,7 @@ # limitations under the License. EXCEPTION_GETTING_BEANINFO=\ - An Exception occurred getting the BeanInfo for class {0} + An Exception occurred getting the BeanInfo for class {0} NULL_EXPRESSION_STRING=\ A null expression string may not be passed to the \ diff --git a/pom.xml b/pom.xml index e186e93..fcf2f08 100644 --- a/pom.xml +++ b/pom.xml @@ -194,6 +194,19 @@ </plugins> </pluginManagement> <plugins> + <!-- too much to fix so not activated per default --> +<!-- <plugin>--> +<!-- <groupId>org.apache.maven.plugins</groupId>--> +<!-- <artifactId>maven-checkstyle-plugin</artifactId>--> +<!-- <executions>--> +<!-- <execution>--> +<!-- <phase>validate</phase>--> +<!-- <goals>--> +<!-- <goal>check</goal>--> +<!-- </goals>--> +<!-- </execution>--> +<!-- </executions>--> +<!-- </plugin>--> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org