Return-Path: 
 <commits-return-11058-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 42736 invoked from network); 8 Feb 2010 13:01:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 8 Feb 2010 13:01:22 -0000
Received: (qmail 58689 invoked by uid 500); 8 Feb 2010 13:01:21 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 58618 invoked by uid 500); 8 Feb 2010 13:01:21 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 58609 invoked by uid 99); 8 Feb 2010 13:01:21 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2010 13:01:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Feb 2010 13:01:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A9AFD2388A3D; Mon,  8 Feb 2010 13:00:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r907649 - in /cxf/trunk:
 buildtools/src/main/resources/cxf-checkstyle-corba.xml
 buildtools/src/main/resources/cxf-checkstyle.xml parent/pom.xml pom.xml
Date: Mon, 08 Feb 2010 13:00:57 -0000
To: commits@cxf.apache.org
From: bimargulies@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100208130057.A9AFD2388A3D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bimargulies
Date: Mon Feb  8 13:00:57 2010
New Revision: 907649

URL: http://svn.apache.org/viewvc?rev=907649&view=rev
Log:
update to cs 2.4. no velocity noise

Modified:
    cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml
    cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml
    cxf/trunk/parent/pom.xml
    cxf/trunk/pom.xml

Modified: cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml?rev=907649&r1=907648&r2=907649&view=diff
==============================================================================
--- cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml (original)
+++ cxf/trunk/buildtools/src/main/resources/cxf-checkstyle-corba.xml Mon Feb  8 13:00:57 2010
@@ -75,13 +75,6 @@
 		<module name="StaticVariableName" />
 		<module name="TypeName" />
 
-		<!-- Header checks -->
-		<module name="Header">
-			<property name="header"
-				value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * &quot;License&quot;); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
-		</module>
-		<!-- <module name="RegexpHeader"/> -->
-
 
 		<!-- Checks for imports                              -->
 		<!-- See http://checkstyle.sf.net/config_import.html -->
@@ -298,4 +291,10 @@
 		<!--<module name="RequiredRegexp">-->
 	</module>
     <module name="SuppressionCommentFilter"/>
+    <!-- Header checks -->
+    <module name="Header">
+      <property name="header"
+                value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * &quot;License&quot;); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
+    </module>
+    <!-- <module name="RegexpHeader"/> -->
 </module>

Modified: cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml?rev=907649&r1=907648&r2=907649&view=diff
==============================================================================
--- cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml (original)
+++ cxf/trunk/buildtools/src/main/resources/cxf-checkstyle.xml Mon Feb  8 13:00:57 2010
@@ -69,13 +69,6 @@
 		<module name="StaticVariableName" />
 		<module name="TypeName" />
 
-		<!-- Header checks -->
-		<module name="Header">
-			<property name="header"
-				value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * &quot;License&quot;); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
-		</module>
-		<!-- <module name="RegexpHeader"/> -->
-
 
 		<!-- Checks for imports                              -->
 		<!-- See http://checkstyle.sf.net/config_import.html -->
@@ -292,4 +285,10 @@
 		<!--<module name="RequiredRegexp">-->
 	</module>
     <module name="SuppressionCommentFilter"/>
+    <!-- Header checks -->
+    <module name="Header">
+      <property name="header"
+                value="/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * &quot;License&quot;); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n" />
+    </module>
+    <!-- <module name="RegexpHeader"/> -->
 </module>

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=907649&r1=907648&r2=907649&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Feb  8 13:00:57 2010
@@ -165,29 +165,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>
                             <artifactId>cxf-buildtools</artifactId>
                             <version>${cxf.build-utils.version}</version>
                         </dependency>
-                        <dependency>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-velocity</artifactId>
-                            <version>1.1.3</version>
-                            <exclusions>
-                                <exclusion>
-                                    <!-- Use the version specified by checkstyle:checkstyle instead -->
-                                    <artifactId>commons-collections</artifactId>
-                                    <groupId>commons-collections</groupId>
-                                </exclusion>
-                                <exclusion>
-                                    <artifactId>plexus-utils</artifactId>
-                                    <groupId>plexus</groupId>
-                                </exclusion>
-                            </exclusions>
-                        </dependency>
                     </dependencies>
                     <configuration>
                         <encoding>UTF-8</encoding>

Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=907649&r1=907648&r2=907649&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Mon Feb  8 13:00:57 2010
@@ -185,7 +185,7 @@
                         <plugin>
                             <groupId>org.apache.maven.plugins</groupId>
                             <artifactId>maven-compiler-plugin</artifactId>
-                            <version>2.0.2</version>
+                            <version>2.1</version>
                             <configuration>
                                 <source>${jdk.version}</source>
                                 <target>${jdk.version}</target>