diff --git a/release-tools/readme.md b/release-tools/readme.md index f30c467..0dd4537 100644 --- a/release-tools/readme.md +++ b/release-tools/readme.md @@ -46,8 +46,7 @@ Make sure that: $ release prepare $trainIteration $ release build $trainIteration $ release conclude $trainIteration -$ git push $trainIteration -$ git push $trainIteration --tags +$ github push $trainIteration # After GitHub issues migration: # github push $trainIteration $ git backport changelog $trainIteration --target $targets diff --git a/release-tools/src/main/java/org/springframework/data/release/cli/StaticResources.java b/release-tools/src/main/java/org/springframework/data/release/cli/StaticResources.java index cba299f..bd956b3 100644 --- a/release-tools/src/main/java/org/springframework/data/release/cli/StaticResources.java +++ b/release-tools/src/main/java/org/springframework/data/release/cli/StaticResources.java @@ -17,12 +17,16 @@ package org.springframework.data.release.cli; import lombok.RequiredArgsConstructor; +import org.springframework.data.release.git.GitProject; +import org.springframework.data.release.git.Tag; +import org.springframework.data.release.git.VersionTags; import org.springframework.data.release.model.ArtifactVersion; import org.springframework.data.release.model.ModuleIteration; import org.springframework.data.release.model.Project; /** * @author Oliver Gierke + * @author Mark Paluch */ @RequiredArgsConstructor public class StaticResources { @@ -31,12 +35,20 @@ public class StaticResources { private final String baseUrl; + private final String releaseUrl; + public StaticResources(ModuleIteration module) { Project project = module.getProject(); ArtifactVersion version = ArtifactVersion.of(module); this.baseUrl = String.format(URL_TEMPLATE, project.getName().toLowerCase(), version); + + GitProject gitProject = GitProject.of(project); + + Tag tag = VersionTags.empty(module.getProject()).createTag(module); + + this.releaseUrl = String.format("%s/releases/tag/%s", gitProject.getProjectUri(), tag.getName()); } public String getDocumentationUrl() { @@ -48,6 +60,6 @@ public class StaticResources { } public String getChangelogUrl() { - return baseUrl.concat("/changelog.txt"); + return releaseUrl; } }