Updated Branches: refs/heads/master 9a21afb50 -> cf0a11e45
Moved the checkstyle project from parents to build to store all build tools in one location. Modified the config file to use 1024 for now. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f33b247f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f33b247f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f33b247f Branch: refs/heads/master Commit: f33b247fc3aa914b21c939f1f9b7b9eea539de78 Parents: 9a21afb Author: Alex Huang <alex.hu...@citrix.com> Authored: Wed Dec 11 14:37:38 2013 -0800 Committer: Alex Huang <alex.hu...@citrix.com> Committed: Thu Dec 12 12:23:49 2013 -0800 ---------------------------------------------------------------------- build/checkstyle/pom.xml | 21 ++++++++ .../src/main/resources/tooling/checkstyle.xml | 56 ++++++++++++++++++++ parents/checkstyle/pom.xml | 21 -------- .../src/main/resources/tooling/checkstyle.xml | 53 ------------------ plugins/network-elements/nicira-nvp/pom.xml | 4 +- pom.xml | 21 ++++++-- 6 files changed, 95 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f33b247f/build/checkstyle/pom.xml ---------------------------------------------------------------------- diff --git a/build/checkstyle/pom.xml b/build/checkstyle/pom.xml new file mode 100644 index 0000000..5984802 --- /dev/null +++ b/build/checkstyle/pom.xml @@ -0,0 +1,21 @@ +<!-- 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. --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <name>Apache CloudStack Checkstyle Configuration</name> + <artifactId>build-checkstyle</artifactId> + <parent> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-maven-standard</artifactId> + <version>4.4.0-SNAPSHOT</version> + <relativePath>../../maven-standard/pom.xml</relativePath> + </parent> +</project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f33b247f/build/checkstyle/src/main/resources/tooling/checkstyle.xml ---------------------------------------------------------------------- diff --git a/build/checkstyle/src/main/resources/tooling/checkstyle.xml b/build/checkstyle/src/main/resources/tooling/checkstyle.xml new file mode 100644 index 0000000..9b65029 --- /dev/null +++ b/build/checkstyle/src/main/resources/tooling/checkstyle.xml @@ -0,0 +1,56 @@ +<?xml version="1.0"?> +<!-- + 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. +--> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.2//EN" + "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> + +<module name="Checker"> + <module name="FileTabCharacter"> + <property name="eachLine" value="true"/> + </module> + + <module name="TreeWalker"> + <module name="LineLength"> + <property name="max" value="1024"/> + </module> + + <module name="RedundantImport"/> + <module name="UnusedImports"/> + <module name="MemberName"> + <property name="format" value="^[a-zA-Z_][a-zA-Z0-9]*$"/> + </module> + + <module name="PackageName"/> + <module name="ParameterName"/> + <module name="TypeName"/> + <module name="AvoidStarImport"/> + </module> + <module name="RegexpSingleline"> + <!-- \s matches whitespace character, $ matches end of line.--> + <property name="format" value="\s+$"/> + <property name="message" value="Line has trailing spaces."/> + </module> + + <!-- some modules that we should soon add + <module name="MagicNumber"/> --> + + <!-- some modules that we should soon add --> + +</module> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f33b247f/parents/checkstyle/pom.xml ---------------------------------------------------------------------- diff --git a/parents/checkstyle/pom.xml b/parents/checkstyle/pom.xml deleted file mode 100644 index 3e4a28b..0000000 --- a/parents/checkstyle/pom.xml +++ /dev/null @@ -1,21 +0,0 @@ -<!-- 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <name>Apache CloudStack Checkstyle Configuration</name> - <artifactId>checkstyle</artifactId> - <parent> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-maven-standard</artifactId> - <version>4.4.0-SNAPSHOT</version> - <relativePath>../../maven-standard/pom.xml</relativePath> - </parent> -</project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f33b247f/parents/checkstyle/src/main/resources/tooling/checkstyle.xml ---------------------------------------------------------------------- diff --git a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml b/parents/checkstyle/src/main/resources/tooling/checkstyle.xml deleted file mode 100644 index 289ad67..0000000 --- a/parents/checkstyle/src/main/resources/tooling/checkstyle.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0"?> -<!-- - 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. ---> -<!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.2//EN" - "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";> - -<module name="Checker"> - <module name="FileTabCharacter"> - <property name="eachLine" value="true"/> - </module> - - <module name="TreeWalker"> - <module name="LineLength"> - <property name="max" value="180"/> - </module> - - <module name="RedundantImport"/> - <module name="UnusedImports"/> - - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="TypeName"/> - <module name="AvoidStarImport"/> - </module> - <module name="RegexpSingleline"> - <!-- \s matches whitespace character, $ matches end of line.--> - <property name="format" value="\s+$"/> - <property name="message" value="Line has trailing spaces."/> - </module> - - <!-- some modules that we should soon add - <module name="MagicNumber"/> --> - - <!-- some modules that we should soon add --> - -</module> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f33b247f/plugins/network-elements/nicira-nvp/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index 1315e9b..3bc8d14 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -26,7 +26,7 @@ <version>4.4.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - +<!-- <build> <plugins> <plugin> @@ -60,5 +60,5 @@ </plugin> </plugins> </build> - +--> </project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f33b247f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3ddaeb0..d256b97 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ <module>services</module> <module>maven-standard</module> <module>quickcloud</module> - <module>parents/checkstyle</module> + <module>build/checkstyle</module> </modules> <dependencyManagement> @@ -445,15 +445,13 @@ <outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory> <testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory> <plugins> - <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${cs.checkstyle.version}</version> <dependencies> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>checkstyle</artifactId> + <artifactId>build-checkstyle</artifactId> <version>${project.version}</version> </dependency> </dependencies> @@ -475,7 +473,6 @@ <excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</excludes> </configuration> </plugin> - --> </plugins> <pluginManagement> <plugins> @@ -753,6 +750,20 @@ </plugins> </pluginManagement> </build> + <!-- + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>tooling/checkstyle.xml</configLocation> + <headerLocation>tooling/LICENSE.txt</headerLocation> + </configuration> + </plugin> + </plugins> + </reporting> + --> <profiles> <profile>
