This is an automated email from the ASF dual-hosted git repository. kdoran pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-registry.git
The following commit(s) were added to refs/heads/master by this push: new a123d01 NIFIREG-339 Remove errors from root pom a123d01 is described below commit a123d01e293411906f17b549f04a5ecb84b0b889 Author: Bryan Bende <bbe...@apache.org> AuthorDate: Fri Oct 18 11:06:07 2019 -0400 NIFIREG-339 Remove errors from root pom --- checkstyle.xml | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 82 ++++------------------------------------------------------ 2 files changed, 82 insertions(+), 77 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 0000000..80af4b7 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,77 @@ +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> +<module name="Checker"> + <property name="charset" value="UTF-8" /> + <property name="severity" value="warning" /> + <!-- Checks for whitespace --> + <!-- See https://checkstyle.sf.net/config_whitespace.html --> + <module name="FileTabCharacter"> + <property name="eachLine" value="true" /> + </module> + <module name="TreeWalker"> + <module name="RegexpSinglelineJava"> + <property name="format" value="\s+$" /> + <property name="message" value="Line has trailing whitespace." /> + </module> + <module name="RegexpSinglelineJava"> + <property name="format" value="[@]see\s+[{][@]link" /> + <property name="message" value="Javadoc @see does not need @link: pick one or the other." /> + </module> + <module name="OuterTypeFilename" /> + <module name="LineLength"> + <!-- needs extra, because Eclipse formatter ignores the ending left + brace --> + <property name="max" value="200" /> + <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" /> + </module> + <module name="AvoidStarImport" /> + <module name="UnusedImports"> + <property name="processJavadoc" value="true" /> + </module> + <module name="NoLineWrap" /> + <module name="LeftCurly" /> + <module name="RightCurly" /> + <module name="RightCurly"> + <property name="option" value="alone_or_singleline" /> + <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT" /> + </module> + <module name="SeparatorWrap"> + <property name="tokens" value="DOT" /> + <property name="option" value="nl" /> + </module> + <module name="SeparatorWrap"> + <property name="tokens" value="COMMA" /> + <property name="option" value="EOL" /> + </module> + <module name="PackageName"> + <property name="format" value="^[a-z]+(\.[a-z][a-zA-Z0-9]*)*$" /> + </module> + <module name="MethodTypeParameterName"> + <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" /> + </module> + <module name="MethodParamPad" /> + <module name="OperatorWrap"> + <property name="option" value="NL" /> + <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, QUESTION, SL, SR, STAR " /> + </module> + <module name="AnnotationLocation"> + <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF" /> + </module> + <module name="AnnotationLocation"> + <property name="tokens" value="VARIABLE_DEF" /> + <property name="allowSamelineMultipleAnnotations" value="true" /> + </module> + <module name="NonEmptyAtclauseDescription" /> + <module name="JavadocMethod"> + <property name="allowUndeclaredRTE" value="true" /> + <property name="allowMissingJavadoc" value="true" /> + <property name="allowMissingParamTags" value="true" /> + <property name="allowMissingThrowsTags" value="true" /> + <property name="allowMissingReturnTag" value="true" /> + <property name="allowedAnnotations" value="Override,Test,BeforeClass,AfterClass,Before,After" /> + <property name="allowThrowsTagsForSubclasses" value="true" /> + </module> + <module name="SingleLineJavadoc" /> + </module> +</module> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8c33e8c..d76613d 100644 --- a/pom.xml +++ b/pom.xml @@ -427,7 +427,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.10.1</version> + <version>3.1.1</version> <configuration> <failOnError>false</failOnError> <quiet>true</quiet> @@ -447,6 +447,7 @@ <releaseProfiles>apache-release</releaseProfiles> <autoVersionSubmodules>true</autoVersionSubmodules> <goals>deploy</goals> + <!--suppress UnresolvedMavenProperty --> <tagNameFormat>@{project.artifactId}-@{project.version}</tagNameFormat> <pushChanges>false</pushChanges> <localCheckout>true</localCheckout> @@ -562,82 +563,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> - <checkstyleRules> - <module name="Checker"> - <property name="charset" value="UTF-8" /> - <property name="severity" value="warning" /> - <!-- Checks for whitespace --> - <!-- See https://checkstyle.sf.net/config_whitespace.html --> - <module name="FileTabCharacter"> - <property name="eachLine" value="true" /> - </module> - <module name="TreeWalker"> - <module name="RegexpSinglelineJava"> - <property name="format" value="\s+$" /> - <property name="message" value="Line has trailing whitespace." /> - </module> - <module name="RegexpSinglelineJava"> - <property name="format" value="[@]see\s+[{][@]link" /> - <property name="message" value="Javadoc @see does not need @link: pick one or the other." /> - </module> - <module name="OuterTypeFilename" /> - <module name="LineLength"> - <!-- needs extra, because Eclipse formatter ignores the ending left - brace --> - <property name="max" value="200" /> - <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" /> - </module> - <module name="AvoidStarImport" /> - <module name="UnusedImports"> - <property name="processJavadoc" value="true" /> - </module> - <module name="NoLineWrap" /> - <module name="LeftCurly" /> - <module name="RightCurly" /> - <module name="RightCurly"> - <property name="option" value="alone_or_singleline" /> - <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT" /> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="DOT" /> - <property name="option" value="nl" /> - </module> - <module name="SeparatorWrap"> - <property name="tokens" value="COMMA" /> - <property name="option" value="EOL" /> - </module> - <module name="PackageName"> - <property name="format" value="^[a-z]+(\.[a-z][a-zA-Z0-9]*)*$" /> - </module> - <module name="MethodTypeParameterName"> - <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)" /> - </module> - <module name="MethodParamPad" /> - <module name="OperatorWrap"> - <property name="option" value="NL" /> - <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, QUESTION, SL, SR, STAR " /> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF" /> - </module> - <module name="AnnotationLocation"> - <property name="tokens" value="VARIABLE_DEF" /> - <property name="allowSamelineMultipleAnnotations" value="true" /> - </module> - <module name="NonEmptyAtclauseDescription" /> - <module name="JavadocMethod"> - <property name="allowUndeclaredRTE" value="true" /> - <property name="allowMissingJavadoc" value="true" /> - <property name="allowMissingParamTags" value="true" /> - <property name="allowMissingThrowsTags" value="true" /> - <property name="allowMissingReturnTag" value="true" /> - <property name="allowedAnnotations" value="Override,Test,BeforeClass,AfterClass,Before,After" /> - <property name="allowThrowsTagsForSubclasses" value="true" /> - </module> - <module name="SingleLineJavadoc" /> - </module> - </module> - </checkstyleRules> + <configLocation>checkstyle.xml</configLocation> <violationSeverity>warning</violationSeverity> <includeTestSourceDirectory>true</includeTestSourceDirectory> </configuration> @@ -672,6 +598,7 @@ </exclude> <!-- A maven-swagger-plugin input file that does not have a mechanism of including comments --> <exclude>.travis-output-filters</exclude> <!-- grep patterns to exclude from travis output --> <exclude>src/test/resources/descriptors/*</exclude> + <exclude>checkstyle.xml</exclude> </excludes> </configuration> <dependencies> @@ -767,6 +694,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> + <version>3.1.1</version> <configuration> <doclint>none</doclint> </configuration>