SpringCloud/spring-cloud-release-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Not updating project page anymore since it has changed

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-07-23 12:14:23 +02:00
parent f3569efc7f
commit 1a0833b2d8
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
View File

@@ -314,6 +314,7 @@ public class Releaser {
releaseBranch);
}
@Deprecated
public void updateSpringProjectPage(Projects projects) {
if (this.documentationUpdater.updateProjectRepo(projects) != null) {
log.info("\nSuccessfully updated Spring project page");

2
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/docs/DocumentationUpdater.java
View File

@@ -72,7 +72,9 @@ public class DocumentationUpdater implements ReleaserPropertiesAware {
* @param projects list of projects to update versions for
* @return {@link File cloned temporary directory} - {@code null} if wrong version is
* used or the switch is turned off
* @deprecated - index.html doesn't look like this anymore
*/
@Deprecated
public File updateProjectRepo(Projects projects) {
return this.releaseTrainContentsUpdater.updateProjectRepo(projects);
}

2
spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/docs/ReleaseTrainContentsUpdater.java
View File

@@ -72,7 +72,9 @@ class ReleaseTrainContentsUpdater implements ReleaserPropertiesAware {
* @param projects projects to update project repo for
* @return {@link File cloned temporary directory} - {@code null} if wrong version is
* used or the switch is turned off
* @deprecated - index.html doesn't look like this anymore
*/
@Deprecated
File updateProjectRepo(Projects projects) {
if (!this.properties.getGit().isUpdateSpringProject()) {
log.info("Will not update the Spring Project cause "

5
spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Tasks.java
View File

@@ -80,6 +80,8 @@ final class Tasks {
args.releaser.updateDocumentationRepository(args.properties,
args.versionFromScRelease);
}, TaskType.POST_RELEASE);
@Deprecated
static Task UPDATE_SPRING_PROJECT_PAGE = task("updateSpringProjectPage", "up",
"UPDATE SPRING PROJECT PAGE", "Updating Spring Project page", args -> {
args.releaser.updateSpringProjectPage(args.projects);
@@ -112,8 +114,7 @@ final class Tasks {
static final List<Task> DEFAULT_TASKS_PER_RELEASE = Stream
.of(Tasks.RUN_UPDATED_SAMPLES, Tasks.CREATE_TEMPLATES, Tasks.UPDATE_GUIDES,
Tasks.UPDATE_RELEASE_TRAIN_DOCUMENTATION, Tasks.UPDATE_DOCUMENTATION,
Tasks.UPDATE_SPRING_PROJECT_PAGE, Tasks.UPDATE_RELEASE_TRAIN_WIKI,
Tasks.UPDATE_ALL_SAMPLES)
Tasks.UPDATE_RELEASE_TRAIN_WIKI, Tasks.UPDATE_ALL_SAMPLES)
.collect(Collectors.toList());
static final List<Task> NON_COMPOSITE_TASKS = new ArrayList<Task>() {

18
spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java
View File

@@ -252,18 +252,14 @@ public class AcceptanceTests {
releaser.release(new OptionsBuilder().metaRelease(true).options());
// consul, release, documentation, spring-cloud
then(this.nonAssertingGitHandler.clonedProjects).hasSize(4);
// consul, release, documentation
then(this.nonAssertingGitHandler.clonedProjects).hasSize(3);
// don't want to verify the docs
thenAllStepsWereExecutedForEachProject();
thenSaganWasCalled();
thenDocumentationWasUpdated();
BDDAssertions.then(clonedProject("spring-cloud-consul").tagList().call())
.extracting("name").contains("refs/tags/v1.3.5.RELEASE");
BDDAssertions
.then(gitProject(this.cloudProjectFolder).log().call().iterator().next()
.getShortMessage())
.contains("Updating project page to release train [Edgware.SR10]");
thenRunUpdatedTestsWereCalled();
thenUpdateReleaseTrainDocsWasCalled();
}
@@ -349,7 +345,7 @@ public class AcceptanceTests {
releaser.release(new OptionsBuilder().metaRelease(true).options());
then(temporaryDestination.list()).containsOnly("spring-cloud");
then(temporaryDestination.list()).isEmpty();
}
@Test
@@ -365,8 +361,8 @@ public class AcceptanceTests {
releaser.release(new OptionsBuilder().metaRelease(true)
.startFrom("spring-cloud-consul").options());
// consul, cloud
then(this.nonAssertingGitHandler.clonedProjects).hasSize(2);
// consul
then(this.nonAssertingGitHandler.clonedProjects).hasSize(1);
this.nonAssertingGitHandler.clonedProjects.stream()
.filter(file -> file.getName().equals("spring-cloud-consul"))
.forEach(project -> {
@@ -392,8 +388,8 @@ public class AcceptanceTests {
releaser.release(new OptionsBuilder().metaRelease(true)
.taskNames(Collections.singletonList("spring-cloud-consul")).options());
// consul, cloud
then(this.nonAssertingGitHandler.clonedProjects).hasSize(2);
// consul
then(this.nonAssertingGitHandler.clonedProjects).hasSize(1);
this.nonAssertingGitHandler.clonedProjects.stream()
.filter(file -> !file.getName().equals("spring-cloud"))
.forEach(project -> {