From 9d78d3dcf4c95c57d2a1eccdedcf667c23264065 Mon Sep 17 00:00:00 2001 From: Carl Steinbach Date: Wed, 27 Jan 2010 21:13:42 -0800 Subject: [PATCH] Checkstyle Changes --- .checkstyle | 10 ++ build.xml | 21 ++-- checkstyle/asf.header | 17 +++ checkstyle/checkstyle.xml | 303 +++++++++++++++++++++++-------------------- checkstyle/suppressions.xml | 28 ++++ ivy/libraries.properties | 2 +- 6 files changed, 232 insertions(+), 149 deletions(-) create mode 100644 .checkstyle create mode 100644 checkstyle/asf.header create mode 100644 checkstyle/suppressions.xml diff --git a/.checkstyle b/.checkstyle new file mode 100644 index 0000000..8fbe1f3 --- /dev/null +++ b/.checkstyle @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/build.xml b/build.xml index 39fc2a4..5f38a33 100644 --- a/build.xml +++ b/build.xml @@ -495,16 +495,17 @@ - - - - - - - - - - + + + + + + + + + + + diff --git a/checkstyle/asf.header b/checkstyle/asf.header new file mode 100644 index 0000000..5d5f1e3 --- /dev/null +++ b/checkstyle/asf.header @@ -0,0 +1,17 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 2315ad4..421fe36 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -22,8 +22,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml new file mode 100644 index 0000000..3ac7731 --- /dev/null +++ b/checkstyle/suppressions.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + diff --git a/ivy/libraries.properties b/ivy/libraries.properties index 8293ae9..b304162 100644 --- a/ivy/libraries.properties +++ b/ivy/libraries.properties @@ -16,7 +16,7 @@ #These are the versions of our dependencies (in alphabetical order) apacheant.version=1.7.1 ant-task.version=2.0.10 -checkstyle.version=4.2 +checkstyle.version=5.0 commons-cli.version=2.0 commons-codec.version=1.3 commons-collections.version=3.2.1 -- 1.6.4