You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ch...@apache.org on 2018/06/19 03:48:45 UTC
[1/8] commons-release-plugin git commit: Release prep,
RELEASE-NOTES.txt
Repository: commons-release-plugin
Updated Branches:
refs/heads/master e6b5cbcf5 -> b08def7cb
Release prep, RELEASE-NOTES.txt
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/6528ab86
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/6528ab86
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/6528ab86
Branch: refs/heads/master
Commit: 6528ab86e242798bb99c87081136833d552a0c4e
Parents: ab72bbd
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 09:31:43 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 09:31:43 2018 -0400
----------------------------------------------------------------------
RELEASE-NOTES.txt | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/6528ab86/RELEASE-NOTES.txt
----------------------------------------------------------------------
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 @@ together for the purpose of removing the manual steps required to produce an Apa
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 @@ o COMMONSSITE-107: Adding ./target/commons-release-plugin/scm/RELEASE-NOTES.txt
=============================================================================
Apache Commons Release Plugin
- Version 1.0
+ Version 1.1
Release Notes
NEW FEATURES
[2/8] commons-release-plugin git commit: Release prep, site,
pom version
Posted by ch...@apache.org.
Release prep, site, pom version
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/598aa430
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/598aa430
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/598aa430
Branch: refs/heads/master
Commit: 598aa430aa191b7f96935aba4f165a25966869ca
Parents: 6528ab8
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 09:38:59 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 09:38:59 2018 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../release-notes/RELEASE-NOTES-1.3.txt | 88 ++++++++++++++++++++
.../xdoc/download_commons-release-plugin.xml | 28 +++----
src/site/xdoc/release-history.xml | 3 +
4 files changed, 106 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/598aa430/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6c5c7f2..9aef126 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>
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/598aa430/src/site/resources/release-notes/RELEASE-NOTES-1.3.txt
----------------------------------------------------------------------
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
+
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/598aa430/src/site/xdoc/download_commons-release-plugin.xml
----------------------------------------------------------------------
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 @@ limitations under the License.
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 @@ limitations under the License.
</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>
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/598aa430/src/site/xdoc/release-history.xml
----------------------------------------------------------------------
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 @@ limitations under the License.
<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>
[4/8] commons-release-plugin git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/commons-release-plugin into 1.3
Posted by ch...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-release-plugin into 1.3
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/b1bc7a3e
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/b1bc7a3e
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/b1bc7a3e
Branch: refs/heads/master
Commit: b1bc7a3e99349d777e3f92e390e45f790a8baa20
Parents: 731a289 e6b5cbc
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 10:26:25 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 10:26:25 2018 -0400
----------------------------------------------------------------------
.../mojos/CommonsDistributionStagingMojo.java | 37 +++++++++-----------
1 file changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/b1bc7a3e/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
----------------------------------------------------------------------
[8/8] commons-release-plugin git commit: Merge tag
'commons-release-plugin-1.3'
Posted by ch...@apache.org.
Merge tag 'commons-release-plugin-1.3'
Promoting commons-release-plugin-1.3 RC1
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/b08def7c
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/b08def7c
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/b08def7c
Branch: refs/heads/master
Commit: b08def7cb3defbf7da4177195841f643feb9c957
Parents: ab72bbd 7fc141f
Author: Rob Tompkins <ch...@apache.org>
Authored: Mon Jun 18 23:48:37 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Mon Jun 18 23:48:37 2018 -0400
----------------------------------------------------------------------
RELEASE-NOTES.txt | 26 +++++-
pom.xml | 20 +++--
src/changes/changes.xml | 3 +-
.../CommonsDistributionDetachmentMojo.java | 51 +++++-------
.../mojos/CommonsDistributionStagingMojo.java | 19 +++--
.../release-notes/RELEASE-NOTES-1.3.txt | 88 ++++++++++++++++++++
.../xdoc/download_commons-release-plugin.xml | 28 +++----
src/site/xdoc/release-history.xml | 3 +
.../CommonsDistributionDetachmentMojoTest.java | 8 --
.../CommonsDistributionStagingMojoTest.java | 8 --
10 files changed, 175 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
[7/8] commons-release-plugin git commit: Remove site compression mojo
from staging
Posted by ch...@apache.org.
Remove site compression mojo from staging
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/7fc141fe
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/7fc141fe
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/7fc141fe
Branch: refs/heads/master
Commit: 7fc141fe3023098cb68d55b8b2b2a606fbe7dcac
Parents: dbc09b1
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 12:06:04 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 12:06:04 2018 -0400
----------------------------------------------------------------------
pom.xml | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/7fc141fe/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4390402..b8e8657 100755
--- a/pom.xml
+++ b/pom.xml
@@ -451,13 +451,6 @@
</goals>
</execution>
<execution>
- <id>compress-site</id>
- <phase>site</phase>
- <goals>
- <goal>compress-site</goal>
- </goals>
- </execution>
- <execution>
<id>stage-distributions</id>
<phase>deploy</phase>
<goals>
[6/8] commons-release-plugin git commit: Prepare pom for using
-Dversion of release plugin
Posted by ch...@apache.org.
Prepare pom for using -Dversion of release plugin
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/dbc09b14
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/dbc09b14
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/dbc09b14
Branch: refs/heads/master
Commit: dbc09b145cf8306ea14ee29dbf9790e3b2e25f83
Parents: d59a1c6
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 11:10:19 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 11:10:19 2018 -0400
----------------------------------------------------------------------
pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/dbc09b14/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 69d3733..4390402 100755
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,12 @@
<!-- Including commons release plugin older version -->
<commons.release.isDistModule>true</commons.release.isDistModule>
+ <commons.bc.version>1.2</commons.bc.version>
+ <commons.release.version>1.3</commons.release.version>
+ <commons.rc.version>RC1</commons.rc.version>
+ <commons.release.isDistModule>true</commons.release.isDistModule>
+ <commons.releaseManagerName>Rob Tompkins</commons.releaseManagerName>
+ <commons.releaseManagerKey>B6E73D84EA4FCC47166087253FAAD2CD5ECBB314</commons.releaseManagerKey>
</properties>
<dependencies>
@@ -431,7 +437,7 @@
<plugin>
<groupId>org.apache.commons</groupId>
<artifactId>commons-release-plugin</artifactId>
- <version>1.2</version>
+ <version>${commons.release-plugin.version}</version>
<configuration>
<distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/commons-release-plugin
</distSvnStagingUrl>
[3/8] commons-release-plugin git commit: (fix) findbugs, javadoc
Posted by ch...@apache.org.
(fix) findbugs, javadoc
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/731a2893
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/731a2893
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/731a2893
Branch: refs/heads/master
Commit: 731a2893803ab57f3eef2e5ac9e02fcd0aa8214d
Parents: 598aa43
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 10:17:52 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 10:17:52 2018 -0400
----------------------------------------------------------------------
pom.xml | 5 +++-
.../mojos/CommonsDistributionStagingMojo.java | 30 ++++++++++++--------
2 files changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/731a2893/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9aef126..69d3733 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/731a2893/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
----------------------------------------------------------------------
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 09d4def..d3e0034 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 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
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);
@@ -272,19 +272,25 @@ public class CommonsDistributionStagingMojo extends AbstractMojo {
* the directory structure of the distribution staging repository. Specifically:
* <ul>
* <li>root:</li>
- * <ul>
- * <li>site</li>
- * <li>site.zip</li>
- * <li>RELEASE-NOTES.txt</li>
- * <li>source:</li>
- * <ul>
- * <li>-src artifacts....</li>
- * </ul>
- * <li>binaries:</li>
+ * <li>
* <ul>
- * <li>-bin artifacts....</li>
+ * <li>site</li>
+ * <li>site.zip</li>
+ * <li>RELEASE-NOTES.txt</li>
+ * <li>source:</li>
+ * <li>
+ * <ul>
+ * <li>-src artifacts....</li>
+ * </ul>
+ * </li>
+ * <li>binaries:</li>
+ * <li>
+ * <ul>
+ * <li>-bin artifacts....</li>
+ * </ul>
+ * </li>
* </ul>
- * </ul>
+ * </li>
* </ul>
*
* @param copiedReleaseNotes is the RELEASE-NOTES.txt file that exists in the
[5/8] commons-release-plugin git commit: COMMONSSITE-117: remove md5
hashes from release artifacts
Posted by ch...@apache.org.
COMMONSSITE-117: remove md5 hashes from release artifacts
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/d59a1c6f
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/d59a1c6f
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/d59a1c6f
Branch: refs/heads/master
Commit: d59a1c6f6ec5fbe3fb8bb0bdc4d885512d07b51c
Parents: b1bc7a3
Author: Rob Tompkins <ch...@apache.org>
Authored: Fri Jun 15 10:49:51 2018 -0400
Committer: Rob Tompkins <ch...@apache.org>
Committed: Fri Jun 15 10:49:51 2018 -0400
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
src/changes/changes.xml | 3 +-
.../CommonsDistributionDetachmentMojo.java | 51 +++++++++-----------
.../CommonsDistributionDetachmentMojoTest.java | 8 ---
.../CommonsDistributionStagingMojoTest.java | 8 ---
5 files changed, 26 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d59a1c6f/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0957286..62d3e1f 100755
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -24,6 +24,7 @@ o COMMONSSITE-108: Adding README.html and HEADER.html to staged release
CHANGES
=======
+o COMMONSSITE-117: Remove md5 signatures from release artifacts.
o COMMONSSITE-113: Put unpacked site in scm dev dist directory for navigating purposes.
o Update platform requirement from Java 7 to Java 8.
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d59a1c6f/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e661348..435a427 100755
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,7 +25,8 @@
</properties>
<body>
- <release version="1.3" date="YYYY-MM-DD" description="TBD">
+ <release version="1.3" date="2018-06-15" description="Version 1.3">
+ <action issue="COMMONSSITE-117" type="update" dev="chtompki">Remove md5 signatures from release artifacts.</action>
<action issue="COMMONSSITE-113" type="update" dev="chtompki">Put unpacked site in scm dev dist directory for navigating purposes.</action>
<action issue="COMMONSSITE-112" type="add" dev="ggregory">Add a vote.txt file.</action>
<action issue="COMMONSSITE-108" type="add" dev="chtompki">Adding README.html and HEADER.html to staged release</action>
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d59a1c6f/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
index 9c95127..97a622e 100755
--- a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
+++ b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
@@ -159,14 +159,9 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo {
*/
private void putAttachedArtifactInSha1Map(Artifact artifact) throws MojoExecutionException {
try {
- StringBuffer artifactKey = new StringBuffer();
- artifactKey
- .append(artifact.getArtifactId()).append('-')
- .append(artifact.getVersion()).append('-')
- .append(artifact.getClassifier()).append('-')
- .append(artifact.getType());
+ String artifactKey = getArtifactKey(artifact);
try (FileInputStream fis = new FileInputStream(artifact.getFile())) {
- artifactSha1s.put(artifactKey.toString(), DigestUtils.sha1Hex(fis));
+ artifactSha1s.put(artifactKey, DigestUtils.sha1Hex(fis));
}
} catch (IOException e) {
throw new MojoExecutionException(
@@ -190,14 +185,9 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo {
*/
private void putAttachedArtifactInSha256Map(Artifact artifact) throws MojoExecutionException {
try {
- StringBuffer artifactKey = new StringBuffer();
- artifactKey
- .append(artifact.getArtifactId()).append('-')
- .append(artifact.getVersion()).append('-')
- .append(artifact.getClassifier()).append('-')
- .append(artifact.getType());
+ String artifactKey = getArtifactKey(artifact);
try (FileInputStream fis = new FileInputStream(artifact.getFile())) {
- artifactSha256s.put(artifactKey.toString(), DigestUtils.sha256Hex(fis));
+ artifactSha256s.put(artifactKey, DigestUtils.sha256Hex(fis));
}
} catch (IOException e) {
throw new MojoExecutionException(
@@ -277,22 +267,9 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo {
private void hashArtifacts() throws MojoExecutionException {
for (Artifact artifact : detachedArtifacts) {
if (!artifact.getFile().getName().contains("asc")) {
- StringBuffer artifactKey = new StringBuffer();
- artifactKey.append(artifact.getArtifactId()).append('-')
- .append(artifact.getVersion()).append('-')
- .append(artifact.getClassifier()).append('-')
- .append(artifact.getType());
+ String artifactKey = getArtifactKey(artifact);
try {
- // MD5
String digest;
- try (FileInputStream fis = new FileInputStream(artifact.getFile())) {
- digest = DigestUtils.md5Hex(fis);
- }
- getLog().info(artifact.getFile().getName() + " md5: " + digest);
- try (PrintWriter printWriter = new PrintWriter(
- getMd5FilePath(workingDirectory, artifact.getFile()))) {
- printWriter.println(digest);
- }
// SHA-1
digest = artifactSha1s.getProperty(artifactKey.toString());
getLog().info(artifact.getFile().getName() + " sha1: " + digest);
@@ -358,4 +335,22 @@ public class CommonsDistributionDetachmentMojo extends AbstractMojo {
buffer.append(".sha256");
return buffer.toString();
}
+
+ /**
+ * Generates the unique artifact key for storage in our sha1 map and sha256 map. For example,
+ * commons-test-1.4-src.tar.gz should have it's name as the key.
+ *
+ * @param artifact the {@link Artifact} that we wish to generate a key for.
+ * @return the generated key
+ */
+ private String getArtifactKey(Artifact artifact) {
+ StringBuffer artifactKey = new StringBuffer();
+ artifactKey.append(artifact.getArtifactId()).append('-')
+ .append(artifact.getVersion()).append('-');
+ if (artifact.hasClassifier()) {
+ artifactKey.append(artifact.getClassifier()).append('-');
+ }
+ artifactKey.append(artifact.getType());
+ return artifactKey.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d59a1c6f/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
index 39906b0..dda67ad 100755
--- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
+++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java
@@ -67,22 +67,18 @@ public class CommonsDistributionDetachmentMojoTest {
mojo.execute();
File detachedSrcTarGz = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.tar.gz");
File detachedSrcTarGzAsc = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.tar.gz.asc");
- File detachedSrcTarMd5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.tar.gz.md5");
File detachedSrcTarGzSha1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.tar.gz.sha1");
File detachedSrcTarGzSha256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.tar.gz.sha256");
File detachedSrcZip = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.zip");
File detachedSrcZipAsc = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.zip.asc");
- File detachedSrcZipMd5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.zip.md5");
File detachedSrcZipSha1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.zip.sha1");
File detachedSrcZipSha256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-src.zip.sha256");
File detachedBinTarGz = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.tar.gz");
File detachedBinTarGzAsc = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.tar.gz.asc");
- File detachedBinTarMd5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.tar.gz.md5");
File detachedBinTarGzSha1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.tar.gz.sha1");
File detachedBinTarGzSha256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.tar.gz.sha256");
File detachedBinZip = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.zip");
File detachedBinZipAsc = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.zip.asc");
- File detachedBinZipMd5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.zip.md5");
File detachedBinZipSha1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.zip.sha1");
File detachedBinZipSha256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4-bin.zip.sha256");
File notDetachedMockAttachedFile = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/commons-text-1.4.jar");
@@ -90,22 +86,18 @@ public class CommonsDistributionDetachmentMojoTest {
File sha256Properties = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/sha256.properties");
assertTrue(detachedSrcTarGz.exists());
assertTrue(detachedSrcTarGzAsc.exists());
- assertTrue(detachedSrcTarMd5.exists());
assertTrue(detachedSrcTarGzSha1.exists());
assertTrue(detachedSrcTarGzSha256.exists());
assertTrue(detachedSrcZip.exists());
assertTrue(detachedSrcZipAsc.exists());
- assertTrue(detachedSrcZipMd5.exists());
assertTrue(detachedSrcZipSha1.exists());
assertTrue(detachedSrcZipSha256.exists());
assertTrue(detachedBinTarGz.exists());
assertTrue(detachedBinTarGzAsc.exists());
- assertTrue(detachedBinTarMd5.exists());
assertTrue(detachedBinTarGzSha1.exists());
assertTrue(detachedBinTarGzSha256.exists());
assertTrue(detachedBinZip.exists());
assertTrue(detachedBinZipAsc.exists());
- assertTrue(detachedBinZipMd5.exists());
assertTrue(detachedBinZipSha1.exists());
assertTrue(detachedBinZipSha256.exists());
assertTrue(sha1Properties.exists());
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/d59a1c6f/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
index e5d4734..2e90d57 100755
--- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
+++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java
@@ -98,24 +98,20 @@ public class CommonsDistributionStagingMojoTest {
File binariesHeaderHtml = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/HEADER.html");
File binTar = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz");
File binTarASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.asc");
- File binTarMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.md5");
File binTarSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.sha1");
File binTarSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.tar.gz.sha256");
File binZip = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip");
File binZipASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.asc");
- File binZipMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.md5");
File binZipSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.sha1");
File binZipSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/commons-text-1.4-bin.zip.sha256");
File sourcesReadmeHtml = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/README.html");
File sourceHeaderHtml = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/binaries/HEADER.html");
File srcTar = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.tar.gz");
File srcTarASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.tar.gz.asc");
- File srcTarMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.tar.gz.md5");
File srcTarSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.tar.gz.sha1");
File srcTarSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.tar.gz.sha256");
File srcZip = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.zip");
File srcZipASC = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.zip.asc");
- File srcZipMD5 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.zip.md5");
File srcZipSHA1 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.zip.sha1");
File srcZipSHA256 = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/source/commons-text-1.4-src.zip.sha256");
File site = new File(COMMONS_RELEASE_PLUGIN_TEST_DIR_PATH + "/scm/1.0-SNAPSHOT-RC1/site");
@@ -130,24 +126,20 @@ public class CommonsDistributionStagingMojoTest {
assertTrue(binariesHeaderHtml.exists());
assertTrue(binTar.exists());
assertTrue(binTarASC.exists());
- assertTrue(binTarMD5.exists());
assertTrue(binTarSHA1.exists());
assertTrue(binTarSHA256.exists());
assertTrue(binZip.exists());
assertTrue(binZipASC.exists());
- assertTrue(binZipMD5.exists());
assertTrue(binZipSHA1.exists());
assertTrue(binZipSHA256.exists());
assertTrue(sourcesReadmeHtml.exists());
assertTrue(sourceHeaderHtml.exists());
assertTrue(srcTar.exists());
assertTrue(srcTarASC.exists());
- assertTrue(srcTarMD5.exists());
assertTrue(srcTarSHA1.exists());
assertTrue(srcTarSHA256.exists());
assertTrue(srcZip.exists());
assertTrue(srcZipASC.exists());
- assertTrue(srcZipMD5.exists());
assertTrue(srcZipSHA1.exists());
assertTrue(srcZipSHA256.exists());
assertTrue(site.exists());