Repository: commons-release-plugin Updated Branches: refs/heads/master 78348557a -> 657cacccb
[COMMONSSITE-112][release-plugin] should create a VOTE.txt file. Don't need componentrootid, it's the same as componentid. 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/657caccc Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/657caccc Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/657caccc Branch: refs/heads/master Commit: 657cacccb58ce0aac97f3ab022b8e21450989a55 Parents: 7834855 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Mon May 14 17:19:10 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Mon May 14 17:19:10 2018 -0600 ---------------------------------------------------------------------- .../commons-xdoc-templates/vote-txt-template.txt | 14 +++++++------- src/main/scripts/generate-xdocs.build.xml | 4 +--- src/main/scripts/generate-xdocs.mojos.xml | 9 --------- 3 files changed, 8 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/657caccc/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 5bec19c..e09f9b3 100644 --- a/src/main/resources/commons-xdoc-templates/vote-txt-template.txt +++ b/src/main/resources/commons-xdoc-templates/vote-txt-template.txt @@ -21,10 +21,10 @@ Subject: [VOTE] Release @NAME@ @VERSION@ based on @RC@ We have fixed quite a few bugs and added some significant enhancements since @NAME@ @BC@ was released, so I would like to release @NAME@ @VERSION@. @NAME@ @VERSION@ @RC@ is available for review here: - https://dist.apache.org/repos/dist/dev/commons/@ROOTID@/@ARTIFACTID@-@VERSION@-@RC@ (svn revision @RCREV@) + https://dist.apache.org/repos/dist/dev/commons/@ID@/@ARTIFACTID@-@VERSION@-@RC@ (svn revision @RCREV@) The Subversion tag for this RC is here: - http://svn.apache.org/repos/asf/commons/proper/@ROOTID@/tags/@ARTIFACTID@-@VERSION@-@RC@/ (svn revision XYZ2) + http://svn.apache.org/repos/asf/commons/proper/@ID@/tags/@ARTIFACTID@-@VERSION@-@RC@/ (svn revision XYZ2) N.B. the SVN revision is required because SVN tags are not immutable. ***OR*** The Git tag for this RC is here: @@ -69,15 +69,15 @@ Use the output from "mvn -version" for each combination you tested. *** Details of changes since @BC@ are in the release notes: - https://dist.apache.org/repos/dist/dev/commons/@ROOTID@/@VERSION@-@RC@/RELEASE-NOTES.txt - https://dist.apache.org/repos/dist/dev/commons/@ROOTID@/@VERSION@-@RC@/site/changes-report.html + https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/RELEASE-NOTES.txt + https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/site/changes-report.html Site: - https://dist.apache.org/repos/dist/dev/commons/@ROOTID@/@VERSION@-@RC@/site + https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/site (note some *relative* links are broken and the @VERSION@ directories are not yet created - these will be OK once the site is deployed.) CLIRR OR JaCoCo Report (compared to @BC@): - https://dist.apache.org/repos/dist/dev/commons/@ROOTID@/@VERSION@-@RC@/site/clirr-report.html + https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/site/clirr-report.html *** Note that Clirr reports several errors. @@ -90,7 +90,7 @@ CLIRR OR JaCoCo Report (compared to @BC@): *** RAT Report: - https://dist.apache.org/repos/dist/dev/commons/@ROOTID@/@VERSION@-@RC@/site/rat-report.html + https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/site/rat-report.html KEYS: https://www.apache.org/dist/commons/KEYS http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/657caccc/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 3e0d1f9..1424292 100644 --- a/src/main/scripts/generate-xdocs.build.xml +++ b/src/main/scripts/generate-xdocs.build.xml @@ -37,7 +37,6 @@ <echo level="${level}" message="commons.release.version : ${commons.release.version}" /> <echo level="${level}" message="commons.rc.version : ${commons.rc.version}" /> <echo level="${level}" message="commons.bc.version : ${commons.bc.version}" /> - <echo level="${level}" message="commons.componentrootid : ${commons.componentrootid}" /> <echo level="${level}" message="commons.componentid : ${commons.componentid}" /> <echo level="${level}" message="commons.releaseManagerName : ${commons.releaseManagerName}" /> <echo level="${level}" message="commons.releaseManagerKey : ${commons.releaseManagerKey}" /> @@ -66,7 +65,7 @@ </loadresource> <exec executable="svn" outputproperty="svn.rc.revision"> - <arg line="info https://dist.apache.org/repos/dist/dev/commons/${commons.componentrootid}/${commons.release.version}-${commons.rc.version} --show-item revision" /> + <arg line="info https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}/${commons.release.version}-${commons.rc.version} --show-item revision" /> </exec> <echo level="${level}" message="svn.rc.revision : ${svn.rc.revision}" /> @@ -83,7 +82,6 @@ <filter token="BC" value="${commons.bc.version}"/> <filter token="DESCRIPTION" value="${project.description}"/> <filter token="ID" value="${commons.componentid}"/> - <filter token="ROOTID" value="${commons.componentrootid}"/> <filter token="RMNAME" value="${commons.releaseManagerName}"/> <filter token="RMKEY" value="${commons.releaseManagerKey}"/> <filter token="RCREV" value="${svn.rc.revision}"/> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/657caccc/src/main/scripts/generate-xdocs.mojos.xml ---------------------------------------------------------------------- diff --git a/src/main/scripts/generate-xdocs.mojos.xml b/src/main/scripts/generate-xdocs.mojos.xml index ec9f436..2f7b198 100644 --- a/src/main/scripts/generate-xdocs.mojos.xml +++ b/src/main/scripts/generate-xdocs.mojos.xml @@ -67,15 +67,6 @@ <description>The external JIRA id for the project (alphabetic, upper case.)</description> </parameter> <parameter> - <name>commons.componentrootid</name> - <property>commons.componentrootid</property> - <required>true</required> - <readonly>true</readonly> - <defaultValue>${commons.componentrootid}</defaultValue> - <type>java.lang.String</type> - <description>The commons component root id.</description> - </parameter> - <parameter> <name>commons.componentid</name> <property>commons.componentid</property> <required>true</required>
