You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by sc...@apache.org on 2019/09/17 11:00:38 UTC

[commons-math] branch MATH_3_X updated: Update build files

This is an automated email from the ASF dual-hosted git repository.

scolebourne pushed a commit to branch MATH_3_X
in repository https://gitbox.apache.org/repos/asf/commons-math.git


The following commit(s) were added to refs/heads/MATH_3_X by this push:
     new 2d3810d  Update build files
2d3810d is described below

commit 2d3810df45298ecc7aba14f4d6f33c7aaf310ecd
Author: Stephen Colebourne <st...@opengamma.com>
AuthorDate: Mon Sep 16 11:55:47 2019 +0100

    Update build files
    
    Switch to v3.6.2-SNAPSHOT
    Regenerate using commons-build plugin
    Change to https
    Remove svn artifact
---
 math-pre-RC.sh => .travis.yml                      |  22 +--
 CONTRIBUTING.md                                    |  46 ++++--
 NOTICE.txt                                         |   2 +-
 README.md                                          |  23 ++-
 math-RC.sh                                         |   4 +-
 math-pre-RC.sh                                     |   2 +-
 pom.xml                                            | 121 ++++++++++----
 siteMods/pom.xml                                   |   6 +-
 src/changes/changes.xml                            |   4 +-
 src/site/site.xml                                  |  35 ++--
 src/site/xdoc/developers.xml                       |   8 +-
 src/site/xdoc/download_math.xml                    | 180 +++++++++++----------
 src/site/xdoc/issue-tracking.xml                   |  32 ++--
 src/site/xdoc/mail-lists.xml                       |  33 ++--
 .../apache/commons/math3/special/BesselJTest.java  |   1 -
 src/userguide/pom.xml                              |  42 +++--
 16 files changed, 340 insertions(+), 221 deletions(-)

diff --git a/math-pre-RC.sh b/.travis.yml
old mode 100755
new mode 100644
similarity index 58%
copy from math-pre-RC.sh
copy to .travis.yml
index 467bd8e..aeaaa1e
--- a/math-pre-RC.sh
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-#!/bin/sh
-#
 # 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.
@@ -14,17 +12,13 @@
 # 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.
-# -----------------------------------------------------------------------------
-#
-# Shell script to update download page and release notes prior
-# to preparing a commons math release candidate.
-#
-# Note: RELEASE-NOTES.txt may need a little reformatting prior
-# to checkin.  Both RELEASE-NOTES.txt and the generated download
-# page need to be checked in after review.
-#
-# ----------------------------------------------------------------------------
 
-mvn changes:announcement-generate -Prelease-notes [-Dchanges.version=m.n]
+language: java
+jdk:
+  - openjdk8
+
+env:
+  - MAVEN_OPTS="-Xmx6g -Xms2g"
 
-mvn commons:download-page
+script:
+  - mvn clean install jacoco:report site -Ptravis-jacoco
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5bcbfc1..f090998 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,7 +25,7 @@
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:contributing-md                    |
+ | 1) Re-generate using: mvn commons-build:contributing-md              |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.jira.id  (required, alphabetic, upper case)             |
@@ -50,48 +50,66 @@ Getting Started
 
 + Make sure you have a [JIRA account](https://issues.apache.org/jira/).
 + Make sure you have a [GitHub account](https://github.com/signup/free).
-+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Math's scope.
-+ Submit a ticket for your issue, assuming one does not already exist.
++ If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Math's scope.
++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
   + Clearly describe the issue including steps to reproduce when it is a bug.
   + Make sure you fill in the earliest version that you know has the issue.
-+ Fork the repository on GitHub.
++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
 
 Making Changes
 --------------
 
-+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch).
++ Create a _topic branch_ for your isolated work.
+  * Usually you should base your branch on the `master` or `trunk` branch.
+  * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `MATH-123-InputStream`.
+  * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests.
 + Make commits of logical units.
+  * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue.
+  * e.g. `MATH-123: Close input stream earlier`
 + Respect the original code style:
   + Only use spaces for indentation.
-  + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change.
-  + Check for unnecessary whitespace with git diff --check before committing.
-+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
-+ Make sure you have added the necessary tests for your changes.
+  + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first.
+  + Check for unnecessary whitespace with `git diff` -- check before committing.
++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
 + Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
 
 Making Trivial Changes
 ----------------------
 
+The JIRA tickets are used to generate the changelog for the next release.
+
 For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA.
 In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number.
 
+
 Submitting Changes
 ------------------
 
-+ Sign the [Contributor License Agreement][cla] if you haven't already.
++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
+  * Note that small patches & typical bug fixes do not require a CLA as
+    clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+    covers them.
 + Push your changes to a topic branch in your fork of the repository.
-+ Submit a pull request to the repository in the apache organization.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
+  * Verify _Files Changed_ shows only your intended changes and does not
+  include additional files like `target/*.class`
 + Update your JIRA ticket and include a link to the pull request in the ticket.
 
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
 Additional Resources
 --------------------
 
 + [Contributing patches](https://commons.apache.org/patches.html)
-+ [Apache Commons Math JIRA project page](https://issues.apache.org/jira/browse/MATH)
++ [Apache Commons Math JIRA project page][jira]
 + [Contributor License Agreement][cla]
 + [General GitHub documentation](https://help.github.com/)
-+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.net`
 
 [cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/MATH
diff --git a/NOTICE.txt b/NOTICE.txt
index be158fe..6fe2e55 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache Commons Math
-Copyright 2001-2016 The Apache Software Foundation
+Copyright 2001-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 73cafa4..d21f4f3 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:readme-md                          |
+ | 1) Re-generate using: mvn commons-build:readme-md                    |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
@@ -43,13 +43,18 @@
 Apache Commons Math
 ===================
 
+[![Build Status](https://travis-ci.org/apache/commons-math.svg)](https://travis-ci.org/apache/commons-math)
+[![Coverage Status](https://coveralls.io/repos/apache/commons-math/badge.svg)](https://coveralls.io/r/apache/commons-math)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-math3/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-math3/)
+[![Javadocs](https://javadoc.io/badge/org.apache.commons/commons-math3/3.6.2-SNAPSHOT.svg)](https://javadoc.io/doc/org.apache.commons/commons-math3/3.6.2-SNAPSHOT)
+
 The Apache Commons Math project is a library of lightweight, self-contained mathematics and statistics components addressing the most common practical problems not immediately available in the Java programming language or commons-lang.
 
 Documentation
 -------------
 
-More information can be found on the [homepage](https://commons.apache.org/proper/commons-math).
-The [JavaDoc](https://commons.apache.org/proper/commons-math/apidocs) can be browsed.
+More information can be found on the [Apache Commons Math homepage](https://commons.apache.org/proper/commons-math).
+The [Javadoc](https://commons.apache.org/proper/commons-math/apidocs) can be browsed.
 Questions related to the usage of Apache Commons Math should be posted to the [user mailing list][ml].
 
 Where can I get the latest release?
@@ -62,14 +67,14 @@ Alternatively you can pull it from the central Maven repositories:
 <dependency>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-math3</artifactId>
-  <version>3.4</version>
+  <version>3.6.2-SNAPSHOT</version>
 </dependency>
 ```
 
 Contributing
 ------------
 
-We accept PRs via github. The [developer mailing list][ml] is the main channel of communication for contributors.
+We accept Pull Requests via GitHub. The [developer mailing list][ml] is the main channel of communication for contributors.
 There are some guidelines which will make applying PRs easier for us:
 + No tabs! Please use spaces for indentation.
 + Respect the code style.
@@ -81,7 +86,9 @@ You can learn more about contributing via GitHub in our [contribution guidelines
 
 License
 -------
-Code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0.txt).
+This code is under the [Apache Licence v2](https://www.apache.org/licenses/LICENSE-2.0).
+
+See the `NOTICE.txt` file for required notices and attributions.
 
 Donations
 ---------
@@ -91,8 +98,8 @@ Additional Resources
 --------------------
 
 + [Apache Commons Homepage](https://commons.apache.org/)
-+ [Apache Bugtracker (JIRA)](https://issues.apache.org/jira/)
++ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/MATH)
 + [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ #apachecommons IRC channel on freenode.org
++ `#apache-commons` IRC channel on `irc.freenode.org`
 
 [ml]:https://commons.apache.org/mail-lists.html
diff --git a/math-RC.sh b/math-RC.sh
index 98c0f27..284590c 100755
--- a/math-RC.sh
+++ b/math-RC.sh
@@ -21,7 +21,7 @@
 #
 # -----------------------------------------------------------------------------
 # Set script variables
-version=2.1
+version=3.6.2
 repo_path=~/.m2/repository/org/apache/commons/commons-math/${version}
 site_mods_path=./siteMods
 release_path=~/math-release
@@ -45,7 +45,7 @@ svn revert src/site/site.xml
 svn revert pom.xml
 #
 # Generate the release artifacts and install them locally
-mvn assembly:assembly
+mvn assembly:single
 mvn -Prc -DcreateChecksum=true install
 #
 # Copy the zips/tarballs and release notes to release directory
diff --git a/math-pre-RC.sh b/math-pre-RC.sh
index 467bd8e..2376f14 100755
--- a/math-pre-RC.sh
+++ b/math-pre-RC.sh
@@ -27,4 +27,4 @@
 
 mvn changes:announcement-generate -Prelease-notes [-Dchanges.version=m.n]
 
-mvn commons:download-page
+mvn commons-build:download-page
diff --git a/pom.xml b/pom.xml
index 4972bac..793a874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,31 +16,31 @@
    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>39</version>
+    <version>48</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.commons</groupId>
   <artifactId>commons-math3</artifactId>
-  <version>3.7-SNAPSHOT</version>
+  <version>3.6.2-SNAPSHOT</version>
   <name>Apache Commons Math</name>
 
   <inceptionYear>2003</inceptionYear>
   <description>The Apache Commons Math project is a library of lightweight, self-contained mathematics and statistics components addressing the most common practical problems not immediately available in the Java programming language or commons-lang.</description>
 
-  <url>http://commons.apache.org/proper/commons-math/</url>
+  <url>https://commons.apache.org/proper/commons-math/</url>
 
   <issueManagement>
     <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/MATH</url>
+    <url>https://issues.apache.org/jira/browse/MATH</url>
   </issueManagement>
 
   <scm>
-    <connection>scm:git:http://git-wip-us.apache.org/repos/asf/commons-math.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/commons-math.git</developerConnection>
-    <url>https://git-wip-us.apache.org/repos/asf?p=commons-math.git</url>
+    <connection>scm:git:http://gitbox.apache.org/repos/asf/commons-math.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-math.git</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf?p=commons-math.git</url>
   </scm>
 
   <distributionManagement>
@@ -369,7 +369,7 @@
     <!-- This value must reflect the current name of the base package. -->
     <commons.osgi.symbolicName>org.apache.commons.math3</commons.osgi.symbolicName>
     <!-- do not use snapshot suffix here -->
-    <commons.release.version>3.7-SNAPSHOT</commons.release.version>
+    <commons.release.version>3.6.2-SNAPSHOT</commons.release.version>
     <commons.release.desc>(requires Java 1.5+)</commons.release.desc>
     <commons.rc.version>RC1</commons.rc.version>
     <commons.binary.suffix>-bin</commons.binary.suffix>
@@ -386,19 +386,10 @@
     <maven.compiler.source>1.5</maven.compiler.source>
     <maven.compiler.target>1.5</maven.compiler.target>
     <math.pmd.version>3.5</math.pmd.version>
-    <math.findbugs.version>3.0.2</math.findbugs.version>
+    <math.findbugs.version>3.0.4</math.findbugs.version>
     <math.checkstyle.version>2.17</math.checkstyle.version>
-    <math.clirr.version>2.6.1</math.clirr.version>
-
-    <!-- Temporary fix to support Java 8 -->
-    <commons.jacoco.version>0.7.5.201505241946</commons.jacoco.version>
-    <commons.jacoco.classRatio>0.96</commons.jacoco.classRatio>
-    <commons.jacoco.instructionRatio>0.8</commons.jacoco.instructionRatio>
-    <commons.jacoco.methodRatio>0.8</commons.jacoco.methodRatio>
-    <commons.jacoco.branchRatio>0.8</commons.jacoco.branchRatio>
-    <commons.jacoco.complexityRatio>0.8</commons.jacoco.complexityRatio>
-    <commons.jacoco.lineRatio>0.85</commons.jacoco.lineRatio>
-    <commons.jacoco.haltOnFailure>false</commons.jacoco.haltOnFailure>
+    <math.clirr.version>2.8</math.clirr.version>
+    <math.mathjax.version>2.7.6</math.mathjax.version>
 
     <commons.site.path>math</commons.site.path>
     <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-math</commons.scmPubUrl>
@@ -406,9 +397,14 @@
 
     <!-- Temporary fix to replace svn-based build number with git-based build number -->
     <buildnumber.skip>true</buildnumber.skip>
-    <math.jgit.buildnumber.version>1.2.10</math.jgit.buildnumber.version>
+    <math.jgit.buildnumber.version>1.2.11</math.jgit.buildnumber.version>
     <implementation.build>${git.revision}; ${maven.build.timestamp}</implementation.build>
 
+    <!-- Java8+ requires additional Javadoc qualifier for MathJax (default to empty). -->
+    <allowscript.javadoc.qualifier></allowscript.javadoc.qualifier>
+    <!-- MathJax requires additional Javadoc qualifier for Java8+ -->
+    <!-- default to empty for earlier versions of Java -->
+    <doclint.javadoc.qualifier></doclint.javadoc.qualifier>
   </properties>
 
   <build>
@@ -417,6 +413,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
+            <!-- Fix for OpenJDK 8 now validating class-path attributes in Jar manifests. -->
+            <!-- See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=912333#63 -->
+            <useSystemClassLoader>false</useSystemClassLoader>
               <includes>
                 <include>**/*Test.java</include>
                 <include>**/*TestBinary.java</include>
@@ -534,7 +533,62 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-header &apos;&lt;script type=&quot;text/javascript&quot; src=&quot;http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML&quot;&gt;&lt;/script&gt;&apos;</additionalparam>
+          <!-- Enable MathJax -->
+          <additionalOptions>${doclint.javadoc.qualifier} --allow-script-in-comments -header '&lt;script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${math.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"&gt;&lt;/script&gt;'</additionalOptions>
+          <!-- <aggregate>true</aggregate> -->
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <version>${commons.rat.version}</version>
+        <configuration>
+        <!--
+          Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check
+          Below should agree with config in <reporting> section, so the site
+          gets consistent output.
+        -->
+           <excludes>
+
+            <!-- MANIFEST files cannot have any comments, so we can't put license header -->
+            <exclude>src/test/maxima/special/RealFunctionValidation/MANIFEST.txt</exclude>
+
+            <!-- the following are test data files with specific syntax that cannot include
+                 Apache header (and the contained data is public, it is not owned by Apache) -->
+            <exclude>src/test/resources/org/apache/commons/math3/random/testData.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/random/emptyFile.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/PiDigits.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/NumAcc3.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/Lew.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/NumAcc2.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/NumAcc1.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/Lottery.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/NumAcc4.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/Michelso.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/stat/data/Mavro.txt</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/geometry/euclidean/threed/issue-1211.bsp</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/geometry/euclidean/threed/pentomino-N-bad-orientation.ply</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/geometry/euclidean/threed/pentomino-N-hole.ply</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/geometry/euclidean/threed/pentomino-N-out-of-plane.ply</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/geometry/euclidean/threed/pentomino-N-too-close.ply</exclude>
+            <exclude>src/test/resources/org/apache/commons/math3/geometry/euclidean/threed/pentomino-N.ply</exclude>
+
+            <!-- direction numbers for Sobol generation from Frances Y. Kuo and Stephen Joe,
+                 available under a BSD-style license (see LICENSE.txt) -->
+            <exclude>src/main/resources/assets/org/apache/commons/math3/random/new-joe-kuo-6.1000</exclude>
+
+            <!-- text file explaining reference to a public domain image -->
+            <exclude>src/userguide/resources/references.txt</exclude>
+
+            <!-- version 0.8 of apache-rat-plugin does not exclude properly
+                 some default development tools files (see RAT-126) -->
+            <exclude>bin/**</exclude>
+            <exclude>.gitignore</exclude>
+            <exclude>.git/**</exclude>
+            <exclude>.checkstyle</exclude>
+            <exclude>.ekstazi/**</exclude>
+
+          </excludes>
         </configuration>
       </plugin>
     </plugins>
@@ -577,7 +631,12 @@
         <artifactId>apache-rat-plugin</artifactId>
         <version>${commons.rat.version}</version>
         <configuration>
-          <excludes>
+        <!--
+          Needed for command-line access, e.g mvn apache-rat:rat and mvn apache-rat:check
+          Below should agree with config in <build> section, so the site
+          gets consistent output.
+        -->
+           <excludes>
 
             <!-- MANIFEST files cannot have any comments, so we can't put license header -->
             <exclude>src/test/maxima/special/RealFunctionValidation/MANIFEST.txt</exclude>
@@ -685,7 +744,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-header &apos;&lt;script type=&quot;text/javascript&quot; src=&quot;http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML&quot;&gt;&lt;/script&gt;&apos;</additionalparam>
+          <additionalOptions>${doclint.javadoc.qualifier} --allow-script-in-comments -header '&lt;script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/${math.mathjax.version}/MathJax.js?config=TeX-AMS-MML_HTMLorMML"&gt;&lt;/script&gt;'</additionalOptions>
         </configuration>
       </plugin>
     </plugins>
@@ -693,6 +752,15 @@
 
   <profiles>
     <profile>
+      <id>java8plus</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <properties>
+        <doclint.javadoc.qualifier>-Xdoclint:none</doclint.javadoc.qualifier>
+      </properties>
+    </profile>
+    <profile>
       <id>jgit-buildnumber</id>
       <activation>
         <file>
@@ -702,7 +770,7 @@
       <build>
         <plugins>
           <plugin>
-            <groupId>ru.concerteza.buildnumber</groupId>
+            <groupId>org.bidib.buildnumber</groupId>
             <artifactId>maven-jgit-buildnumber-plugin</artifactId>
             <version>${math.jgit.buildnumber.version}</version>
             <executions>
@@ -803,4 +871,3 @@
   </profiles>
 
 </project>
-
diff --git a/siteMods/pom.xml b/siteMods/pom.xml
index f9c3f80..696ebcb 100644
--- a/siteMods/pom.xml
+++ b/siteMods/pom.xml
@@ -29,12 +29,12 @@
   <url>http://commons.apache.org/math/</url>
   <issueManagement>
     <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/MATH</url>
+    <url>https://issues.apache.org/jira/browse/MATH</url>
   </issueManagement>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/math/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/math/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/commons/proper/math/trunk</url>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-math.git</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf?p=commons-math.git</url>
   </scm>
   <properties>
     <commons.componentid>math</commons.componentid>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 6901fef..a0bd27b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,7 +47,7 @@ If the output is not quite correct, check for invisible trailing spaces!
 
 <document>
   <properties>
-    <title>Commons Math Release Notes</title>
+    <title>Apache Commons Math Release Notes</title>
   </properties>
   <body>
     <release version="TBD" date="TBD" description="TBD">
@@ -55,6 +55,7 @@ If the output is not quite correct, check for invisible trailing spaces!
         Performance improvement for Array2DRowRealMatrix.getSubMatrix()
       </action>
     </release>
+
     <release version="3.6.1" date="2016-03-21" description="
 This is a minor bug fix release. It incorporates three bug fixes since version 3.6.
 
@@ -71,6 +72,7 @@ The minimum version of the Java platform required to compile and use
         Fix ODE integrators when multiple events are nearly simultaneous.
       </action>
     </release>
+
     <release version="3.6" date="2016-01-05" description="
 This is a minor release: It combines bug fixes and new features.
  Changes to existing features were made in a backwards-compatible
diff --git a/src/site/site.xml b/src/site/site.xml
index 1698ce9..f98e877 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,39 +25,39 @@
   <body>
     <menu name="Math">
       <item name="Overview" href="/index.html"/>
-      <item name="Downloads" href="http://commons.apache.org/math/download_math.cgi"/>
+      <item name="Downloads" href="https://commons.apache.org/math/download_math.cgi"/>
       <item name="Latest API docs (development)" href="apidocs/index.html"/>
       <item name="Javadoc (3.6.1 release)"
-            href="http://commons.apache.org/math/javadocs/api-3.6.1/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.6.1/index.html"/>
       <item name="Javadoc (3.6 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.6/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.6/index.html"/>
       <item name="Javadoc (3.5 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.5/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.5/index.html"/>
       <item name="Javadoc (3.4.1 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.4.1/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.4.1/index.html"/>
       <item name="Javadoc (3.4 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.4/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.4/index.html"/>
       <item name="Javadoc (3.3 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.3/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.3/index.html"/>
       <item name="Javadoc (3.2 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.2/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.2/index.html"/>
       <item name="Javadoc (3.1.1 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.1.1/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.1.1/index.html"/>
       <item name="Javadoc (3.1 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.1/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.1/index.html"/>
       <item name="Javadoc (3.0 release)"
-         href="http://commons.apache.org/math/javadocs/api-3.0/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-3.0/index.html"/>
       <item name="Javadoc (2.2 release)"
-         href="http://commons.apache.org/math/javadocs/api-2.2/index.html"/>
+         href="https://commons.apache.org/math/javadocs/api-2.2/index.html"/>
       <item name="Issue Tracking" href="/issue-tracking.html"/>
       <item name="Source Repository (current)" 
-         href="http://git-wip-us.apache.org/repos/asf/commons-math.git"/>
+         href="https://gitbox.apache.org/repos/asf/commons-math.git"/>
       <item name="Wiki"  
-            href="http://wiki.apache.org/commons/Math"/>
+            href="https://wiki.apache.org/commons/Math"/>
       <item name="Developers Guide" href="/developers.html"/>
       <item name="Proposal" href="/proposal.html"/>
     </menu>
-    
+
     <menu name="User Guide">
       <item name="Contents"                href="/userguide/index.html"/>
       <item name="Overview"                href="/userguide/overview.html"/>
@@ -81,10 +81,9 @@
       <item name="Machine Learning"        href="/userguide/ml.html"/>
       <item name="Exceptions"              href="/userguide/exceptions.html"/>
     </menu>
-    
+
     <head>
-      <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
-      </script>
+      <![CDATA[<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" />]]>
     </head>
 
   </body>
diff --git a/src/site/xdoc/developers.xml b/src/site/xdoc/developers.xml
index f280a6c..2679c16 100644
--- a/src/site/xdoc/developers.xml
+++ b/src/site/xdoc/developers.xml
@@ -48,11 +48,11 @@
         </li>
         <li>Download the Commons Math source code.  Follow the instructions
         under the heading "Repository Checkout" on the
-        <a href="https://git-wip-us.apache.org/">Git at the ASF page</a>.
+        <a href="https://gitbox.apache.org/">Git at the ASF page</a>.
         The git url for the current development sources of Commons Math
-        is <source>http://git-wip-us.apache.org/repos/asf/commons-math.git</source>
+        is <source>http://gitbox.apache.org/repos/asf/commons-math.git</source>
         for anonymous read-only access and
-        <source>https://apacheid@git-wip-us.apache.org/repos/asf/commons-math.git</source>
+        <source>https://apacheid@gitbox.apache.org/repos/asf/commons-math.git</source>
         (where apacheid should be replaced by each committer Apache ID) for committers
         read-write access.
         </li>
@@ -82,7 +82,7 @@
             <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">
             Setup an account on JIRA</a> and use it to submit patches and
             identify bugs. Read the 
-            <a href="http://issues.apache.org/bugwritinghelp.html">
+            <a href="https://issues.apache.org/bugwritinghelp.html">
             directions</a> for submitting bugs and search the database to
             determine if an issue exists or has already been dealt with.        
             <p>
diff --git a/src/site/xdoc/download_math.xml b/src/site/xdoc/download_math.xml
index b574311..f19ee29 100644
--- a/src/site/xdoc/download_math.xml
+++ b/src/site/xdoc/download_math.xml
@@ -26,15 +26,28 @@ limitations under the License.
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:download-page                      |
+ | 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.componentid     (required, alphabetic, lower case)      |
  |    - commons.release.version (required)                              |
- |    - commons.binary.suffix (optional)                                |
+ |    - 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>                   |
@@ -46,17 +59,17 @@ limitations under the License.
 <document>
   <properties>
     <title>Download Apache Commons Math</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
     <section name="Download Apache Commons Math">
     <subsection name="Using a Mirror">
       <p>
         We recommend you use a mirror to download our release
-        builds, but you <strong>must</strong> verify the integrity of
+        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 the mirrors.
+        be available from all the mirrors.
       </p>
 
       <p>
@@ -88,81 +101,86 @@ limitations under the License.
       </form>
 
       <p>
-        The <a href="http://www.apache.org/dist/commons/KEYS">KEYS</a>
-        link links to the code signing keys used to sign the product.
-        The <code>PGP</code> link downloads the OpenPGP compatible signature from our main site.
-        The <code>MD5</code> link downloads the checksum from the main site.
+        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 Math 3.6.1 (requires Java 1.5+)">
-      <subsection name="Binaries">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz">commons-math3-3.6.1-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.1-bin.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/math/binaries/commons-math3-3.6.1-bin.zip">commons-math3-3.6.1-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.1-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.1-bin.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Source">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/math/source/commons-math3-3.6.1-src.tar.gz">commons-math3-3.6.1-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math3-3.6.1-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math3-3.6.1-src.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/math/source/commons-math3-3.6.1-src.zip">commons-math3-3.6.1-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math3-3.6.1-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math3-3.6.1-src.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </subsection>
-    </section>
-    <section name="Apache Commons Math 2.2 (requires Java 1.5+)">
-      <subsection name="Binaries">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/math/binaries/commons-math-2.2.tar.gz">commons-math-2.2.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math-2.2.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math-2.2.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/math/binaries/commons-math-2.2.zip">commons-math-2.2.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math-2.2.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/binaries/commons-math-2.2.zip.asc">pgp</a></td>
-          </tr>
-        </table>
-      </subsection>
-      <subsection name="Source">
-        <table>
-          <tr>
-              <td><a href="[preferred]/commons/math/source/commons-math-2.2-src.tar.gz">commons-math-2.2-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math-2.2-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math-2.2-src.tar.gz.asc">pgp</a></td>
-          </tr>
-          <tr>
-              <td><a href="[preferred]/commons/math/source/commons-math-2.2-src.zip">commons-math-2.2-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math-2.2-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/math/source/commons-math-2.2-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/math/">browse download area</a></li>
-          <li><a href="http://archive.apache.org/dist/commons/math/">archives...</a></li>
-        </ul>
-    </section>
-  </body>
-</document>
+    <section name="Apache Commons Math 3.6.2-SNAPSHOT (requires Java 1.5+)">
+      <subsection name="Binaries">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/math/binaries/commons-math3-3.6.2-SNAPSHOT-bin.tar.gz">commons-math3-3.6.2-SNAPSHOT-bin.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.2-SNAPSHOT-bin.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.2-SNAPSHOT-bin.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/math/binaries/commons-math3-3.6.2-SNAPSHOT-bin.zip">commons-math3-3.6.2-SNAPSHOT-bin.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.2-SNAPSHOT-bin.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math3-3.6.2-SNAPSHOT-bin.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Source">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/math/source/commons-math3-3.6.2-SNAPSHOT-src.tar.gz">commons-math3-3.6.2-SNAPSHOT-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math3-3.6.2-SNAPSHOT-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math3-3.6.2-SNAPSHOT-src.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/math/source/commons-math3-3.6.2-SNAPSHOT-src.zip">commons-math3-3.6.2-SNAPSHOT-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math3-3.6.2-SNAPSHOT-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math3-3.6.2-SNAPSHOT-src.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+    </section>
+    <section name="Apache Commons Math 2.2 (requires Java 1.5+)">
+      <subsection name="Binaries">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/math/binaries/commons-math-2.2.tar.gz">commons-math-2.2.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math-2.2.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math-2.2.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/math/binaries/commons-math-2.2.zip">commons-math-2.2.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math-2.2.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/binaries/commons-math-2.2.zip.asc">pgp</a></td>
+          </tr>
+        </table>
+      </subsection>
+      <subsection name="Source">
+        <table>
+          <tr>
+              <td><a href="[preferred]/commons/math/source/commons-math-2.2-src.tar.gz">commons-math-2.2-src.tar.gz</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math-2.2-src.tar.gz.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math-2.2-src.tar.gz.asc">pgp</a></td>
+          </tr>
+          <tr>
+              <td><a href="[preferred]/commons/math/source/commons-math-2.2-src.zip">commons-math-2.2-src.zip</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math-2.2-src.zip.sha512">sha512</a></td>
+              <td><a href="https://www.apache.org/dist/commons/math/source/commons-math-2.2-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/math/">browse download area</a></li>
+          <li><a href="https://archive.apache.org/dist/commons/math/">archives...</a></li>
+        </ul>
+    </section>
+  </body>
+</document>
diff --git a/src/site/xdoc/issue-tracking.xml b/src/site/xdoc/issue-tracking.xml
index 237c4c3..40cc29c 100644
--- a/src/site/xdoc/issue-tracking.xml
+++ b/src/site/xdoc/issue-tracking.xml
@@ -26,7 +26,7 @@ limitations under the License.
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:jira-page                          |
+ | 1) Re-generate using: mvn commons-build:jira-page                    |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.jira.id  (required, alphabetic, upper case)             |
@@ -43,35 +43,35 @@ limitations under the License.
 -->
 <document>
   <properties>
-    <title>Commons Math Issue tracking</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <title>Apache Commons Math Issue tracking</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
 
-    <section name="Commons Math Issue tracking">
+    <section name="Apache Commons Math Issue tracking">
       <p>
-      Commons Math uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
-      See the <a href="http://issues.apache.org/jira/browse/MATH">Commons Math JIRA project page</a>.
+      Apache Commons Math uses <a href="https://issues.apache.org/jira/">ASF JIRA</a> for tracking issues.
+      See the <a href="https://issues.apache.org/jira/browse/MATH">Apache Commons Math JIRA project page</a>.
       </p>
 
       <p>
-      To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
+      To use JIRA you may need to <a href="https://issues.apache.org/jira/secure/Signup!default.jspa">create an account</a>
       (if you have previously created/updated Commons issues using Bugzilla an account will have been automatically
-      created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
+      created and you can use the <a href="https://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot Password</a>
       page to get a new password).
       </p>
 
       <p>
       If you would like to report a bug, or raise an enhancement request with
-      Commons Math please do the following:
+      Apache Commons Math please do the following:
       <ol>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">Search existing open bugs</a>.
             If you find your issue listed then please add a comment with your details.</li>
         <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
             You may find your issue or idea has already been discussed.</li>
         <li>Decide if your issue is a bug or an enhancement.</li>
-        <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310485&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
-            or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310485&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
+        <li>Submit either a <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310485&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug report</a>
+            or <a href="https://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310485&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement request</a>.</li>
       </ol>
       </p>
 
@@ -80,7 +80,7 @@ limitations under the License.
       <ul>
         <li>the more information you provide, the better we can help you</li>
         <li>test cases are vital, particularly for any proposed enhancements</li>
-        <li>the developers of Commons Math are all unpaid volunteers</li>
+        <li>the developers of Apache Commons Math are all unpaid volunteers</li>
       </ul>
       </p>
 
@@ -92,9 +92,9 @@ limitations under the License.
       <p>
       You may also find these links useful:
       <ul>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Commons Math bugs</a></li>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Commons Math bugs</a></li>
-        <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Commons Math bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=3&amp;status=4">All Open Apache Commons Math bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All Resolved Apache Commons Math bugs</a></li>
+        <li><a href="https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310485&amp;sorter/field=issuekey&amp;sorter/order=DESC">All Apache Commons Math bugs</a></li>
       </ul>
       </p>
     </section>
diff --git a/src/site/xdoc/mail-lists.xml b/src/site/xdoc/mail-lists.xml
index d1f1de8..4c123a7 100644
--- a/src/site/xdoc/mail-lists.xml
+++ b/src/site/xdoc/mail-lists.xml
@@ -26,7 +26,7 @@ limitations under the License.
  | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
  +======================================================================+
  |                                                                      |
- | 1) Re-generate using: mvn commons:mail-page                          |
+ | 1) Re-generate using: mvn commons-build:mail-page                    |
  |                                                                      |
  | 2) Set the following properties in the component's pom:              |
  |    - commons.componentid (required, alphabetic, lower case)          |
@@ -41,14 +41,14 @@ limitations under the License.
 -->
 <document>
   <properties>
-    <title>Commons Math Mailing Lists</title>
-    <author email="dev@commons.apache.org">Commons Documentation Team</author>
+    <title>Apache Commons Math Mailing Lists</title>
+    <author email="dev@commons.apache.org">Apache Commons Documentation Team</author>
   </properties>
   <body>
 
     <section name="Overview">
       <p>
-        <a href="index.html">Commons Math</a> shares mailing lists with all the other 
+        <a href="index.html">Apache Commons Math</a> shares mailing lists with all the other
         <a href="http://commons.apache.org/components.html">Commons Components</a>.
         To make it easier for people to only read messages related to components they are interested in,
         the convention in Commons is to prefix the subject line of messages with the component's name,
@@ -58,24 +58,27 @@ limitations under the License.
         </ul>
       </p>
       <p>
-        Questions related to the usage of Commons Math should be posted to the
+        Questions related to the usage of Apache Commons Math should be posted to the
         <a href="http://mail-archives.apache.org/mod_mbox/commons-user/">User List</a>.
         <br />
         The <a href="http://mail-archives.apache.org/mod_mbox/commons-dev/">Developer List</a>
-        is for questions and discussion related to the development of Commons Math.
+        is for questions and discussion related to the development of Apache Commons Math.
         <br />
         Please do not cross-post; developers are also subscribed to the user list.
+        <br />
+        You must be subscribed to post to the mailing lists.  Follow the Subscribe links below
+        to subscribe.
       </p>
       <p>
         <strong>Note:</strong> please don't send patches or attachments to any of the mailing lists.
-        Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system. 
-        Otherwise, please upload the file to a public server and include the URL in the mail. 
+        Patches are best handled via the <a href="issue-tracking.html">Issue Tracking</a> system.
+        Otherwise, please upload the file to a public server and include the URL in the mail.
       </p>
     </section>
 
-    <section name="Commons Math Mailing Lists">
+    <section name="Apache Commons Math Mailing Lists">
       <p>
-        <strong>Please prefix the subject line of any messages for <a href="index.html">Commons Math</a>
+        <strong>Please prefix the subject line of any messages for <a href="index.html">Apache Commons Math</a>
         with <i>[math]</i></strong> - <i>thanks!</i>
         <br />
         <br />
@@ -96,7 +99,7 @@ limitations under the License.
           <td>
             <strong>Commons User List</strong>
             <br /><br />
-            Questions on using Commons Math.
+            Questions on using Apache Commons Math.
             <br /><br />
           </td>
           <td><a href="mailto:user-subscribe@commons.apache.org">Subscribe</a></td>
@@ -114,7 +117,7 @@ limitations under the License.
           <td>
             <strong>Commons Developer List</strong>
             <br /><br />
-            Discussion of development of Commons Math.
+            Discussion of development of Apache Commons Math.
             <br /><br />
           </td>
           <td><a href="mailto:dev-subscribe@commons.apache.org">Subscribe</a></td>
@@ -185,10 +188,10 @@ limitations under the License.
             General announcements of Apache project releases.
             <br /><br />
           </td>
-          <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td> 
-          <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td> 
+          <td><a class="externalLink" href="mailto:announce-subscribe@apache.org">Subscribe</a></td>
+          <td><a class="externalLink" href="mailto:announce-unsubscribe@apache.org">Unsubscribe</a></td>
           <td><i>read only</i></td>
-          <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td> 
+          <td><a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/www-announce/">mail-archives.apache.org</a></td>
           <td><a class="externalLink" href="http://markmail.org/list/org.apache.announce/">markmail.org</a><br />
               <a class="externalLink" href="http://old.nabble.com/Apache-News-and-Announce-f109.html">old.nabble.com</a><br />
               <a class="externalLink" href="http://www.mail-archive.com/announce@apache.org/">www.mail-archive.com</a><br />
diff --git a/src/test/java/org/apache/commons/math3/special/BesselJTest.java b/src/test/java/org/apache/commons/math3/special/BesselJTest.java
index 83ec982..3f79a99 100644
--- a/src/test/java/org/apache/commons/math3/special/BesselJTest.java
+++ b/src/test/java/org/apache/commons/math3/special/BesselJTest.java
@@ -21,7 +21,6 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * @version $Id$
  */
 public class BesselJTest {
 
diff --git a/src/userguide/pom.xml b/src/userguide/pom.xml
index 1c5ee06..af5320c 100644
--- a/src/userguide/pom.xml
+++ b/src/userguide/pom.xml
@@ -29,40 +29,52 @@
   <url>http://commons.apache.org/math/</url>
   <issueManagement>
     <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/MATH</url>
+    <url>https://issues.apache.org/jira/browse/MATH</url>
   </issueManagement>
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/math/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/math/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/commons/proper/math/trunk</url>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-math.git</developerConnection>
+    <url>https://gitbox.apache.org/repos/asf?p=commons-math.git</url>
   </scm>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
   </properties> 
 
   <build>
     <sourceDirectory>java</sourceDirectory>
-    
+
     <plugins>
+
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>${mainclass}</mainClass>
+            </manifest>
+          </archive>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+          <finalName>${jarbasename}</finalName>
+          <appendAssemblyId>false</appendAssemblyId>
+        </configuration>
         <executions>
           <execution>
-            <phase>package</phase>
+            <id>make-assembly</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase> <!-- bind to the packaging phase -->
             <goals>
-              <goal>shade</goal>
+              <goal>single</goal>
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <finalName>${artifactId}-uber-${version}</finalName>
-        </configuration>
       </plugin>
-    </plugins>
+
+   </plugins>
+
   </build>
   <reporting>
   </reporting>
@@ -87,7 +99,7 @@
           <groupId>org.piccolo2d</groupId>
           <artifactId>piccolo2d-extras</artifactId>
           <version>3.0</version>
-      </dependency>      
+      </dependency>
       <dependency>
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-lang3</artifactId>