Author: dkulp
Date: Tue Feb 9 23:24:23 2010
New Revision: 908279
URL: http://svn.apache.org/viewvc?rev=908279&view=rev
Log:
Merged revisions 907649 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r907649 | bimargulies | 2010-02-08 08:00:57 -0500 (Mon, 08 Feb 2010) | 1 line
update to cs 2.4. no velocity noise
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml
cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
cxf/branches/2.2.x-fixes/parent/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml?rev=908279&r1=908278&r2=908279&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml
(original)
+++
cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle-corba.xml
Tue Feb 9 23:24:23 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 * "License"); 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 * "AS IS" 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 * "License"); 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 * "AS IS" 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/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml?rev=908279&r1=908278&r2=908279&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
(original)
+++ cxf/branches/2.2.x-fixes/buildtools/src/main/resources/cxf-checkstyle.xml
Tue Feb 9 23:24:23 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 * "License"); 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 * "AS IS" 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 * "License"); 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 * "AS IS" 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/branches/2.2.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/parent/pom.xml?rev=908279&r1=908278&r2=908279&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/parent/pom.xml Tue Feb 9 23:24:23 2010
@@ -161,29 +161,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</groupId>
<artifactId>cxf-buildtools</artifactId>
<version>${project.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>
