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 ff7dd500..337858b4 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 @@ -144,7 +144,7 @@ public class Releaser { if (email != null) { log.info("\nSuccessfully created email template at location [{}]", email); } else { - log.warn("\nFailed to create an email template"); + throw new MakeBuildUnstableException("Failed to create an email template"); } } @@ -157,7 +157,7 @@ public class Releaser { if (blog != null) { log.info("\nSuccessfully created blog template at location [{}]", blog); } else { - log.warn("\nFailed to create a blog template"); + throw new MakeBuildUnstableException("Failed to create a blog template"); } } @@ -168,7 +168,7 @@ public class Releaser { return; } this.projectGitHandler.createIssueInSpringGuides(projects, releaseVersion); - log.info("\nSuccessfully updated Spring Guides issues"); + throw new MakeBuildUnstableException("Successfully updated Spring Guides issues"); } public void createTweet(ProjectVersion releaseVersion, Projects projects) { @@ -180,7 +180,7 @@ public class Releaser { if (tweet != null) { log.info("\nSuccessfully created tweet template at location [{}]", tweet); } else { - log.warn("\nFailed to create a tweet template"); + throw new MakeBuildUnstableException("Failed to create a tweet template"); } } @@ -215,7 +215,7 @@ public class Releaser { if (this.documentationUpdater.updateProjectRepo(projects) != null) { log.info("\nSuccessfully updated Spring project page"); } else { - log.warn("\nFailed to update Spring Project page"); + throw new MakeBuildUnstableException("Failed to update Spring Project page"); } } diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/tech/MakeBuildUnstableException.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/tech/MakeBuildUnstableException.java index 19c0b1be..f0fa7abb 100644 --- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/tech/MakeBuildUnstableException.java +++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/tech/MakeBuildUnstableException.java @@ -25,4 +25,8 @@ public class MakeBuildUnstableException extends RuntimeException { public MakeBuildUnstableException(Throwable cause) { super(cause); } + + public MakeBuildUnstableException(String message) { + super(message); + } } diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/ReleaserTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/ReleaserTests.java index 524955f8..d93d61c0 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/ReleaserTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/ReleaserTests.java @@ -10,8 +10,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.BDDMockito; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.boot.test.rule.OutputCapture; import org.springframework.cloud.release.internal.docs.DocumentationUpdater; import org.springframework.cloud.release.internal.git.ProjectGitHandler; @@ -25,7 +26,7 @@ import org.springframework.cloud.release.internal.sagan.SaganUpdater; import org.springframework.cloud.release.internal.template.TemplateGenerator; import static org.mockito.BDDMockito.then; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; /** @@ -113,6 +114,7 @@ public class ReleaserTests { @Test public void should_generate_email_for_release_version() { + BDDMockito.given(this.templateGenerator.email(projects())).willReturn(new File(".")); releaser().createEmail(new ProjectVersion("original", "1.0.0.RELEASE"), projects()); then(this.templateGenerator).should().email(any(Projects.class)); diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/LoggerToMavenLogTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/LoggerToMavenLogTests.java index 7e7860d1..e1b5ae86 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/LoggerToMavenLogTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/LoggerToMavenLogTests.java @@ -4,7 +4,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.slf4j.Logger; import static org.mockito.BDDMockito.then; diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/PropertyVersionChangerTests.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/PropertyVersionChangerTests.java index 7680600e..72a27df7 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/PropertyVersionChangerTests.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/pom/PropertyVersionChangerTests.java @@ -4,21 +4,15 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; +import edu.emory.mathcs.backport.java.util.Arrays; import org.apache.maven.model.Model; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.cloud.release.internal.pom.ModelWrapper; -import org.springframework.cloud.release.internal.pom.Project; -import org.springframework.cloud.release.internal.pom.PropertyStorer; -import org.springframework.cloud.release.internal.pom.PropertyVersionChanger; -import org.springframework.cloud.release.internal.pom.Versions; - -import edu.emory.mathcs.backport.java.util.Arrays; +import org.mockito.junit.MockitoJUnitRunner; import static org.mockito.BDDMockito.then; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; /** diff --git a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/sagan/SaganUpdaterTest.java b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/sagan/SaganUpdaterTest.java index 943ef1aa..60b327b3 100644 --- a/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/sagan/SaganUpdaterTest.java +++ b/spring-cloud-release-tools-core/src/test/java/org/springframework/cloud/release/internal/sagan/SaganUpdaterTest.java @@ -13,7 +13,7 @@ import org.springframework.cloud.release.internal.ReleaserProperties; import org.springframework.cloud.release.internal.pom.ProjectVersion; import static org.mockito.BDDMockito.then; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; /** 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 718d6f7c..471eb071 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 @@ -53,7 +53,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.util.FileSystemUtils; import static org.assertj.core.api.BDDAssertions.then; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.anyString; /** * @author Marcin Grzejszczak diff --git a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsProcessorTests.java b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsProcessorTests.java index 3b911918..58942232 100644 --- a/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsProcessorTests.java +++ b/spring-cloud-release-tools-spring/src/test/java/org/springframework/cloud/release/internal/spring/OptionsProcessorTests.java @@ -9,7 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.springframework.cloud.release.internal.Releaser; import org.springframework.cloud.release.internal.ReleaserProperties; import org.springframework.cloud.release.internal.options.Options;