You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/03/21 01:40:58 UTC

[commons-bcel] 03/03: Prepare to release 6.3.1.

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

commit 41aac40d94cc055e05d860305fe5a6fc8d3f8772
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Mar 20 21:40:42 2019 -0400

    Prepare to release 6.3.1.
---
 NOTICE.txt                      |   10 +-
 README.md                       |    6 +-
 RELEASE-NOTES.txt               |   51 ++
 pom.xml                         | 1162 +++++++++++++++++++--------------------
 src/changes/changes.xml         |    2 +-
 src/site/xdoc/download_bcel.xml |  312 +++++------
 src/site/xdoc/index.xml         |  214 +++----
 7 files changed, 904 insertions(+), 853 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index 4a68d99..ae418af 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
-Apache Commons BCEL
-Copyright 2004-2019 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Apache Commons BCEL
+Copyright 2004-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/README.md b/README.md
index 627d608..215c5dd 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Apache Commons BCEL
 [![Build Status](https://travis-ci.org/apache/commons-bcel.svg)](https://travis-ci.org/apache/commons-bcel)
 [![Coverage Status](https://coveralls.io/repos/apache/commons-bcel/badge.svg)](https://coveralls.io/r/apache/commons-bcel)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.bcel/bcel/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.bcel/bcel/)
-[![Javadocs](https://javadoc.io/badge/org.apache.bcel/bcel/6.3.svg)](https://javadoc.io/doc/org.apache.bcel/bcel/6.3)
+[![Javadocs](https://javadoc.io/badge/org.apache.bcel/bcel/6.3.1.svg)](https://javadoc.io/doc/org.apache.bcel/bcel/6.3.1)
 
 Apache Commons Bytecode Engineering Library
 
@@ -54,7 +54,7 @@ Documentation
 -------------
 
 More information can be found on the [Apache Commons BCEL homepage](https://commons.apache.org/proper/commons-bcel).
-The [Javadoc](https://commons.apache.org/proper/commons-bcel/apidocs/index.html) can be browsed.
+The [Javadoc](https://commons.apache.org/proper/commons-bcel/apidocs) can be browsed.
 Questions related to the usage of Apache Commons BCEL should be posted to the [user mailing list][ml].
 
 Where can I get the latest release?
@@ -67,7 +67,7 @@ Alternatively you can pull it from the central Maven repositories:
 <dependency>
   <groupId>org.apache.bcel</groupId>
   <artifactId>bcel</artifactId>
-  <version>6.3</version>
+  <version>6.3.1</version>
 </dependency>
 ```
 
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1d26cae..4b4a959 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,4 +1,55 @@
               Apache Commons BCEL
+              Version 6.3.1
+              RELEASE NOTES
+
+
+INTRODUCTION:
+
+The Apache Commons BCEL team is pleased to announce the release of
+Apache Commons BCEL 6.3.1!
+
+The Byte Code Engineering Library (BCEL) is intended to give users a convenient
+way to analyze, create, and manipulate compiled .class files. Classes are
+represented by objects containing all the symbolic information of the given
+class: methods, fields and byte code instructions.
+
+Bug fix release
+
+FIXED BUGS:
+===========
+
+o BCEL-267: Race conditions on static fields in BranchHandle and InstructionHandle. Thanks to Stephan Herrmann, Sebb, Gary Gregory, Torsten Curdt.
+o BCEL-297: Possible NPE in override implementation of Object.equals (#20) Thanks to Mark Roberts, mingleizhang.
+o BCEL-315: NullPointerException at org.apache.bcel.classfile.FieldOrMethod.dump(). Thanks to Gary Gregory.
+
+CHANGES:
+========
+
+o BCEL-298: Add some files to .gitignore (#19) Thanks to mingleizhang.
+
+
+
+Have fun!
+-Apache Commons BCEL team
+
+Feedback
+--------
+
+Open source works best when you give feedback:
+
+    http://commons.apache.org/bcel
+
+Please direct all bug reports to JIRA:
+
+    https://issues.apache.org/jira/browse/BCEL
+
+Or subscribe to the commons-user mailing list
+
+The Apache Commons Team
+
+-----------------------------------------------------------------------------
+
+              Apache Commons BCEL
                   Version 6.3
                 RELEASE NOTES
 
diff --git a/pom.xml b/pom.xml
index dfa4273..505cf0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,581 +1,581 @@
-<?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.
--->
-<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>
-
-  <parent>
-    <groupId>org.apache.commons</groupId>
-    <artifactId>commons-parent</artifactId>
-    <version>47</version>
-  </parent>
-
-  <groupId>org.apache.bcel</groupId>
-  <artifactId>bcel</artifactId>
-  <packaging>jar</packaging>
-  <version>6.4-SNAPSHOT</version>
-  <name>Apache Commons BCEL</name>
-  <description>Apache Commons Bytecode Engineering Library</description>
-
-  <url>http://commons.apache.org/proper/commons-bcel</url>
-  <inceptionYear>2004</inceptionYear>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <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</commons.release.version>
-    <commons.release.isDistModule>true</commons.release.isDistModule>
-    <commons.rc.version>RC1</commons.rc.version>
-    <commons.bc.version>6.3</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>
-    <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>    
-    <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
-    <!-- Configuration properties for the OSGi maven-bundle-plugin -->
-    <commons.osgi.symbolicName>org.apache.${commons.componentid}</commons.osgi.symbolicName>
-    <commons.osgi.export>org.apache.bcel.*;version=${project.version};-noimport:=true</commons.osgi.export>
-    <commons.osgi.import>*</commons.osgi.import>
-    <commons.osgi.dynamicImport />
-    <commons.osgi.private />
-    <commons.jira.id>BCEL</commons.jira.id>
-    <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>2.17</checkstyle.plugin.version>
-    <commons.clirr.version>2.8</commons.clirr.version>
-    <jna.version>4.5.0</jna.version>
-  </properties>
-
-  <!-- Cannot be added to Commons Parent, see https://issues.apache.org/jira/browse/COMMONSSITE-26 -->
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <name>Apache Website</name>
-      <url>scp://people.apache.org/www/commons.apache.org/${commons.componentid}/</url>
-    </site>
-  </distributionManagement>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-
-  <developers>
-    <developer>
-      <name>Dave Brosius</name>
-      <id>dbrosius</id>
-      <email>dbrosius at mebigfatguy.com</email>
-    </developer>
-
-    <developer>
-      <name>Torsten Curdt</name>
-      <id>tcurdt</id>
-      <email>tcurdt at apache.org</email>
-      <organization>ASF</organization>
-      <organizationUrl>http://www.apache.org/</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-
-    <developer>
-      <name>Markus Dahm</name>
-      <id>mdahm</id>
-      <email>m.dahm at gmx.de</email>
-      <organization>it-frameworksolutions</organization>
-    </developer>
-
-    <developer>
-      <name>Jason van Zyl</name>
-      <email>jason at zenplex.com</email>
-    </developer>
-
-    <developer>
-      <id>ggregory</id>
-      <name>Gary Gregory</name>
-      <email>ggregory@apache.org</email>
-      <organization>Rocket Software</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>America/New_York</timezone>
-    </developer>
-
-  </developers>
-
-  <contributors>
-
-    <contributor>
-      <name>Enver Haase</name>
-      <email>enver at convergence.de</email>
-    </contributor>
-
-    <contributor>
-      <name>David Dixon-Peugh</name>
-      <email>dixonpeugh at yahoo.com</email>
-    </contributor>
-
-    <contributor>
-      <name>Patrick Beard</name>
-      <email>beard at netscape.com</email>
-    </contributor>
-
-    <contributor>
-      <name>Conor MacNeill</name>
-      <email>conor at cortexbusiness.com.au</email>
-    </contributor>
-
-    <contributor>
-      <name>Costin Manolache</name>
-      <email>cmanolache at yahoo.com</email>
-    </contributor>
-
-    <contributor>
-      <name>Bill Pugh</name>
-      <email>bill.pugh at gmail.com</email>
-    </contributor>
-
-    <contributor>
-      <name>First Hop Ltd / Torsten Rueger</name>
-    </contributor>
-
-    <contributor>
-      <name>Jérôme Leroux</name>
-    </contributor>
-
-    <contributor>
-      <name>Mark Roberts</name>
-    </contributor>
-
-    <contributor>
-      <name>Sam Yoon</name>
-    </contributor>
-  </contributors>
-
-  <mailingLists>
-    <mailingList>
-      <name>BCEL User List</name>
-      <subscribe>user-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
-    </mailingList>
-    <mailingList>
-      <name>BCEL Developer List</name>
-      <subscribe>dev-subscribe@commons.apache.org</subscribe>
-      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
-    </mailingList>
-  </mailingLists>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/BCEL</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/bcel/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/bcel/trunk</developerConnection>
-    <url>http://svn.apache.org/repos/asf/commons/proper/bcel/trunk</url>
-  </scm>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <version>${commons.rat.version}</version>
-        <configuration>
-          <excludes>
-            <exclude>src/test/resources/**</exclude>
-            <exclude>docs/*.bib</exclude>
-            <exclude>docs/*.mdl</exclude>
-            <exclude>docs/eps/*</exclude>
-            <exclude>**/*.eps</exclude>
-            <exclude>**/*.bnf</exclude>
-            <exclude>**/*.mini</exclude>
-            <exclude>TODO.JustIce</exclude>
-            <exclude>src/examples/Mini/MiniParser$JJCalls</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <!-- Allow Clirr to be run from command line -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <version>${commons.clirr.version}</version>
-        <configuration>
-          <minSeverity>${minSeverity}</minSeverity>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <!-- Temporary fix for BCEL-293, remove this after this has implemented in parent pom -->
-        <configuration>
-          <archive combine.children="append">
-            <manifestEntries>
-              <Automatic-Module-Name>org.apache.bcel</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <testExcludes>
-            <testExclude>**/*Benchmark*</testExclude>
-          </testExcludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <property>
-              <!-- Suppress the stats, but keep the test as it exercises the code -->
-              <name>PerformanceTest.report</name>
-              <value>false</value>
-            </property>
-          </systemProperties>
-          <includes>
-            <include>**/*TestCase.java</include>
-            <include>**/PerformanceTest.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/Abstract*</exclude>
-            <!-- Takes rather a long time (especially rt.jar) ; only needs to be done occasionally -->
-            <exclude>**/JDKClassDumpTestCase.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <!-- These need to be specified because CP includes a descriptor -->
-          <descriptors>
-            <descriptor>src/assembly/bin.xml</descriptor>
-            <descriptor>src/assembly/src.xml</descriptor>
-          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-scm-publish-plugin</artifactId>
-        <configuration>
-          <ignorePathsToDelete>
-            <ignorePathToDelete>javadocs</ignorePathToDelete>
-          </ignorePathsToDelete>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.plugin.version}</version>
-        <configuration>
-          <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
-          <!-- Needed to define config_loc -->
-          <propertyExpansion>config_loc=${basedir}</propertyExpansion>
-          <enableRulesSummary>false</enableRulesSummary>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <!--
-        <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jardiff-maven-plugin</artifactId>
-        <configuration>
-        <artifacts>
-        <artifact>
-        <version>5.2</version>
-        </artifact>
-        <artifact>
-        <groupId>bcel</groupId>
-        <version>5.1</version>
-        </artifact>
-        </artifacts>
-        </configuration>
-        </plugin>
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>${checkstyle.plugin.version}</version>
-        <configuration>
-          <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
-          <!-- Needed to define config_loc -->
-          <propertyExpansion>config_loc=${basedir}</propertyExpansion>
-          <enableRulesSummary>false</enableRulesSummary>
-        </configuration>
-        <!-- We need to specify reportSets because 2.9.1 creates two reports -->
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>checkstyle</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.8</version>
-        <configuration>
-          <targetJdk>${maven.compiler.target}</targetJdk>
-          <linkXref>true</linkXref>
-          <rulesets>
-            <ruleset>${basedir}/src/conf/pmd.xml</ruleset>
-          </rulesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>${commons.findbugs.version}</version>
-        <configuration>
-          <threshold>Normal</threshold>
-          <effort>Default</effort>
-          <excludeFilterFile>${basedir}/src/conf/findbugs-exclude-filter.xml</excludeFilterFile>
-          <fork>true</fork>
-          <jvmArgs>-Duser.language=en</jvmArgs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <tags>
-            <tag>TODO</tag>
-            <tag>NOPMD</tag>
-            <tag>NOTE</tag>
-          </tags>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <version>${commons.rat.version}</version>
-        <configuration>
-          <excludes>
-            <exclude>src/test/resources/**</exclude>
-            <exclude>docs/*.bib</exclude>
-            <exclude>docs/*.mdl</exclude>
-            <exclude>docs/eps/*</exclude>
-            <exclude>**/*.eps</exclude>
-            <exclude>**/*.bnf</exclude>
-            <exclude>**/*.mini</exclude>
-            <exclude>TODO.JustIce</exclude>
-            <exclude>src/examples/Mini/MiniParser$JJCalls</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna</artifactId>
-      <version>${jna.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna-platform</artifactId>
-      <version>${jna.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <!--
-        Profile to ignore certain Clirr errors
-        To show all the errors, use -P!quieten-clirr or -Dclirr.allDifferences
-    -->
-    <profile>
-      <id>quieten-clirr</id>
-      <activation>
-        <!-- Enable unless the following is defined -->
-        <property>
-          <name>!clirr.allDifferences</name>
-        </property>
-      </activation>
-      <properties>
-        <!-- It's not possible to undefine this once defined, so we define it in a profile that is normally active -->
-        <clirr.ignoredDifferencesFile>${basedir}/src/conf/clirr-ignored-diffs.xml</clirr.ignoredDifferencesFile>
-      </properties>
-    </profile>
-    <!-- Profile to build and run PerformanceTest. Use 'mvn test -Pjdk-rt' -->
-    <profile>
-      <id>jdk-rt</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>${commons.surefire.version}</version>
-            <configuration>
-              <includes>
-                <include>**/PerformanceTest.java</include>
-              </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Profile to build and run the benchmarks. Use 'mvn test -Pbenchmark', and add '-Dbenchmark=foo' to run only the foo benchmark -->
-    <profile>
-      <id>benchmark</id>
-
-      <properties>
-        <skipTests>true</skipTests>
-        <benchmark>org.apache</benchmark>
-        <jmh.version>1.19</jmh.version>
-      </properties>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.openjdk.jmh</groupId>
-          <artifactId>jmh-core</artifactId>
-          <version>${jmh.version}</version>
-          <scope>test</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>org.openjdk.jmh</groupId>
-          <artifactId>jmh-generator-annprocess</artifactId>
-          <version>${jmh.version}</version>
-          <scope>test</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>commons-io</groupId>
-          <artifactId>commons-io</artifactId>
-          <version>2.6</version>
-          <scope>test</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.commons</groupId>
-          <artifactId>commons-collections4</artifactId>
-          <version>4.3</version>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-
-      <build>
-        <plugins>
-          <!-- Enable the compilation of the benchmarks -->
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>${commons.compiler.version}</version>
-            <configuration combine.self="override">
-              <testIncludes>
-                <testInclude>**/*</testInclude>
-              </testIncludes>
-            </configuration>
-          </plugin>
-
-          <!-- Hook the benchmarks to the test phase -->
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
-            <executions>
-              <execution>
-                <id>benchmark</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>exec</goal>
-                </goals>
-                <configuration>
-                  <classpathScope>test</classpathScope>
-                  <executable>java</executable>
-                  <arguments>
-                    <argument>-classpath</argument>
-                    <classpath />
-                    <argument>org.openjdk.jmh.Main</argument>
-                    <argument>-rf</argument>
-                    <argument>json</argument>
-                    <argument>-rff</argument>
-                    <argument>target/jmh-result.json</argument>
-                    <argument>${benchmark}</argument>
-                  </arguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    
-  </profiles>
-
-</project>
+<?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.
+-->
+<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>
+
+  <parent>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-parent</artifactId>
+    <version>47</version>
+  </parent>
+
+  <groupId>org.apache.bcel</groupId>
+  <artifactId>bcel</artifactId>
+  <packaging>jar</packaging>
+  <version>6.3.1-SNAPSHOT</version>
+  <name>Apache Commons BCEL</name>
+  <description>Apache Commons Bytecode Engineering Library</description>
+
+  <url>http://commons.apache.org/proper/commons-bcel</url>
+  <inceptionYear>2004</inceptionYear>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <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.3.1</commons.release.version>
+    <commons.release.isDistModule>true</commons.release.isDistModule>
+    <commons.rc.version>RC1</commons.rc.version>
+    <commons.bc.version>6.3</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>
+    <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>    
+    <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
+    <!-- Configuration properties for the OSGi maven-bundle-plugin -->
+    <commons.osgi.symbolicName>org.apache.${commons.componentid}</commons.osgi.symbolicName>
+    <commons.osgi.export>org.apache.bcel.*;version=${project.version};-noimport:=true</commons.osgi.export>
+    <commons.osgi.import>*</commons.osgi.import>
+    <commons.osgi.dynamicImport />
+    <commons.osgi.private />
+    <commons.jira.id>BCEL</commons.jira.id>
+    <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>2.17</checkstyle.plugin.version>
+    <commons.clirr.version>2.8</commons.clirr.version>
+    <jna.version>4.5.0</jna.version>
+  </properties>
+
+  <!-- Cannot be added to Commons Parent, see https://issues.apache.org/jira/browse/COMMONSSITE-26 -->
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <name>Apache Website</name>
+      <url>scp://people.apache.org/www/commons.apache.org/${commons.componentid}/</url>
+    </site>
+  </distributionManagement>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <developers>
+    <developer>
+      <name>Dave Brosius</name>
+      <id>dbrosius</id>
+      <email>dbrosius at mebigfatguy.com</email>
+    </developer>
+
+    <developer>
+      <name>Torsten Curdt</name>
+      <id>tcurdt</id>
+      <email>tcurdt at apache.org</email>
+      <organization>ASF</organization>
+      <organizationUrl>http://www.apache.org/</organizationUrl>
+      <timezone>+1</timezone>
+    </developer>
+
+    <developer>
+      <name>Markus Dahm</name>
+      <id>mdahm</id>
+      <email>m.dahm at gmx.de</email>
+      <organization>it-frameworksolutions</organization>
+    </developer>
+
+    <developer>
+      <name>Jason van Zyl</name>
+      <email>jason at zenplex.com</email>
+    </developer>
+
+    <developer>
+      <id>ggregory</id>
+      <name>Gary Gregory</name>
+      <email>ggregory@apache.org</email>
+      <organization>Rocket Software</organization>
+      <roles>
+        <role>PMC Member</role>
+      </roles>
+      <timezone>America/New_York</timezone>
+    </developer>
+
+  </developers>
+
+  <contributors>
+
+    <contributor>
+      <name>Enver Haase</name>
+      <email>enver at convergence.de</email>
+    </contributor>
+
+    <contributor>
+      <name>David Dixon-Peugh</name>
+      <email>dixonpeugh at yahoo.com</email>
+    </contributor>
+
+    <contributor>
+      <name>Patrick Beard</name>
+      <email>beard at netscape.com</email>
+    </contributor>
+
+    <contributor>
+      <name>Conor MacNeill</name>
+      <email>conor at cortexbusiness.com.au</email>
+    </contributor>
+
+    <contributor>
+      <name>Costin Manolache</name>
+      <email>cmanolache at yahoo.com</email>
+    </contributor>
+
+    <contributor>
+      <name>Bill Pugh</name>
+      <email>bill.pugh at gmail.com</email>
+    </contributor>
+
+    <contributor>
+      <name>First Hop Ltd / Torsten Rueger</name>
+    </contributor>
+
+    <contributor>
+      <name>Jérôme Leroux</name>
+    </contributor>
+
+    <contributor>
+      <name>Mark Roberts</name>
+    </contributor>
+
+    <contributor>
+      <name>Sam Yoon</name>
+    </contributor>
+  </contributors>
+
+  <mailingLists>
+    <mailingList>
+      <name>BCEL User List</name>
+      <subscribe>user-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>user-unsubscribe@commons.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/commons-user/</archive>
+    </mailingList>
+    <mailingList>
+      <name>BCEL Developer List</name>
+      <subscribe>dev-subscribe@commons.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@commons.apache.org</unsubscribe>
+      <archive>http://mail-archives.apache.org/mod_mbox/commons-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/BCEL</url>
+  </issueManagement>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/bcel/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/bcel/trunk</developerConnection>
+    <url>http://svn.apache.org/repos/asf/commons/proper/bcel/trunk</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>${commons.rat.version}</version>
+        <configuration>
+          <excludes>
+            <exclude>src/test/resources/**</exclude>
+            <exclude>docs/*.bib</exclude>
+            <exclude>docs/*.mdl</exclude>
+            <exclude>docs/eps/*</exclude>
+            <exclude>**/*.eps</exclude>
+            <exclude>**/*.bnf</exclude>
+            <exclude>**/*.mini</exclude>
+            <exclude>TODO.JustIce</exclude>
+            <exclude>src/examples/Mini/MiniParser$JJCalls</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <!-- Allow Clirr to be run from command line -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <version>${commons.clirr.version}</version>
+        <configuration>
+          <minSeverity>${minSeverity}</minSeverity>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <!-- Temporary fix for BCEL-293, remove this after this has implemented in parent pom -->
+        <configuration>
+          <archive combine.children="append">
+            <manifestEntries>
+              <Automatic-Module-Name>org.apache.bcel</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <testExcludes>
+            <testExclude>**/*Benchmark*</testExclude>
+          </testExcludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <property>
+              <!-- Suppress the stats, but keep the test as it exercises the code -->
+              <name>PerformanceTest.report</name>
+              <value>false</value>
+            </property>
+          </systemProperties>
+          <includes>
+            <include>**/*TestCase.java</include>
+            <include>**/PerformanceTest.java</include>
+          </includes>
+          <excludes>
+            <exclude>**/Abstract*</exclude>
+            <!-- Takes rather a long time (especially rt.jar) ; only needs to be done occasionally -->
+            <exclude>**/JDKClassDumpTestCase.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <!-- These need to be specified because CP includes a descriptor -->
+          <descriptors>
+            <descriptor>src/assembly/bin.xml</descriptor>
+            <descriptor>src/assembly/src.xml</descriptor>
+          </descriptors>
+          <tarLongFileMode>gnu</tarLongFileMode>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-scm-publish-plugin</artifactId>
+        <configuration>
+          <ignorePathsToDelete>
+            <ignorePathToDelete>javadocs</ignorePathToDelete>
+          </ignorePathsToDelete>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.plugin.version}</version>
+        <configuration>
+          <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+          <!-- Needed to define config_loc -->
+          <propertyExpansion>config_loc=${basedir}</propertyExpansion>
+          <enableRulesSummary>false</enableRulesSummary>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <!--
+        <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jardiff-maven-plugin</artifactId>
+        <configuration>
+        <artifacts>
+        <artifact>
+        <version>5.2</version>
+        </artifact>
+        <artifact>
+        <groupId>bcel</groupId>
+        <version>5.1</version>
+        </artifact>
+        </artifacts>
+        </configuration>
+        </plugin>
+      -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>${checkstyle.plugin.version}</version>
+        <configuration>
+          <configLocation>${basedir}/src/conf/checkstyle.xml</configLocation>
+          <!-- Needed to define config_loc -->
+          <propertyExpansion>config_loc=${basedir}</propertyExpansion>
+          <enableRulesSummary>false</enableRulesSummary>
+        </configuration>
+        <!-- We need to specify reportSets because 2.9.1 creates two reports -->
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>checkstyle</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.8</version>
+        <configuration>
+          <targetJdk>${maven.compiler.target}</targetJdk>
+          <linkXref>true</linkXref>
+          <rulesets>
+            <ruleset>${basedir}/src/conf/pmd.xml</ruleset>
+          </rulesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>${commons.findbugs.version}</version>
+        <configuration>
+          <threshold>Normal</threshold>
+          <effort>Default</effort>
+          <excludeFilterFile>${basedir}/src/conf/findbugs-exclude-filter.xml</excludeFilterFile>
+          <fork>true</fork>
+          <jvmArgs>-Duser.language=en</jvmArgs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <tags>
+            <tag>TODO</tag>
+            <tag>NOPMD</tag>
+            <tag>NOTE</tag>
+          </tags>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>${commons.rat.version}</version>
+        <configuration>
+          <excludes>
+            <exclude>src/test/resources/**</exclude>
+            <exclude>docs/*.bib</exclude>
+            <exclude>docs/*.mdl</exclude>
+            <exclude>docs/eps/*</exclude>
+            <exclude>**/*.eps</exclude>
+            <exclude>**/*.bnf</exclude>
+            <exclude>**/*.mini</exclude>
+            <exclude>TODO.JustIce</exclude>
+            <exclude>src/examples/Mini/MiniParser$JJCalls</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>${jna.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna-platform</artifactId>
+      <version>${jna.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <!--
+        Profile to ignore certain Clirr errors
+        To show all the errors, use -P!quieten-clirr or -Dclirr.allDifferences
+    -->
+    <profile>
+      <id>quieten-clirr</id>
+      <activation>
+        <!-- Enable unless the following is defined -->
+        <property>
+          <name>!clirr.allDifferences</name>
+        </property>
+      </activation>
+      <properties>
+        <!-- It's not possible to undefine this once defined, so we define it in a profile that is normally active -->
+        <clirr.ignoredDifferencesFile>${basedir}/src/conf/clirr-ignored-diffs.xml</clirr.ignoredDifferencesFile>
+      </properties>
+    </profile>
+    <!-- Profile to build and run PerformanceTest. Use 'mvn test -Pjdk-rt' -->
+    <profile>
+      <id>jdk-rt</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>${commons.surefire.version}</version>
+            <configuration>
+              <includes>
+                <include>**/PerformanceTest.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- Profile to build and run the benchmarks. Use 'mvn test -Pbenchmark', and add '-Dbenchmark=foo' to run only the foo benchmark -->
+    <profile>
+      <id>benchmark</id>
+
+      <properties>
+        <skipTests>true</skipTests>
+        <benchmark>org.apache</benchmark>
+        <jmh.version>1.19</jmh.version>
+      </properties>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.openjdk.jmh</groupId>
+          <artifactId>jmh-core</artifactId>
+          <version>${jmh.version}</version>
+          <scope>test</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.openjdk.jmh</groupId>
+          <artifactId>jmh-generator-annprocess</artifactId>
+          <version>${jmh.version}</version>
+          <scope>test</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>commons-io</groupId>
+          <artifactId>commons-io</artifactId>
+          <version>2.6</version>
+          <scope>test</scope>
+        </dependency>
+
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-collections4</artifactId>
+          <version>4.3</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+
+      <build>
+        <plugins>
+          <!-- Enable the compilation of the benchmarks -->
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>${commons.compiler.version}</version>
+            <configuration combine.self="override">
+              <testIncludes>
+                <testInclude>**/*</testInclude>
+              </testIncludes>
+            </configuration>
+          </plugin>
+
+          <!-- Hook the benchmarks to the test phase -->
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.6.0</version>
+            <executions>
+              <execution>
+                <id>benchmark</id>
+                <phase>test</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <classpathScope>test</classpathScope>
+                  <executable>java</executable>
+                  <arguments>
+                    <argument>-classpath</argument>
+                    <classpath />
+                    <argument>org.openjdk.jmh.Main</argument>
+                    <argument>-rf</argument>
+                    <argument>json</argument>
+                    <argument>-rff</argument>
+                    <argument>target/jmh-result.json</argument>
+                    <argument>${benchmark}</argument>
+                  </arguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    
+  </profiles>
+
+</project>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1faa3a7..97beddc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,7 +62,7 @@ The <action> type attribute can be add,update,fix,remove.
    -->
 
   <body>
-    <release version="6.4" date="2019-MM-DD" description="TO DO">
+    <release version="6.3.1" date="2019-03-20" description="Bug fix release">
       <action issue="BCEL-267" type="fix" dev="ggregory" due-to="Stephan Herrmann, Sebb, Gary Gregory, Torsten Curdt">Race conditions on static fields in BranchHandle and InstructionHandle.</action>
       <action issue="BCEL-297" type="fix" dev="ggregory" due-to="Mark Roberts, mingleizhang">Possible NPE in override implementation of Object.equals (#20)</action>
       <action issue="BCEL-298" type="update" dev="ggregory" due-to="mingleizhang">Add some files to .gitignore (#19)</action>
diff --git a/src/site/xdoc/download_bcel.xml b/src/site/xdoc/download_bcel.xml
index 0ebd983..ed3add9 100644
--- a/src/site/xdoc/download_bcel.xml
+++ b/src/site/xdoc/download_bcel.xml
@@ -1,156 +1,156 @@
-<?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.
--->
-<!--
- +======================================================================+
- |****                                                              ****|
- |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
- |****                    DO NOT EDIT DIRECTLY                      ****|
- |****                                                              ****|
- +======================================================================+
- | TEMPLATE FILE: download-page-template.xml                            |
- | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
- +======================================================================+
- |                                                                      |
- | 1) Re-generate using: mvn commons-build:download-page                |
- |                                                                      |
- | 2) Set the following properties in the component's pom:              |
- |    - commons.componentid     (required, alphabetic, lower case)      |
- |    - commons.release.version (required)                              |
- |    - commons.release.name    (required)                              |
- |    - commons.binary.suffix   (optional)                              |
- |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
- |    - commons.release.desc    (optional)                              |
- |    - commons.release.subdir  (optional)                              |
- |    - commons.release.hash    (optional, lowercase, default sha256)   |
- |                                                                      |
- |    - commons.release.[234].version       (conditional)               |
- |    - commons.release.[234].name          (conditional)               |
- |    - commons.release.[234].binary.suffix (optional)                  |
- |    - commons.release.[234].desc          (optional)                  |
- |    - commons.release.[234].subdir        (optional)                  |
- |    - commons.release.[234].hash       (optional, lowercase, [sha256])|
- |                                                                      |
- | 3) Example Properties                                                |
- |    (commons.release.name inherited by parent:                        |
- |     ${project.artifactId}-${commons.release.version}                 |
- |                                                                      |
- |  <properties>                                                        |
- |    <commons.componentid>math</commons.componentid>                   |
- |    <commons.release.version>1.2</commons.release.version>            |
- |  </properties>                                                       |
- |                                                                      |
- +======================================================================+
--->
-<document>
-  <properties>
-    <title>Download Apache Commons BCEL</title>
-    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
-  </properties>
-  <body>
-    <section name="Download Apache Commons BCEL">
-    <subsection name="Using a Mirror">
-      <p>
-        We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
-        the downloaded files using signatures downloaded from our main
-        distribution directories. Recent releases (48 hours) may not yet
-        be available from all the mirrors.
-      </p>
-
-      <p>
-        You are currently using <b>[preferred]</b>.  If you
-        encounter a problem with this mirror, please select another
-        mirror.  If all mirrors are failing, there are <i>backup</i>
-        mirrors (at the end of the mirrors list) that should be
-        available.
-        <br></br>
-        [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
-      </p>
-
-      <form action="[location]" method="get" id="SelectMirror">
-        <p>
-          Other mirrors:
-          <select name="Preferred">
-          [if-any http]
-            [for http]<option value="[http]">[http]</option>[end]
-          [end]
-          [if-any ftp]
-            [for ftp]<option value="[ftp]">[ftp]</option>[end]
-          [end]
-          [if-any backup]
-            [for backup]<option value="[backup]">[backup] (backup)</option>[end]
-          [end]
-          </select>
-          <input type="submit" value="Change"></input>
-        </p>
-      </form>
-
-      <p>
-        It is essential that you
-        <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
-        of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
-        failing that using the <code>SHA256</code> hash (<code>*.sha256</code> checksum files).
-      </p>
-      <p>
-        The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
-        file contains the public PGP keys used by Apache Commons developers
-        to sign releases.
-      </p>
-    </subsection>
-    </section>
-    <section name="Apache Commons BCEL 6.3 (Java 8)">
-      <subsection name="Binaries">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/bcel/binaries/bcel-6.3-bin.tar.gz">bcel-6.3-bin.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3-bin.tar.gz.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3-bin.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/bcel/binaries/bcel-6.3-bin.zip">bcel-6.3-bin.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3-bin.zip.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3-bin.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Source">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/bcel/source/bcel-6.3-src.tar.gz">bcel-6.3-src.tar.gz</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3-src.tar.gz.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3-src.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/bcel/source/bcel-6.3-src.zip">bcel-6.3-src.zip</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3-src.zip.sha256">sha256</a></td>
-              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3-src.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </subsection>
-    </section>
-    <section name="Archives">
-        <p>
-          Older releases can be obtained from the archives.
-        </p>
-        <ul>
-          <li class="download"><a href="[preferred]/commons/bcel/">browse download area</a></li>
-          <li><a href="https://archive.apache.org/dist/commons/bcel/">archives...</a></li>
-        </ul>
-    </section>
-  </body>
-</document>
+<?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.
+-->
+<!--
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: download-page-template.xml                            |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 1) Re-generate using: mvn commons-build:download-page                |
+ |                                                                      |
+ | 2) Set the following properties in the component's pom:              |
+ |    - commons.componentid     (required, alphabetic, lower case)      |
+ |    - commons.release.version (required)                              |
+ |    - commons.release.name    (required)                              |
+ |    - commons.binary.suffix   (optional)                              |
+ |      (defaults to "-bin", set to "" for pre-maven2 releases)         |
+ |    - commons.release.desc    (optional)                              |
+ |    - commons.release.subdir  (optional)                              |
+ |    - commons.release.hash    (optional, lowercase, default sha512)   |
+ |                                                                      |
+ |    - commons.release.[234].version       (conditional)               |
+ |    - commons.release.[234].name          (conditional)               |
+ |    - commons.release.[234].binary.suffix (optional)                  |
+ |    - commons.release.[234].desc          (optional)                  |
+ |    - commons.release.[234].subdir        (optional)                  |
+ |    - commons.release.[234].hash       (optional, lowercase, [sha512])|
+ |                                                                      |
+ | 3) Example Properties                                                |
+ |    (commons.release.name inherited by parent:                        |
+ |     ${project.artifactId}-${commons.release.version}                 |
+ |                                                                      |
+ |  <properties>                                                        |
+ |    <commons.componentid>math</commons.componentid>                   |
+ |    <commons.release.version>1.2</commons.release.version>            |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+-->
+<document>
+  <properties>
+    <title>Download Apache Commons BCEL</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
+  </properties>
+  <body>
+    <section name="Download Apache Commons BCEL">
+    <subsection name="Using a Mirror">
+      <p>
+        We recommend you use a mirror to download our release
+        builds, but you <strong>must</strong> <a href="http://www.apache.org/info/verification.html">verify the integrity</a> of
+        the downloaded files using signatures downloaded from our main
+        distribution directories. Recent releases (48 hours) may not yet
+        be available from all the mirrors.
+      </p>
+
+      <p>
+        You are currently using <b>[preferred]</b>.  If you
+        encounter a problem with this mirror, please select another
+        mirror.  If all mirrors are failing, there are <i>backup</i>
+        mirrors (at the end of the mirrors list) that should be
+        available.
+        <br></br>
+        [if-any logo]<a href="[link]"><img align="right" src="[logo]" border="0"></img></a>[end]
+      </p>
+
+      <form action="[location]" method="get" id="SelectMirror">
+        <p>
+          Other mirrors:
+          <select name="Preferred">
+          [if-any http]
+            [for http]<option value="[http]">[http]</option>[end]
+          [end]
+          [if-any ftp]
+            [for ftp]<option value="[ftp]">[ftp]</option>[end]
+          [end]
+          [if-any backup]
+            [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+          [end]
+          </select>
+          <input type="submit" value="Change"></input>
+        </p>
+      </form>
+
+      <p>
+        It is essential that you
+        <a href="https://www.apache.org/info/verification.html">verify the integrity</a>
+        of downloaded files, preferably using the <code>PGP</code> signature (<code>*.asc</code> files);
+        failing that using the <code>SHA512</code> hash (<code>*.sha512</code> checksum files).
+      </p>
+      <p>
+        The <a href="https://www.apache.org/dist/commons/KEYS">KEYS</a>
+        file contains the public PGP keys used by Apache Commons developers
+        to sign releases.
+      </p>
+    </subsection>
+    </section>
+    <section name="Apache Commons BCEL 6.3.1 (Java 8)">
+      <subsection name="Binaries">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/bcel/binaries/bcel-6.3.1-bin.tar.gz">bcel-6.3.1-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3.1-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3.1-bin.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/bcel/binaries/bcel-6.3.1-bin.zip">bcel-6.3.1-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3.1-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/binaries/bcel-6.3.1-bin.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Source">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/bcel/source/bcel-6.3.1-src.tar.gz">bcel-6.3.1-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3.1-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3.1-src.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/bcel/source/bcel-6.3.1-src.zip">bcel-6.3.1-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3.1-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/bcel/source/bcel-6.3.1-src.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
+    <section name="Archives">
+        <p>
+          Older releases can be obtained from the archives.
+        </p>
+        <ul>
+          <li class="download"><a href="[preferred]/commons/bcel/">browse download area</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/bcel/">archives...</a></li>
+        </ul>
+    </section>
+  </body>
+</document>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index c4471f5..641c8ec 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -1,107 +1,107 @@
-<?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.
--->
-
-<document>
-  <properties>
-    <title>Home</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
-  </properties>
-  <body>
-
-    <section name="Commons BCEL">
-      <p>
-        The Byte Code Engineering Library (Apache Commons BCEL&#x2122;) is intended to give users a
-        convenient way to analyze, create, and manipulate (binary)
-        Java class files (those ending with .class). Classes are
-        represented by objects which contain all the symbolic information
-        of the given class: methods, fields and byte code instructions, in
-        particular.
-      </p>
-
-      <p>
-        Such objects can be read from an existing file, be transformed
-        by a program (e.g. a class loader at run-time) and written to a file again.
-        An even more interesting application is the creation of classes from scratch
-        at run-time. The Byte Code Engineering Library (BCEL) may be also useful
-        if you want to learn about the Java Virtual Machine (JVM) and the format of
-        Java .class files.
-      </p>
-
-      <p>
-        BCEL contains a byte code verifier named JustIce, which usually
-        gives you much better information about what's wrong with your
-        code than the standard JVM message.
-      </p>
-
-      <p>
-        BCEL is already being used successfully in several projects such
-        as compilers, optimizers, obsfuscators, code generators
-        and analysis tools. Unfortunately there hasn't been much development
-        going on over the past few years. Feel free to help out or you
-        might want to have a look into the ASM project at objectweb.
-      </p>
-    </section>
-
-    <section name="Documentation">
-      <p>
-        The package descriptions in the <a href="javadocs/api-release/index.html">Javadoc</a> give an overview of the available features
-        and various <a href="project-reports.html">project reports</a> are provided.
-      </p>
-      <p>
-        The Javadoc API documents are available online:
-      </p>
-      <ul>
-        <li>The <a href="apidocs/index.html">current stable release</a></li>
-      </ul>
-      <p>
-        The <a href="source-repository.html">svn repository</a> can be
-        <a href="http://svn.apache.org/viewvc/commons/proper/bcel/trunk">browsed</a>, or you can browse/contribute via <a href="https://github.com/apache/commons-bcel">GitHub</a>.
-      </p>
-    </section>
-    <!-- ================================================== -->
-    <section name="Release Information">
-      <p>The latest stable release of BCEL is here, you may: </p>
-      <ul>
-        <li><a href="https://commons.apache.org/proper/commons-bcel/download_bcel.cgi">Download</a></li>
-	    <li>Read the <a href="https://www.apache.org/dist/commons/bcel/RELEASE-NOTES.txt">release notes</a></li>
-        <li>Inspect the <a href="bcel5-bcel6-clirr-report.html">extended Clirr report</a> comparing 5.2 with 6.x</li>
-      </ul>
-      <p>
-        Alternatively you can pull it from the central Maven repositories:
-        <pre>
-&lt;dependency&gt;
-    &lt;groupId&gt;org.apache.bcel&lt;/groupId&gt;
-    &lt;artifactId&gt;bcel&lt;/artifactId&gt;
-    &lt;version&gt;6.3&lt;/version&gt;
-&lt;/dependency&gt;
-        </pre>
-      </p>
-
-    </section>
-    <!-- ================================================== -->
-    <section name="Getting Involved">
-      <p>
-        The <a href="mail-lists.html">commons developer mailing list</a> is the main channel of communication for contributors. Please remember that the lists are shared between all commons components, so prefix your email by [bcel]. </p>
-      <p>You can also visit the #apache-commons IRC channel on irc.freenode.net or peruse <a href="issue-tracking.html">JIRA</a>.</p>
-      <p>Alternatively you can go through the <em>Needs Work</em> tags in the <a href="taglist.html">TagList report</a>.</p>
-      <p>If you'd like to offer up pull requests via GitHub rather than applying patches to JIRA, we have a <a href="https://github.com/apache/commons-bcel/">GitHub mirror</a>. </p>
-    </section>
-  </body>
-</document>
+<?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.
+-->
+
+<document>
+  <properties>
+    <title>Home</title>
+    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+  </properties>
+  <body>
+
+    <section name="Commons BCEL">
+      <p>
+        The Byte Code Engineering Library (Apache Commons BCEL&#x2122;) is intended to give users a
+        convenient way to analyze, create, and manipulate (binary)
+        Java class files (those ending with .class). Classes are
+        represented by objects which contain all the symbolic information
+        of the given class: methods, fields and byte code instructions, in
+        particular.
+      </p>
+
+      <p>
+        Such objects can be read from an existing file, be transformed
+        by a program (e.g. a class loader at run-time) and written to a file again.
+        An even more interesting application is the creation of classes from scratch
+        at run-time. The Byte Code Engineering Library (BCEL) may be also useful
+        if you want to learn about the Java Virtual Machine (JVM) and the format of
+        Java .class files.
+      </p>
+
+      <p>
+        BCEL contains a byte code verifier named JustIce, which usually
+        gives you much better information about what's wrong with your
+        code than the standard JVM message.
+      </p>
+
+      <p>
+        BCEL is already being used successfully in several projects such
+        as compilers, optimizers, obsfuscators, code generators
+        and analysis tools. Unfortunately there hasn't been much development
+        going on over the past few years. Feel free to help out or you
+        might want to have a look into the ASM project at objectweb.
+      </p>
+    </section>
+
+    <section name="Documentation">
+      <p>
+        The package descriptions in the <a href="javadocs/api-release/index.html">Javadoc</a> give an overview of the available features
+        and various <a href="project-reports.html">project reports</a> are provided.
+      </p>
+      <p>
+        The Javadoc API documents are available online:
+      </p>
+      <ul>
+        <li>The <a href="apidocs/index.html">current stable release</a></li>
+      </ul>
+      <p>
+        The <a href="source-repository.html">svn repository</a> can be
+        <a href="http://svn.apache.org/viewvc/commons/proper/bcel/trunk">browsed</a>, or you can browse/contribute via <a href="https://github.com/apache/commons-bcel">GitHub</a>.
+      </p>
+    </section>
+    <!-- ================================================== -->
+    <section name="Release Information">
+      <p>The latest stable release of BCEL is here, you may: </p>
+      <ul>
+        <li><a href="https://commons.apache.org/proper/commons-bcel/download_bcel.cgi">Download</a></li>
+	    <li>Read the <a href="https://www.apache.org/dist/commons/bcel/RELEASE-NOTES.txt">release notes</a></li>
+        <li>Inspect the <a href="bcel5-bcel6-clirr-report.html">extended Clirr report</a> comparing 5.2 with 6.x</li>
+      </ul>
+      <p>
+        Alternatively you can pull it from the central Maven repositories:
+        <pre>
+&lt;dependency&gt;
+    &lt;groupId&gt;org.apache.bcel&lt;/groupId&gt;
+    &lt;artifactId&gt;bcel&lt;/artifactId&gt;
+    &lt;version&gt;6.3.1&lt;/version&gt;
+&lt;/dependency&gt;
+        </pre>
+      </p>
+
+    </section>
+    <!-- ================================================== -->
+    <section name="Getting Involved">
+      <p>
+        The <a href="mail-lists.html">commons developer mailing list</a> is the main channel of communication for contributors. Please remember that the lists are shared between all commons components, so prefix your email by [bcel]. </p>
+      <p>You can also visit the #apache-commons IRC channel on irc.freenode.net or peruse <a href="issue-tracking.html">JIRA</a>.</p>
+      <p>Alternatively you can go through the <em>Needs Work</em> tags in the <a href="taglist.html">TagList report</a>.</p>
+      <p>If you'd like to offer up pull requests via GitHub rather than applying patches to JIRA, we have a <a href="https://github.com/apache/commons-bcel/">GitHub mirror</a>. </p>
+    </section>
+  </body>
+</document>