This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
The following commit(s) were added to refs/heads/master by this push:
new 09189d5 Prepare for next release.
09189d5 is described below
commit 09189d56fdc31a9dfdd7677be34858a11209a74a
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Sep 26 10:58:19 2019 -0400
Prepare for next release.
Update build from Checkstyle Maven Plugin 3.0.0 to 3.1.0.
---
pom.xml | 8 +-
src/changes/changes.xml | 3 +-
src/conf/checkstyle.xml | 390 ++++++++++++++++++++++++------------------------
3 files changed, 199 insertions(+), 202 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3f06434..429ae95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,10 +47,10 @@
<maven.compiler.target>1.8</maven.compiler.target>
<commons.componentid>bcel</commons.componentid>
<commons.module.name>org.apache.bcel</commons.module.name>
- <commons.release.version>6.4.0</commons.release.version>
+ <commons.release.version>6.4.1</commons.release.version>
<commons.release.isDistModule>true</commons.release.isDistModule>
- <commons.rc.version>RC2</commons.rc.version>
- <commons.bc.version>6.3.1</commons.bc.version>
+ <commons.rc.version>RC1</commons.rc.version>
+ <commons.bc.version>6.4.0</commons.bc.version>
<commons.release.desc>(Java 8)</commons.release.desc>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-bcel</commons.scmPubUrl>
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
@@ -66,7 +66,7 @@
<commons.jira.pid>12314220</commons.jira.pid>
<commons.findbugs.version>3.0.5</commons.findbugs.version>
<commons.surefire.version>3.0.0-M3</commons.surefire.version>
- <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
+ <checkstyle.plugin.version>3.1.0</checkstyle.plugin.version>
<commons.clirr.version>2.8</commons.clirr.version>
<jna.version>5.4.0</jna.version>
<commons.japicmp.version>0.14.1</commons.japicmp.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f4d6014..ca5cb29 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,8 +62,9 @@ The <action> type attribute can be add,update,fix,remove.
-->
<body>
- <release version="6.4.1" date="2019-09-XX" description="Bug fix release.">
+ <release version="6.4.1" date="2019-09-26" description="Bug fix release.">
<action issue="BCEL-328" type="fix" dev="ggregory" due-to="Gary Gregory,
Mark Roberts">java.util.EmptyStackException at
org.apache.bcel.classfile.DescendingVisitor.visitModule
(DescendingVisitor.java:592).</action>
+ <action type="update" dev="ggregory" due-to="Gary
Gregory">Update build from Checkstyle Maven Plugin 3.0.0 to 3.1.0.</action>
</release>
<release version="6.4.0" date="2019-09-20" description="Feature and bug
fix release.">
<action issue="BCEL-316" type="fix" dev="ggregory" due-to="Gary
Gregory">org.apache.bcel.classfile.Attribute class and subclasses should NOT
log to the console by default.</action>
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index f2ab194..eaeb1e7 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -1,197 +1,193 @@
-<?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.1//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
-
-<!-- commons codec customization of default Checkstyle behavior -->
-<module name="Checker">
- <property name="localeLanguage" value="en" />
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile" />
-
- <!-- Checks for Tab characters -->
- <!-- See
http://checkstyle.sourceforge.net/config_whitespace.html#FileTabCharacter -->
- <module name="FileTabCharacter">
- <property name="fileExtensions" value="java" />
- </module>
-
- <!-- Checks for white space at the end of the line -->
- <!-- See http://checkstyle.sourceforge.net/config_regexp.html -->
- <!-- 706
- <module name="RegexpSingleline">
- <property name="format" value="\s+$" />
- <property name="message" value="Line has trailing spaces." />
- <property name="fileExtensions" value="java" />
- </module>
- -->
-
- <!-- @author tags are deprecated -->
- <module name="RegexpSingleline">
- <property name="format" value="^\s+\*\s+@author\s" />
- <property name="message" value="Deprecated @author tag" />
- <property name="fileExtensions" value="java" />
- <property name="severity" value="warning" />
- </module>
-
- <module name="TreeWalker">
- <property name="cacheFile" value="target/cachefile" />
- <!--
- -->
- <module name="LineLength">
- <property name="max" value="160"/>
- </module>
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
- <!-- allow CONSTANT_Long etc -->
- <!--
- <module name="ConstantName">
- <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Za-z0-9]+)*$"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName">
- <property name="format" value="^[a-z][a-zA-Z0-9_]*(_[a-zA-Z0-9]+)*$"/>
- </module>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- -->
- <module name="TypeName">
- <!-- Allow underscore in class names -->
- <property name="format" value="^[A-Z][A-Za-z0-9]*(_[A-Za-z0-9]+)*$"/>
- </module>
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_imports.html -->
- <module name="AvoidStarImport">
- <property name="excludes" value="org.junit.Assert"/>
- </module>
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="EmptyForIteratorPad"/>
- <!-- Too many to fix at present
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap">
- <property name="option" value="nl" />
- </module>
- -->
- <!-- Too many to fix at present
- <module name="ParenPad"/>
- <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">
- <property name="option" value="text"/>
- </module>
- <!--
- <module name="LeftCurly">
- <property name="option" value="nl"/>
- </module>
- -->
- <module name="NeedBraces"/>
- <!--
- <module name="RightCurly">
- <property name="option" value="alone"/>
- </module>
- -->
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
- <module name="CovariantEquals"/>
- <module name="EqualsHashCode"/>
- <module name="IllegalInstantiation"/>
- <!--module name="InnerAssignment"/--><!-- Inner assignments are OK -->
- <!-- module name="MagicNumber">
- <property name="ignoreNumbers" value="-1,0,1,2,3"/>
- </module-->
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="StringLiteralEquality"/>
- <!--module name="SuperClone"/-->
- <module name="SuperFinalize"/>
- <!--module name="DeclarationOrder"/-->
- <!--module name="ExplicitInitialization"/-->
- <module name="DefaultComesLast"/>
- <module name="FallThrough">
- <property name="reliefPattern" value="\$FALL-THROUGH\$"/><!-- to agree
with Eclipse -->
- </module>
- <module name="MultipleVariableDeclarations"/>
- <module name="UnnecessaryParentheses"/>
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
- <!--module name="FinalClass"/-->
- <!--module name="HideUtilityClassConstructor"/-->
- <!--module name="InterfaceIsType"/-->
-
- <module name="VisibilityModifier">
- <property name="ignoreAnnotationCanonicalNames"
value="java.lang.Deprecated"/>
- <property name="protectedAllowed" value="false"/>
- <property name="packageAllowed" value="true"/>
- </module>
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
- <module name="ArrayTypeStyle"/>
- <!--module name="TodoComment"/-->
- <module name="UpperEll"/>
-
- <!-- Required for SuppressionCommentFilter below -->
- <module name="FileContentsHolder"/>
-
- </module>
-
- <module name="SuppressionCommentFilter"/>
-
- <module name="SuppressionFilter">
- <!-- config_loc is used by Eclipse plugin -->
- <property name="file"
value="${config_loc}/src/conf/checkstyle-suppressions.xml"/>
- </module>
-
- <!--
- Allow comment to suppress checkstyle for a single line
- e.g. // CHECKSTYLE IGNORE MagicNumber
- -->
- <module name="SuppressWithNearbyCommentFilter">
- <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)"/>
- <property name="checkFormat" value="$1"/>
- </module>
-
-</module>
-
+<?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.1//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+
+<!-- commons codec customization of default Checkstyle behavior -->
+<module name="Checker">
+ <property name="localeLanguage" value="en" />
+
+ <!-- Checks whether files end with a new line. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+ <module name="NewlineAtEndOfFile" />
+
+ <!-- Checks for Tab characters -->
+ <!-- See
http://checkstyle.sourceforge.net/config_whitespace.html#FileTabCharacter -->
+ <module name="FileTabCharacter">
+ <property name="fileExtensions" value="java" />
+ </module>
+
+ <!-- Checks for white space at the end of the line -->
+ <!-- See http://checkstyle.sourceforge.net/config_regexp.html -->
+ <!-- 706
+ <module name="RegexpSingleline">
+ <property name="format" value="\s+$" />
+ <property name="message" value="Line has trailing spaces." />
+ <property name="fileExtensions" value="java" />
+ </module>
+ -->
+
+ <!-- @author tags are deprecated -->
+ <module name="RegexpSingleline">
+ <property name="format" value="^\s+\*\s+@author\s" />
+ <property name="message" value="Deprecated @author tag" />
+ <property name="fileExtensions" value="java" />
+ <property name="severity" value="warning" />
+ </module>
+
+ <module name="TreeWalker">
+ <!--
+ -->
+ <module name="LineLength">
+ <property name="max" value="160"/>
+ </module>
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <!-- allow CONSTANT_Long etc -->
+ <!--
+ <module name="ConstantName">
+ <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Za-z0-9]+)*$"/>
+ </module>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <property name="format" value="^[a-z][a-zA-Z0-9_]*(_[a-zA-Z0-9]+)*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ -->
+ <module name="TypeName">
+ <!-- Allow underscore in class names -->
+ <property name="format" value="^[A-Z][A-Za-z0-9]*(_[A-Za-z0-9]+)*$"/>
+ </module>
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_imports.html -->
+ <module name="AvoidStarImport">
+ <property name="excludes" value="org.junit.Assert"/>
+ </module>
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <!-- Too many to fix at present
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap">
+ <property name="option" value="nl" />
+ </module>
+ -->
+ <!-- Too many to fix at present
+ <module name="ParenPad"/>
+ <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">
+ <property name="option" value="text"/>
+ </module>
+ <!--
+ <module name="LeftCurly">
+ <property name="option" value="nl"/>
+ </module>
+ -->
+ <module name="NeedBraces"/>
+ <!--
+ <module name="RightCurly">
+ <property name="option" value="alone"/>
+ </module>
+ -->
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <module name="CovariantEquals"/>
+ <module name="EqualsHashCode"/>
+ <module name="IllegalInstantiation"/>
+ <!--module name="InnerAssignment"/--><!-- Inner assignments are OK -->
+ <!-- module name="MagicNumber">
+ <property name="ignoreNumbers" value="-1,0,1,2,3"/>
+ </module-->
+ <module name="SimplifyBooleanExpression"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StringLiteralEquality"/>
+ <!--module name="SuperClone"/-->
+ <module name="SuperFinalize"/>
+ <!--module name="DeclarationOrder"/-->
+ <!--module name="ExplicitInitialization"/-->
+ <module name="DefaultComesLast"/>
+ <module name="FallThrough">
+ <property name="reliefPattern" value="\$FALL-THROUGH\$"/><!-- to agree
with Eclipse -->
+ </module>
+ <module name="MultipleVariableDeclarations"/>
+ <module name="UnnecessaryParentheses"/>
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <!--module name="FinalClass"/-->
+ <!--module name="HideUtilityClassConstructor"/-->
+ <!--module name="InterfaceIsType"/-->
+
+ <module name="VisibilityModifier">
+ <property name="ignoreAnnotationCanonicalNames"
value="java.lang.Deprecated"/>
+ <property name="protectedAllowed" value="false"/>
+ <property name="packageAllowed" value="true"/>
+ </module>
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <!--module name="TodoComment"/-->
+ <module name="UpperEll"/>
+
+ <module name="SuppressionCommentFilter"/>
+
+ <!--
+ Allow comment to suppress checkstyle for a single line
+ e.g. // CHECKSTYLE IGNORE MagicNumber
+ -->
+ <module name="SuppressWithNearbyCommentFilter">
+ <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)"/>
+ <property name="checkFormat" value="$1"/>
+ </module>
+
+ </module>
+
+ <module name="SuppressionFilter">
+ <!-- config_loc is used by Eclipse plugin -->
+ <property name="file"
value="${config_loc}/src/conf/checkstyle-suppressions.xml"/>
+ </module>
+
+</module>
+
