From 78d645c4e427c4820b8b04d37faf99bcd9caeb8c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 9 Jan 2020 16:28:03 +0100 Subject: [PATCH] Parametrized org name --- .../reactor/src/main/resources/application.yml | 1 + .../src/main/resources/application.yml | 1 + .../src/main/resources/application.yml | 1 + .../java/releaser/internal/ReleaserProperties.java | 14 ++++++++++++++ .../releaser/internal/github/GithubMilestones.java | 2 +- 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/projects/reactor/src/main/resources/application.yml b/projects/reactor/src/main/resources/application.yml index 56cb4819..4eab6673 100644 --- a/projects/reactor/src/main/resources/application.yml +++ b/projects/reactor/src/main/resources/application.yml @@ -8,6 +8,7 @@ spring: FAIL_ON_UNKNOWN_PROPERTIES: true releaser: git: + org-name: spring-cloud release-train-bom-url: https://github.com/reactor/reactor fetch-versions-from-git: true meta-release: diff --git a/projects/spring-cloud-stream/src/main/resources/application.yml b/projects/spring-cloud-stream/src/main/resources/application.yml index 6d1c79ba..2fde2647 100644 --- a/projects/spring-cloud-stream/src/main/resources/application.yml +++ b/projects/spring-cloud-stream/src/main/resources/application.yml @@ -8,6 +8,7 @@ spring: FAIL_ON_UNKNOWN_PROPERTIES: true releaser: git: + org-name: spring-cloud release-train-bom-url: https://github.com/spring-cloud/spring-cloud-stream-starters documentation-url: https://github.com/spring-cloud/spring-cloud-static number-of-checked-milestones: 50 diff --git a/projects/spring-cloud/src/main/resources/application.yml b/projects/spring-cloud/src/main/resources/application.yml index 1f2b11d8..3d66c525 100644 --- a/projects/spring-cloud/src/main/resources/application.yml +++ b/projects/spring-cloud/src/main/resources/application.yml @@ -13,6 +13,7 @@ releaser: flow: default-enabled: true git: + org-name: spring-cloud release-train-bom-url: https://github.com/spring-cloud/spring-cloud-release documentation-url: https://github.com/spring-cloud/spring-cloud-static spring-project-url: https://github.com/spring-projects/spring-cloud diff --git a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java index cc917f38..635adb2e 100644 --- a/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java +++ b/releaser-core/src/main/java/releaser/internal/ReleaserProperties.java @@ -445,6 +445,12 @@ public class ReleaserProperties implements Serializable { */ private String documentationUrl; + /** + * URL to the release train project page repository. + */ + @NotBlank + private String orgName; + /** * URL to the release train project page repository. */ @@ -794,6 +800,14 @@ public class ReleaserProperties implements Serializable { this.updateGithubMilestones = updateGithubMilestones; } + public String getOrgName() { + return this.orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + @Override public String toString() { return "Git{" + "releaseTrainBomUrl='" + this.releaseTrainBomUrl + '\'' diff --git a/releaser-core/src/main/java/releaser/internal/github/GithubMilestones.java b/releaser-core/src/main/java/releaser/internal/github/GithubMilestones.java index 3f907472..d443eb20 100644 --- a/releaser-core/src/main/java/releaser/internal/github/GithubMilestones.java +++ b/releaser-core/src/main/java/releaser/internal/github/GithubMilestones.java @@ -184,7 +184,7 @@ class GithubMilestones { } String org() { - return "spring-cloud"; + return this.properties.getGit().getOrgName(); } private Map openMilestones() {