Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-release-plugin into 1.3
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index dd40e95..0957286 100755
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,10 +1,10 @@
Apache Commons Release Plugin
- Version 1.2
+ Version 1.3
Release Notes
INTRODUCTION
============
-This document contains the release notes for the 1.2 version of Apache commons-release-plgin.
+This document contains the release notes for the 1.3 version of Apache commons-release-plgin.
The commons-release-plugin is meant to be a mechanism for automating The Apache Commons Project's
release process.
@@ -15,6 +15,25 @@
Changes in this version include:
+
+NEW FEATURES
+============
+o COMMONSSITE-112: Add a vote.txt file.
+o COMMONSSITE-108: Adding README.html and HEADER.html to staged release
+
+
+CHANGES
+=======
+o COMMONSSITE-113: Put unpacked site in scm dev dist directory for navigating purposes.
+o Update platform requirement from Java 7 to Java 8.
+
+
+=============================================================================
+
+ Apache Commons Release Plugin
+ Version 1.2
+ Release Notes
+
FIXED BUGS
==========
@@ -25,7 +44,7 @@
=============================================================================
Apache Commons Release Plugin
- Version 1.0
+ Version 1.1
Release Notes
NEW FEATURES
diff --git a/pom.xml b/pom.xml
index 6c5c7f2..69d3733 100755
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
</parent>
<artifactId>commons-release-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
<name>Apache Commons Release Plugin</name>
<description>
@@ -108,6 +108,9 @@
<project.build.sourceEncoding>${commons.encoding}</project.build.sourceEncoding>
<!-- This is used by reporting plugins -->
<project.reporting.outputEncoding>${commons.encoding}</project.reporting.outputEncoding>
+
+ <!-- Including commons release plugin older version -->
+ <commons.release.isDistModule>true</commons.release.isDistModule>
</properties>
<dependencies>
@@ -428,7 +431,7 @@
<plugin>
<groupId>org.apache.commons</groupId>
<artifactId>commons-release-plugin</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
<configuration>
<distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/commons-release-plugin
</distSvnStagingUrl>
diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
index 7829073..6d21497 100755
--- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
+++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
@@ -193,7 +193,7 @@
getLog().info("Checking out dist from: " + distSvnStagingUrl);
provider.checkOut(repository, scmFileSet);
File copiedReleaseNotes = copyReleaseNotesToWorkingDirectory();
- List<File> filesToCommit = copyDistributionsIntoScmDirectoryStructureAndAddToSvn(copiedReleaseNotes,
+ copyDistributionsIntoScmDirectoryStructureAndAddToSvn(copiedReleaseNotes,
provider, repository);
List<File> filesToAdd = new ArrayList<>();
listNotHiddenFilesAndDirectories(distCheckoutDirectory, filesToAdd);
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-1.3.txt b/src/site/resources/release-notes/RELEASE-NOTES-1.3.txt
new file mode 100755
index 0000000..0957286
--- /dev/null
+++ b/src/site/resources/release-notes/RELEASE-NOTES-1.3.txt
@@ -0,0 +1,88 @@
+ Apache Commons Release Plugin
+ Version 1.3
+ Release Notes
+
+INTRODUCTION
+============
+This document contains the release notes for the 1.3 version of Apache commons-release-plgin.
+The commons-release-plugin is meant to be a mechanism for automating The Apache Commons Project's
+release process.
+
+The Apache Commons Release Plugin is a collection of Java based Maven mojos for Apache Commons
+Release process. These mojos are intended to be used as a collection of steps to be strung
+together for the purpose of removing the manual steps required to produce an Apache Commons Release.
+
+
+Changes in this version include:
+
+
+NEW FEATURES
+============
+o COMMONSSITE-112: Add a vote.txt file.
+o COMMONSSITE-108: Adding README.html and HEADER.html to staged release
+
+
+CHANGES
+=======
+o COMMONSSITE-113: Put unpacked site in scm dev dist directory for navigating purposes.
+o Update platform requirement from Java 7 to Java 8.
+
+
+=============================================================================
+
+ Apache Commons Release Plugin
+ Version 1.2
+ Release Notes
+
+FIXED BUGS
+==========
+
+o COMMONSSITE-107: Adding ./target/commons-release-plugin/scm/RELEASE-NOTES.txt
+ to svn as opposed to ./RELEASE-NOTES.txt
+
+
+=============================================================================
+
+ Apache Commons Release Plugin
+ Version 1.1
+ Release Notes
+
+NEW FEATURES
+============
+
+o COMMONSSITE-98: Making the project more multi-module compatible
+
+FIXED BUGS
+==========
+
+o COMMONSSITE-104: Sha1 signature files now reflect actual signatures.
+o COMMONSSITE-102: Commons Release Plugin doesn't work with Commons Release Plugin
+o COMMONSSITE-101: Make -Dcommons.release.dryRun=true our commit toggle
+
+
+
+=============================================================================
+
+ Apache Commons Release Plugin
+ Version 1.0
+ Release Notes
+
+NEW FEATURES
+============
+
+o COMMONSSITE-96: Create commons-release-component project skeleton.
+o COMMONSSITE-99: Prepare Standard Build integrations, travis, jacoco, checkstyle, etc.
+o COMMONSSITE-97: Documentation for commons-release-plugin.
+
+
+Historical list of changes: http://commons.apache.org/release-plugin/changes-report.html
+
+For complete information on the Apache commons-release-plugin, including instructions on how
+to submit bug reports, patches, or suggestions for improvement, see the Apache commons-release-plugin's
+website:
+
+http://commons.apache.org/release-plugin/
+
+Have fun!
+-Apache Commons Release Plugin team
+
diff --git a/src/site/xdoc/download_commons-release-plugin.xml b/src/site/xdoc/download_commons-release-plugin.xml
index 26bd237..5eead71 100755
--- a/src/site/xdoc/download_commons-release-plugin.xml
+++ b/src/site/xdoc/download_commons-release-plugin.xml
@@ -102,7 +102,7 @@
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>SHA1</code> hash (<code>*.sha1</code> checksum 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>
@@ -111,32 +111,32 @@
</p>
</subsection>
</section>
- <section name="Apache Commons Release Plugin 1.1 ">
+ <section name="Apache Commons Release Plugin 1.3 ">
<subsection name="Binaries">
<table>
<tr>
- <td><a href="[preferred]/commons/commons-release-plugin/binaries/commons-release-plugin-1.1-bin.tar.gz">commons-release-plugin-1.1-bin.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.1-bin.tar.gz.sha1">sha1</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.1-bin.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/commons-release-plugin/binaries/commons-release-plugin-1.3-bin.tar.gz">commons-release-plugin-1.3-bin.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.3-bin.tar.gz.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.3-bin.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/commons-release-plugin/binaries/commons-release-plugin-1.1-bin.zip">commons-release-plugin-1.1-bin.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.1-bin.zip.sha1">sha1</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.1-bin.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/commons-release-plugin/binaries/commons-release-plugin-1.3-bin.zip">commons-release-plugin-1.3-bin.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.3-bin.zip.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/binaries/commons-release-plugin-1.3-bin.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
<subsection name="Source">
<table>
<tr>
- <td><a href="[preferred]/commons/commons-release-plugin/source/commons-release-plugin-1.1-src.tar.gz">commons-release-plugin-1.1-src.tar.gz</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.1-src.tar.gz.sha1">sha1</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.1-src.tar.gz.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/commons-release-plugin/source/commons-release-plugin-1.3-src.tar.gz">commons-release-plugin-1.3-src.tar.gz</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.3-src.tar.gz.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.3-src.tar.gz.asc">pgp</a></td>
</tr>
<tr>
- <td><a href="[preferred]/commons/commons-release-plugin/source/commons-release-plugin-1.1-src.zip">commons-release-plugin-1.1-src.zip</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.1-src.zip.sha1">sha1</a></td>
- <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.1-src.zip.asc">pgp</a></td>
+ <td><a href="[preferred]/commons/commons-release-plugin/source/commons-release-plugin-1.3-src.zip">commons-release-plugin-1.3-src.zip</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.3-src.zip.sha256">sha256</a></td>
+ <td><a href="https://www.apache.org/dist/commons/commons-release-plugin/source/commons-release-plugin-1.3-src.zip.asc">pgp</a></td>
</tr>
</table>
</subsection>
diff --git a/src/site/xdoc/release-history.xml b/src/site/xdoc/release-history.xml
index 19f5331..fcba13a 100755
--- a/src/site/xdoc/release-history.xml
+++ b/src/site/xdoc/release-history.xml
@@ -25,6 +25,9 @@
<table>
<tr><th>Version</th><th>Release date</th><th>Required Java Version</th><th>Javadoc</th><th>Release notes</th></tr>
<tr>
+ <td>1.3</td><td>6-15-2018</td><td>8.0</td><td><a href="javadocs/api-1.3/index.html">api-1.3</a></td><td><a href="release-notes/RELEASE-NOTES-1.3.txt">release notes for 1.3</a></td>
+ </tr>
+ <tr>
<td>1.2</td><td>4-2-2018</td><td>7.0</td><td><a href="javadocs/api-1.2/index.html">api-1.2</a></td><td><a href="release-notes/RELEASE-NOTES-1.2.txt">release notes for 1.2</a></td>
</tr>
<tr>
