This is an automated email from the ASF dual-hosted git repository.
sebb 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 28aed28 Allow for old-style group ids in vote-txt
28aed28 is described below
commit 28aed286851907930088001d54546517ec4f9f93
Author: Sebb <[email protected]>
AuthorDate: Sat Aug 1 15:34:01 2020 +0100
Allow for old-style group ids in vote-txt
---
src/changes/changes.xml | 1 +
.../resources/commons-xdoc-templates/vote-txt-template.txt | 2 +-
src/main/scripts/generate-xdocs.build.xml | 13 +++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bfd1269..a7fea2c 100755
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -26,6 +26,7 @@
<body>
<release version="1.8" date="2020-MM-DD" description="Version 1.8">
+ <action type="update" dev="sebb">Allow for old-style group ids in
vote-txt.</action>
<action type="update" dev="sebb">Don't create hash for .asc
files.</action>
<action type="update" dev="ggregory">Replace FindBugs with
SpotBugs.</action>
<action type="update" dev="ggregory">Update Apache Commons Codec from
1.13 to 1.14.</action>
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 c608c54..0bb34e7 100755
--- a/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
+++ b/src/main/resources/commons-xdoc-templates/vote-txt-template.txt
@@ -29,7 +29,7 @@ You may checkout this tag using:
git clone https://gitbox.apache.org/repos/asf/commons-@[email protected] --branch
@TAGNAME@ @TAGNAME@
Maven artifacts are here:
-
https://repository.apache.org/content/repositories/orgapachecommons-@NEXUS_REPO_ID@/org/apache/commons/@ARTIFACTID@/@VERSION@/
+
https://repository.apache.org/content/repositories/orgapachecommons-@NEXUS_REPO_ID@/@GROUPPATH@/@ARTIFACTID@/@VERSION@/
These are the artifacts and their hashes:
diff --git a/src/main/scripts/generate-xdocs.build.xml
b/src/main/scripts/generate-xdocs.build.xml
index 371e32e..a66f84c 100755
--- a/src/main/scripts/generate-xdocs.build.xml
+++ b/src/main/scripts/generate-xdocs.build.xml
@@ -32,6 +32,17 @@
<property name="git.tag.name"
value="commons-${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";
/>
+ <!-- Convert groupId to path name -->
+ <loadresource property="tmp.groupPath">
+ <propertyresource name="project.groupId"/>
+ <filterchain>
+ <tokenfilter>
+ <filetokenizer/>
+ <replacestring from="." to="/"/>
+ </tokenfilter>
+ </filterchain>
+ </loadresource>
+
<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}'" />
@@ -42,6 +53,7 @@
<echo level="${level}" message="project.name :
${project.name}" />
<echo level="${level}" message="project.artifactId :
${project.artifactId}" />
<echo level="${level}" message="project.groupId :
${project.groupId}" />
+ <echo level="${level}" message="tmp.groupPath :
${tmp.groupPath}" />
<echo level="${level}" message="commons.jira.id :
${commons.jira.id}" />
<echo level="${level}" message="commons.release.version :
${commons.release.version}" />
<echo level="${level}" message="commons.rc.version :
${commons.rc.version}" />
@@ -96,6 +108,7 @@
<filter token="ARTIFACTID" value="${project.artifactId}"/>
<filter token="ARTIFACTCOREID" value="${tmp.artifactId}"/>
<filter token="GROUPID" value="${project.groupId}"/>
+ <filter token="GROUPPATH" value="${tmp.groupPath}"/>
<filter token="JIRA_ID" value="${commons.jira.id}"/>
<filter token="VERSION"
value="${commons.release.version}"/>
<filter token="RC" value="${commons.rc.version}"/>
