This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-release-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new e9fe7b1 VOTE.txt: Sort the file names being hashed
e9fe7b1 is described below
commit e9fe7b16dfc4f51250249deb949090c1829cff10
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sat Apr 6 11:32:46 2019 -0400
VOTE.txt: Sort the file names being hashed
---
pom.xml | 5 +++++
src/changes/changes.xml | 3 ++-
.../release/plugin/mojos/CommonsDistributionDetachmentMojo.java | 6 +++---
src/main/resources/commons-xdoc-templates/vote-txt-template.txt | 9 +++++++--
4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 763c3c0..5d20905 100755
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.3</version>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 08acd87..0d6f7c9 100755
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -27,7 +27,8 @@
<body>
<release version="1.7" date="YYYY-MM-DD" description="Version 1.7 - TBD">
<action type="update" dev="chtompki">checkstyle.version 8.10.1 ->
8.18</action>
- <action type="update" dev="ggregory">VOTE.txt: "Sample git clone command
should checkout in a folder named after the tag</action>
+ <action type="update" dev="ggregory">VOTE.txt: Sample git clone command
should checkout in a folder named after the tag</action>
+ <action type="update" dev="ggregory">VOTE.txt: Sort the file names being
hashed</action>
<action type="update" dev="ggregory">maven.dependency.version 3.5.3 ->
3.6.0</action>
<action type="update" dev="ggregory">org.apache.maven.scm 1.10.0 ->
1.11.2</action>
<action type="update" dev="ggregory">maven-pmd-plugin 3.9.0 ->
3.11.0</action>
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 4e8d5f2..285cb0a 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
@@ -25,10 +25,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import java.util.Properties;
import java.util.Set;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.collections4.properties.SortedProperties;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.release.plugin.SharedFunctions;
import org.apache.maven.artifact.Artifact;
@@ -77,11 +77,11 @@ public class CommonsDistributionDetachmentMojo extends
AbstractMojo {
private final List<Artifact> detachedArtifacts = new ArrayList<>();
/**
- * A {@link Properties} of {@link Artifact} → {@link String} containing
the sha256 signatures
+ * A {@link SortedProperties} of {@link Artifact} → {@link String}
containing the sha256 signatures
* for the individual artifacts, where the {@link Artifact} is represented
as:
* <code>groupId:artifactId:version:type=sha512</code>.
*/
- private final Properties artifactSha512s = new Properties();
+ private final SortedProperties artifactSha512s = new SortedProperties();
/**
* The maven project context injection so that we can get a hold of the
variables at hand.
diff --git a/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
b/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
index c23aaee..c7e254a 100755
--- a/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
+++ b/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
@@ -116,16 +116,21 @@ mvn apache-rat:check
mvn -V clean package
You can record the Maven and Java version produced by -V in your VOTE reply.
+To gather OS information from a command line:
+Windows: ver
+Linux: uname -a
4) Build the site for a single module project:
mvn site
Check the site reports in:
-target\site\index.html
+- Windows: target\site\index.html
+- Linux: target/site/index.html
4) Build the site for a multi-module project:
mvn site
mvn site:stage
Check the site reports in:
-target\site\index.html
+- Windows: target\site\index.html
+- Linux: target/site/index.html
