diff --git a/.gitignore b/.gitignore index 1307091b..d85ec853 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ nbdist/ *.log _site effective.pom + +.sdkmanrc \ No newline at end of file diff --git a/pom.xml b/pom.xml index 04eca340..95b53835 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,9 @@ pom - org.springframework.cloud - spring-cloud-build - 2.2.3.RELEASE + org.springframework.boot + spring-boot-starter-parent + 2.3.2.RELEASE @@ -30,17 +30,19 @@ UTF-8 1.8 - Hoxton.BUILD-SNAPSHOT + Hoxton.SR6 1.0 0.0.9 - 5.4.1.Final 5.1.3.201810200350-r - 2.2.1 - 2.3 - 4.0.6 - 0.8.0.BUILD-SNAPSHOT - 3.1.6 + 1.6.0 + 0.2.0.RELEASE + + 3.6.3 + 2.7 + 4.2.0 + 0.10.0-SNAPSHOT + 4.0.3 1.0.0.BUILD-SNAPSHOT 1.0.4 5.0.3 diff --git a/releaser-core/pom.xml b/releaser-core/pom.xml index bdfd71aa..472394c9 100644 --- a/releaser-core/pom.xml +++ b/releaser-core/pom.xml @@ -32,11 +32,6 @@ spring-boot-configuration-processor true - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - org.eclipse.jgit org.eclipse.jgit @@ -104,6 +99,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.springframework.cloud spring-cloud-starter-contract-stub-runner diff --git a/releaser-core/src/test/java/releaser/internal/ReleaserTests.java b/releaser-core/src/test/java/releaser/internal/ReleaserTests.java index b4897cfa..6abe4af9 100644 --- a/releaser-core/src/test/java/releaser/internal/ReleaserTests.java +++ b/releaser-core/src/test/java/releaser/internal/ReleaserTests.java @@ -42,7 +42,7 @@ import releaser.internal.project.Projects; import releaser.internal.sagan.SaganUpdater; import releaser.internal.template.TemplateGenerator; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.then; @@ -55,7 +55,7 @@ import static org.mockito.Mockito.never; public class ReleaserTests { @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); @Mock ProjectPomUpdater projectPomUpdater; diff --git a/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java b/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java index 0468a266..0dae4341 100644 --- a/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java +++ b/releaser-core/src/test/java/releaser/internal/buildsystem/PomUpdaterTests.java @@ -35,7 +35,7 @@ import releaser.internal.git.GitRepoTests; import releaser.internal.project.Project; import releaser.internal.tech.PomReader; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.util.FileSystemUtils; /** @@ -44,7 +44,7 @@ import org.springframework.util.FileSystemUtils; public class PomUpdaterTests { @Rule - public OutputCapture capture = new OutputCapture(); + public OutputCaptureRule capture = new OutputCaptureRule(); @Rule public TemporaryFolder tmp = new TemporaryFolder(); diff --git a/releaser-core/src/test/java/releaser/internal/docs/SpringCloudGhPagesParserTests.java b/releaser-core/src/test/java/releaser/internal/docs/SpringCloudGhPagesParserTests.java index 201580ee..dcbef438 100644 --- a/releaser-core/src/test/java/releaser/internal/docs/SpringCloudGhPagesParserTests.java +++ b/releaser-core/src/test/java/releaser/internal/docs/SpringCloudGhPagesParserTests.java @@ -23,7 +23,7 @@ import org.assertj.core.api.BDDAssertions; import org.junit.Rule; import org.junit.Test; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; /** * @author Marcin Grzejszczak @@ -31,7 +31,7 @@ import org.springframework.boot.test.rule.OutputCapture; public class SpringCloudGhPagesParserTests { @Rule - public OutputCapture capture = new OutputCapture(); + public OutputCaptureRule capture = new OutputCaptureRule(); File rawHtml = new File(SpringCloudGhPagesParserTests.class .getResource("/raw/spring-cloud-gh-pages-index.html").toURI()); diff --git a/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java b/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java index b7965226..efa674ca 100644 --- a/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java +++ b/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java @@ -31,7 +31,7 @@ import org.mockito.BDDMockito; import releaser.internal.project.ProjectVersion; import releaser.internal.project.Projects; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; /** * @author Marcin Grzejszczak @@ -42,7 +42,7 @@ public class GithubIssuesTests { public TemporaryFolder folder = new TemporaryFolder(); @Rule - public OutputCapture capture = new OutputCapture(); + public OutputCaptureRule capture = new OutputCaptureRule(); MkGithub github; diff --git a/releaser-core/src/test/java/releaser/internal/github/GithubMilestonesTests.java b/releaser-core/src/test/java/releaser/internal/github/GithubMilestonesTests.java index 8f6c8044..35644adb 100644 --- a/releaser-core/src/test/java/releaser/internal/github/GithubMilestonesTests.java +++ b/releaser-core/src/test/java/releaser/internal/github/GithubMilestonesTests.java @@ -30,7 +30,7 @@ import org.junit.rules.TemporaryFolder; import releaser.internal.ReleaserProperties; import releaser.internal.project.ProjectVersion; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import static org.assertj.core.api.BDDAssertions.then; import static org.assertj.core.api.BDDAssertions.thenThrownBy; @@ -44,7 +44,7 @@ public class GithubMilestonesTests { public TemporaryFolder folder = new TemporaryFolder(); @Rule - public OutputCapture capture = new OutputCapture(); + public OutputCaptureRule capture = new OutputCaptureRule(); MkGithub github; diff --git a/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java b/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java index 028d0d1f..656c0b38 100644 --- a/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java +++ b/releaser-core/src/test/java/releaser/internal/project/ProjectCommandExecutorTests.java @@ -36,7 +36,7 @@ import releaser.internal.PomUpdateAcceptanceTests; import releaser.internal.ReleaserProperties; import releaser.internal.buildsystem.TestUtils; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.util.FileSystemUtils; import static org.assertj.core.api.BDDAssertions.then; @@ -51,7 +51,7 @@ public class ProjectCommandExecutorTests { public TemporaryFolder tmp = new TemporaryFolder(); @Rule - public OutputCapture outputCapture = new OutputCapture(); + public OutputCaptureRule outputCapture = new OutputCaptureRule(); File temporaryFolder; diff --git a/releaser-spring/pom.xml b/releaser-spring/pom.xml index ffb812a3..e9ce01e1 100644 --- a/releaser-spring/pom.xml +++ b/releaser-spring/pom.xml @@ -59,6 +59,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + diff --git a/releaser-test/pom.xml b/releaser-test/pom.xml index 822ddef0..956007c7 100644 --- a/releaser-test/pom.xml +++ b/releaser-test/pom.xml @@ -40,6 +40,11 @@ spring-boot-starter-test compile + + org.junit.vintage + junit-vintage-engine + compile + diff --git a/spring-cloud-info/pom.xml b/spring-cloud-info/pom.xml index 2255f9fe..3ed23263 100644 --- a/spring-cloud-info/pom.xml +++ b/spring-cloud-info/pom.xml @@ -64,6 +64,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.springframework.restdocs spring-restdocs-mockmvc