diff options
| author | Henri Sara <hesara@vaadin.com> | 2014-05-16 11:41:42 +0300 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2014-05-16 13:03:09 +0300 |
| commit | b4180f2388a6ec97c422097f16da617114aba590 (patch) | |
| tree | 86d73cb261f89d7360d5810e2986a6e78e066374 /checkstyle | |
| parent | e65231e6028892bd6847777c5bad982b73278b14 (diff) | |
| parent | 0f74fdff68cef4eac27913bb4fd0943ff39ca604 (diff) | |
| download | vaadin-framework-7.3.0.alpha2.tar.gz vaadin-framework-7.3.0.alpha2.zip | |
Merge master into valo7.3.0.alpha2
This change does not include all release notes updates
from master.
Change-Id: I209dc06d03d4541ac33746d1161630f0ca8ae5d9
Diffstat (limited to 'checkstyle')
| -rw-r--r-- | checkstyle/header | 4 | ||||
| -rw-r--r-- | checkstyle/vaadin-checkstyle.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/checkstyle/header b/checkstyle/header index 511f77e5ba..a1063268ac 100644 --- a/checkstyle/header +++ b/checkstyle/header @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 Vaadin Ltd. + * Copyright 2000-2014 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -12,4 +12,4 @@ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. - */
\ No newline at end of file + */ diff --git a/checkstyle/vaadin-checkstyle.xml b/checkstyle/vaadin-checkstyle.xml index 1caf480582..9dfe1c9156 100644 --- a/checkstyle/vaadin-checkstyle.xml +++ b/checkstyle/vaadin-checkstyle.xml @@ -90,6 +90,8 @@ <module name="Header"> <property name="headerFile" value="${checkstyle.header.file}" /> <property name="fileExtensions" value="java" /> + <!-- ignore empty lines that may or may not have trailing white-space --> + <property name="ignoreLines" value="3, 7, 9"/> </module> <module name="TreeWalker"> |