From 947ad0a2780cfafb066d86b3f401c839a46238f6 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 27 Oct 2017 12:05:03 -0400 Subject: [PATCH] temporarily remove sagan update --- .../springframework/cloud/release/internal/Releaser.java | 6 ++++-- .../cloud/release/internal/spring/AcceptanceTests.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java index 44a8607a..31a7f917 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java @@ -156,8 +156,10 @@ public class Releaser { public void updateSagan(File project, ProjectVersion releaseVersion) { String currentBranch = this.projectGitHandler.currentBranch(project); - ProjectVersion originalVersion = new ProjectVersion(project); + // TODO: restore sagan update + /*ProjectVersion originalVersion = new ProjectVersion(project); this.saganUpdater.updateSagan(currentBranch, originalVersion, releaseVersion); - log.info("\nSuccessfully updated Sagan for branch [{}]", currentBranch); + log.info("\nSuccessfully updated Sagan for branch [{}]", currentBranch);*/ + log.warn("\nSkipping Sagan update for branch [{}]", currentBranch); } } diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java index 847834ce..040bbb1e 100644 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java +++ b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/AcceptanceTests.java @@ -98,8 +98,8 @@ public class AcceptanceTests { .contains("Camden.SR5") .contains("- Spring Cloud Config `1.2.2.RELEASE` ([issues](http://foo.bar.com/1.2.2.RELEASE))") .contains("- Spring Cloud Aws `1.1.3.RELEASE` ([issues](http://foo.bar.com/1.1.3.RELEASE))"); - BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"), - BDDMockito.anyList()); + /*TODO: restore BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"), + BDDMockito.anyList());*/ } @Test @@ -137,8 +137,8 @@ public class AcceptanceTests { .contains("Dalston.RC1") .contains("- Spring Cloud Build `1.3.1.RELEASE` ([issues](http://foo.bar.com/1.3.1.RELEASE))") .contains("- Spring Cloud Bus `1.3.0.M1` ([issues](http://foo.bar.com/1.3.0.M1))"); - BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"), - BDDMockito.anyList()); + /*TODO: restore BDDMockito.then(this.saganClient).should().updateRelease(BDDMockito.eq("spring-cloud-consul"), + BDDMockito.anyList());*/ } @Test