Repository: commons-release-plugin Updated Branches: refs/heads/master 5db46c8c7 -> 9239581b4
Write contents of sha1.properties file in the VOTE.txt file. 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/9239581b Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/9239581b Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/9239581b Branch: refs/heads/master Commit: 9239581b4042c999d565ecdd88109f9f49b45a17 Parents: 5db46c8 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Wed May 16 15:31:01 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Wed May 16 15:31:01 2018 -0600 ---------------------------------------------------------------------- .../vote-txt-template.txt | 26 +------------------- src/main/scripts/generate-xdocs.build.xml | 4 +++ 2 files changed, 5 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/9239581b/src/main/resources/commons-xdoc-templates/vote-txt-template.txt ---------------------------------------------------------------------- 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 e09f9b3..5e94f80 100644 --- a/src/main/resources/commons-xdoc-templates/vote-txt-template.txt +++ b/src/main/resources/commons-xdoc-templates/vote-txt-template.txt @@ -35,31 +35,7 @@ Maven artifacts are here: These are the Maven artifacts and their hashes in Nexus: -*** -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@.jar.asc -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@VERSION@.jar -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-tests.jar.asc -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-tests.jar -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@VERSION@.pom -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-test-sources.jar -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-sources.jar.asc -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-sources.jar -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-javadoc.jar.asc -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-test-sources.jar.asc -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@-javadoc.jar -(SHA1: ***DEADBEEF***) -/org/apache/commons/@ARTIFACTID@/@VERSION@/@ARTIFACTID@-@vers...@.pom.asc -(SHA1: ***DEADBEEF***) +@SHA1LIST@ (no need for .asc hashes!) http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/9239581b/src/main/scripts/generate-xdocs.build.xml ---------------------------------------------------------------------- diff --git a/src/main/scripts/generate-xdocs.build.xml b/src/main/scripts/generate-xdocs.build.xml index 1424292..a8e5b1d 100644 --- a/src/main/scripts/generate-xdocs.build.xml +++ b/src/main/scripts/generate-xdocs.build.xml @@ -47,6 +47,9 @@ <!-- Create a temporary directory to load the template files into --> <mkdir dir="${commonsMojoTempDir}"/> + <!-- Load SHA1 file created by the deploy goal --> + <loadfile property="commons.sha1list" srcFile="target/commons-release-plugin/sha1.properties"/> + <!-- Load the vote-txt template from mojo resources to temp directory --> <loadresource property="vote-txt"> <javaresource name="${commonsMojoXdocDir}/vote-txt-template.txt"/> @@ -85,6 +88,7 @@ <filter token="RMNAME" value="${commons.releaseManagerName}"/> <filter token="RMKEY" value="${commons.releaseManagerKey}"/> <filter token="RCREV" value="${svn.rc.revision}"/> + <filter token="SHA1LIST" value="${commons.sha1list}"/> </filterset> </copy>