You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/05/17 16:38:24 UTC
commons-release-plugin git commit: Refactor site URL.
Repository: commons-release-plugin
Updated Branches:
refs/heads/master 68d28229b -> 9a3c019c7
Refactor site URL.
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/9a3c019c
Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/9a3c019c
Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/9a3c019c
Branch: refs/heads/master
Commit: 9a3c019c7080a2e0a5db934b530b45c5ba08bdb3
Parents: 68d2822
Author: Gary Gregory <ga...@gmail.com>
Authored: Thu May 17 10:38:20 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Thu May 17 10:38:20 2018 -0600
----------------------------------------------------------------------
.../commons-xdoc-templates/vote-txt-template.txt | 13 ++++++++-----
src/main/scripts/generate-xdocs.build.xml | 3 +++
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/9a3c019c/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 d7cf266..b46ff1e 100644
--- a/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
+++ b/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
@@ -46,14 +46,17 @@ 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/@ID@/@VERSION@-@RC@/RELEASE-NOTES.txt
- https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/site/changes-report.html
+ @SITEURL@/changes-report.html
Site:
- https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/site
+ @SITEURL@
(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/@ID@/@VERSION@-@RC@/site/clirr-report.html
+CLIRR Report (compared to @BC@):
+ @SITEURL@/clirr-report.html
+
+JApiCmp Report (compared to @BC@):
+ @SITEURL@/japicmp.html
***
Note that Clirr reports several errors.
@@ -66,7 +69,7 @@ CLIRR OR JaCoCo Report (compared to @BC@):
***
RAT Report:
- https://dist.apache.org/repos/dist/dev/commons/@ID@/@VERSION@-@RC@/site/rat-report.html
+ @SITEURL@/rat-report.html
KEYS:
https://www.apache.org/dist/commons/KEYS
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/9a3c019c/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 64dd555..be32372 100644
--- a/src/main/scripts/generate-xdocs.build.xml
+++ b/src/main/scripts/generate-xdocs.build.xml
@@ -30,10 +30,12 @@
<property name="svn.dist.url" value="https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}/${commons.release.version}-${commons.rc.version}" />
<property name="git.tag.name" value="${commons.componentid}-${commons.release.version}-${commons.rc.version}" />
+ <property name="svn.site.url" value="https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}/${commons.release.version}-${commons.rc.version}/site" />
<echo level="${level}" message="-----[ commons-release:vote-txt - Expectations - START ]-----" />
<echo level="${level}" message="The SVN RC URL must be '${svn.dist.url}'" />
<echo level="${level}" message="The Git RC tag must be '${git.tag.name}'" />
+ <echo level="${level}" message="The SVN site URL must be '${svn.site.url}'" />
<echo level="${level}" message="-----[ commons-release:vote-txt - Expectations - END ]-----" />
<echo level="${level}" message="" />
<echo level="${level}" message="-----[ commons-release:vote-txt - Parameters - START ]-----" />
@@ -106,6 +108,7 @@
<filter token="DISTURL" value="${svn.dist.url}"/>
<filter token="TAGNAME" value="${git.tag.name}"/>
<filter token="TAGCOMMIT" value="${git.tag.commit}"/>
+ <filter token="SITEURL" value="${svn.site.url}"/>
</filterset>
</copy>