You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2016/02/15 03:42:30 UTC
[06/36] directory-kerby git commit: Reverting to old checkstyle/pmd
configuration
Reverting to old checkstyle/pmd configuration
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/5bedb0cc
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/5bedb0cc
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/5bedb0cc
Branch: refs/heads/kadmin-remote
Commit: 5bedb0cc7f5554af68ea353ed8089ca261d3d505
Parents: f304885
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jan 18 11:42:07 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jan 18 11:42:07 2016 +0000
----------------------------------------------------------------------
build-tools/kerby-checkstyle.xml | 150 +++++++++++++++++++
build-tools/kerby-pmd-ruleset.xml | 39 +++++
build-tools/pom.xml | 39 -----
.../src/main/resources/kerby-checkstyle.xml | 150 -------------------
.../src/main/resources/kerby-pmd-ruleset.xml | 39 -----
pom.xml | 42 +++---
6 files changed, 214 insertions(+), 245 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5bedb0cc/build-tools/kerby-checkstyle.xml
----------------------------------------------------------------------
diff --git a/build-tools/kerby-checkstyle.xml b/build-tools/kerby-checkstyle.xml
new file mode 100644
index 0000000..ff9f5de
--- /dev/null
+++ b/build-tools/kerby-checkstyle.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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">
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <module name="FileLength"/>
+
+ <!-- Following interprets the header file as regular expressions. -->
+ <!-- <module name="RegexpHeader"/> -->
+
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ </module>
+
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="^[^\s][^\*].*\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <module name="TreeWalker">
+
+ <!-- required for SuppressWarningsFilter (and other Suppress* rules not used here) -->
+ <!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->
+ <module name="SuppressWarningsHolder"/>
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <!-- module name="AvoidStarImport"/ -->
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ <property name="ignorePattern" value="^ *\* *"/>
+ </module>
+ <module name="MethodLength">
+ <property name="max" value="200"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="8"/>
+ </module>
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock"/>
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <!-- module name="AvoidInlineConditionals"/ -->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="IllegalInstantiation"/>
+
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <module name="FinalClass"/>
+ <module name="InterfaceIsType"/>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <module name="UpperEll"/>
+
+ <module name="FileContentsHolder"/>
+
+ </module>
+
+ <!-- Support @SuppressWarnings (added in Checkstyle 5.7) -->
+ <!-- see http://checkstyle.sourceforge.net/config.html#SuppressWarningsFilter -->
+ <module name="SuppressWarningsFilter"/>
+
+ <!-- Checks properties file for a duplicated properties. -->
+ <!-- See http://checkstyle.sourceforge.net/config_misc.html#UniqueProperties -->
+ <module name="UniqueProperties"/>
+
+ <module name="SuppressionCommentFilter"/>
+
+</module>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5bedb0cc/build-tools/kerby-pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/build-tools/kerby-pmd-ruleset.xml b/build-tools/kerby-pmd-ruleset.xml
new file mode 100644
index 0000000..772e0e3
--- /dev/null
+++ b/build-tools/kerby-pmd-ruleset.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<ruleset name="kerby-pmd" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+ <description>
+ A PMD ruleset for Apache Kerby
+ </description>
+
+ <rule ref="rulesets/java/basic.xml">
+ <exclude name="AvoidUsingHardCodedIP" />
+ </rule>
+ <rule ref="rulesets/java/unusedcode.xml"/>
+ <rule ref="rulesets/java/imports.xml"/>
+ <rule ref="rulesets/java/braces.xml"/>
+ <rule ref="rulesets/java/empty.xml"/>
+ <rule ref="rulesets/java/migrating.xml">
+ <exclude name="JUnit4TestShouldUseAfterAnnotation" />
+ </rule>
+ <rule ref="rulesets/java/unnecessary.xml"/>
+
+</ruleset>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5bedb0cc/build-tools/pom.xml
----------------------------------------------------------------------
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
deleted file mode 100644
index e0805da..0000000
--- a/build-tools/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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 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. See accompanying LICENSE file.
--->
-<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>
-
- <groupId>org.apache.kerby</groupId>
- <artifactId>build-tools</artifactId>
- <version>1.0.0-RC2-SNAPSHOT</version>
- <name>Kerby Build Tools</name>
- <packaging>jar</packaging>
-
- <distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <!--uniqueVersion>false</uniqueVersion-->
- </snapshotRepository>
- </distributionManagement>
-
-
-</project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5bedb0cc/build-tools/src/main/resources/kerby-checkstyle.xml
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/kerby-checkstyle.xml b/build-tools/src/main/resources/kerby-checkstyle.xml
deleted file mode 100644
index ff9f5de..0000000
--- a/build-tools/src/main/resources/kerby-checkstyle.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- 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">
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
- <module name="Translation"/>
-
- <module name="FileLength"/>
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
- <module name="FileTabCharacter">
- <property name="eachLine" value="true"/>
- </module>
-
- <module name="RegexpSingleline">
- <!-- \s matches whitespace character, $ matches end of line. -->
- <property name="format" value="^[^\s][^\*].*\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
-
- <module name="TreeWalker">
-
- <!-- required for SuppressWarningsFilter (and other Suppress* rules not used here) -->
- <!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->
- <module name="SuppressWarningsHolder"/>
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/>
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <!-- module name="AvoidStarImport"/ -->
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
- <module name="LineLength">
- <property name="max" value="120"/>
- <property name="ignorePattern" value="^ *\* *"/>
- </module>
- <module name="MethodLength">
- <property name="max" value="200"/>
- </module>
- <module name="ParameterNumber">
- <property name="max" value="8"/>
- </module>
-
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap"/>
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround"/>
-
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
-
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="AvoidNestedBlocks"/>
- <module name="EmptyBlock"/>
- <module name="LeftCurly"/>
- <module name="NeedBraces"/>
- <module name="RightCurly"/>
-
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <!-- module name="AvoidInlineConditionals"/ -->
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="IllegalInstantiation"/>
-
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <module name="FinalClass"/>
- <module name="InterfaceIsType"/>
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- <module name="UpperEll"/>
-
- <module name="FileContentsHolder"/>
-
- </module>
-
- <!-- Support @SuppressWarnings (added in Checkstyle 5.7) -->
- <!-- see http://checkstyle.sourceforge.net/config.html#SuppressWarningsFilter -->
- <module name="SuppressWarningsFilter"/>
-
- <!-- Checks properties file for a duplicated properties. -->
- <!-- See http://checkstyle.sourceforge.net/config_misc.html#UniqueProperties -->
- <module name="UniqueProperties"/>
-
- <module name="SuppressionCommentFilter"/>
-
-</module>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5bedb0cc/build-tools/src/main/resources/kerby-pmd-ruleset.xml
----------------------------------------------------------------------
diff --git a/build-tools/src/main/resources/kerby-pmd-ruleset.xml b/build-tools/src/main/resources/kerby-pmd-ruleset.xml
deleted file mode 100644
index 772e0e3..0000000
--- a/build-tools/src/main/resources/kerby-pmd-ruleset.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<ruleset name="kerby-pmd" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
- <description>
- A PMD ruleset for Apache Kerby
- </description>
-
- <rule ref="rulesets/java/basic.xml">
- <exclude name="AvoidUsingHardCodedIP" />
- </rule>
- <rule ref="rulesets/java/unusedcode.xml"/>
- <rule ref="rulesets/java/imports.xml"/>
- <rule ref="rulesets/java/braces.xml"/>
- <rule ref="rulesets/java/empty.xml"/>
- <rule ref="rulesets/java/migrating.xml">
- <exclude name="JUnit4TestShouldUseAfterAnnotation" />
- </rule>
- <rule ref="rulesets/java/unnecessary.xml"/>
-
-</ruleset>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5bedb0cc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b9a57c..2643596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
<slf4j.version>1.7.12</slf4j.version>
<assertj.version>2.2.0</assertj.version>
<findbugs.version>3.0.1</findbugs.version>
+ <buildtools.dir>${basedir}/build-tools</buildtools.dir>
<skipTests>false</skipTests>
<maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
@@ -66,7 +67,6 @@
</prerequisites>
<modules>
- <module>build-tools</module>
<module>kerby-common</module>
<module>kerby-pkix</module>
<module>kerby-kerb</module>
@@ -199,7 +199,7 @@
<version>3.5</version>
<configuration>
<rulesets>
- <ruleset>kerby-pmd-ruleset.xml</ruleset>
+ <ruleset>${buildtools.dir}/kerby-pmd-ruleset.xml</ruleset>
</rulesets>
<linkXRef>false</linkXRef>
<sourceEncoding>utf-8</sourceEncoding>
@@ -208,13 +208,6 @@
<includeTests>true</includeTests>
<targetJdk>1.7</targetJdk>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>build-tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>validate</id>
@@ -231,18 +224,11 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.15</version>
<configuration>
- <configLocation>kerby-checkstyle.xml</configLocation>
+ <configLocation>${buildtools.dir}/kerby-checkstyle.xml</configLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<encoding>UTF-8</encoding>
<failOnViolation>true</failOnViolation>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>build-tools</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
<executions>
<execution>
<id>validate</id>
@@ -386,6 +372,28 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>activate-buildtools-in-module</id>
+ <activation>
+ <file>
+ <exists>${basedir}/../build-tools/kerby-checkstyle.xml</exists>
+ </file>
+ </activation>
+ <properties>
+ <buildtools.dir>${basedir}/../build-tools</buildtools.dir>
+ </properties>
+ </profile>
+ <profile>
+ <id>activate-buildtools-in-submodule</id>
+ <activation>
+ <file>
+ <exists>${basedir}/../../build-tools/kerby-checkstyle.xml</exists>
+ </file>
+ </activation>
+ <properties>
+ <buildtools.dir>${basedir}/../../build-tools</buildtools.dir>
+ </properties>
+ </profile>
</profiles>