Added -Pguides when the given project version is the newest GA version

fixes gh-145
This commit is contained in:
Marcin Grzejszczak
2019-04-30 16:19:05 +04:00
parent f0918918f2
commit b1ae873800
14 changed files with 2987 additions and 27 deletions

View File

@@ -30,6 +30,7 @@ import org.springframework.cloud.release.internal.project.ProjectBuilder;
import org.springframework.cloud.release.internal.sagan.SaganClient;
import org.springframework.cloud.release.internal.sagan.SaganUpdater;
import org.springframework.cloud.release.internal.template.TemplateGenerator;
import org.springframework.cloud.release.internal.versions.VersionsFetcher;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
@@ -55,8 +56,8 @@ class ReleaserConfiguration {
}
@Bean
ProjectBuilder projectBuilder() {
return new ProjectBuilder(this.properties);
ProjectBuilder projectBuilder(VersionsFetcher versionsFetcher) {
return new ProjectBuilder(this.properties, versionsFetcher);
}
@Bean
@@ -64,6 +65,11 @@ class ReleaserConfiguration {
return new ProjectPomUpdater(this.properties);
}
@Bean
VersionsFetcher versionsFetcher(ProjectPomUpdater updater) {
return new VersionsFetcher(this.properties, updater);
}
@Bean
ProjectGitHandler projectGitHandler() {
return new ProjectGitHandler(this.properties);

View File

@@ -18,6 +18,7 @@ package org.springframework.cloud.release.internal.spring;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.util.ArrayList;
@@ -64,6 +65,7 @@ import org.springframework.cloud.release.internal.sagan.Release;
import org.springframework.cloud.release.internal.sagan.SaganClient;
import org.springframework.cloud.release.internal.sagan.SaganUpdater;
import org.springframework.cloud.release.internal.template.TemplateGenerator;
import org.springframework.cloud.release.internal.versions.VersionsFetcher;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.util.FileSystemUtils;
@@ -694,7 +696,8 @@ public class AcceptanceTests {
private Releaser defaultReleaser(String expectedVersion, String projectName,
ReleaserProperties properties) {
ProjectPomUpdater pomUpdater = new ProjectPomUpdater(properties);
ProjectBuilder projectBuilder = new ProjectBuilder(properties);
VersionsFetcher versionsFetcher = new VersionsFetcher(properties, pomUpdater);
ProjectBuilder projectBuilder = new ProjectBuilder(properties, versionsFetcher);
TestProjectGitHandler handler = new TestProjectGitHandler(properties,
expectedVersion, projectName);
TemplateGenerator templateGenerator = new TemplateGenerator(properties, handler);
@@ -724,7 +727,8 @@ public class AcceptanceTests {
private Releaser defaultMetaReleaser(ReleaserProperties properties) {
ProjectPomUpdater pomUpdater = new ProjectPomUpdater(properties);
ProjectBuilder projectBuilder = new ProjectBuilder(properties);
VersionsFetcher versionsFetcher = new VersionsFetcher(properties, pomUpdater);
ProjectBuilder projectBuilder = new ProjectBuilder(properties, versionsFetcher);
NonAssertingTestProjectGitHandler handler = new NonAssertingTestProjectGitHandler(
properties);
TemplateGenerator templateGenerator = Mockito
@@ -781,6 +785,9 @@ public class AcceptanceTests {
.setSpringProjectUrl(tmpFile("spring-cloud").getAbsolutePath() + "/");
releaserProperties.getGit().setReleaseTrainWikiUrl(
tmpFile("spring-cloud-wiki").getAbsolutePath() + "/");
URI initilizrUri = AcceptanceTests.class.getResource("/raw/initializr.yml")
.toURI();
releaserProperties.getVersions().setAllVersionsFileUrl(initilizrUri.toString());
this.releaserProperties = releaserProperties;
return releaserProperties;
}
@@ -810,6 +817,9 @@ public class AcceptanceTests {
releaserProperties.getGit().setReleaseTrainWikiUrl(
tmpFile("spring-cloud-wiki").getAbsolutePath() + "/");
releaserProperties.setFixedVersions(versions);
URI initilizrUri = AcceptanceTests.class.getResource("/raw/initializr.yml")
.toURI();
releaserProperties.getVersions().setAllVersionsFileUrl(initilizrUri.toString());
this.releaserProperties = releaserProperties;
return releaserProperties;
}
@@ -821,6 +831,9 @@ public class AcceptanceTests {
file("/projects/spring-cloud-release-with-snapshot/").toURI().toString());
releaserProperties.getGit().setDocumentationUrl(
file("/projects/spring-cloud-static/").toURI().toString());
URI initilizrUri = AcceptanceTests.class.getResource("/raw/initializr.yml")
.toURI();
releaserProperties.getVersions().setAllVersionsFileUrl(initilizrUri.toString());
this.releaserProperties = releaserProperties;
return releaserProperties;
}

File diff suppressed because it is too large Load Diff