From 5a6c3553972665734ec240cca2ac4db23fab4840 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Tue, 18 May 2021 07:16:18 +0200 Subject: [PATCH 1/2] Update docs and internal dep mgmt following Spock 2.0's release See gh-26586 --- .../spring-boot-docs/src/docs/asciidoc/features/testing.adoc | 4 ++-- spring-boot-project/spring-boot-parent/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc index e74638b3c34..879873f69f9 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc @@ -872,10 +872,10 @@ Alternatively, you can specify a source for your test, which disables the behavi ==== Using Spock to Test Spring Boot Applications If you wish to use Spock to test a Spring Boot application, you should add a dependency on Spock's `spock-spring` module to your application's build. `spock-spring` integrates Spring's test framework into Spock. -See https://spockframework.org/spock/docs/2.0-M4/modules.html#_spring_module[the documentation for Spock's Spring module] for further details. +See https://spockframework.org/spock/docs/2.0/modules.html#_spring_module[the documentation for Spock's Spring module] for further details. NOTE: As of Spring Boot 2.5.x and its support for Groovy 3.x you have two options to make use of Spock: -Either use the latest Spock 2.0 milestone or release that is compatible with Groovy 3.x or stick with Spock 1.3 and downgrade Spring Boot's Groovy version to 2.5.x. +Either use the latest Spock 2.x release that is compatible with Groovy 3.x or stick with Spock 1.3 and downgrade Spring Boot's Groovy version to 2.5.x. diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index 1ce64252ae9..97a66b77920 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -133,7 +133,7 @@ bom { ] } } - library("Spock Framework", "2.0-M4-groovy-3.0") { + library("Spock Framework", "2.0-groovy-3.0") { group("org.spockframework") { modules = [ "spock-core", From 88b383c6bb492d0db25bedf7ca088c0459acd53f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 18 May 2021 10:00:05 +0100 Subject: [PATCH 2/2] Polish "Update docs and internal dep mgmt following Spock 2.0's release" See gh-26586 --- .../src/docs/asciidoc/features/testing.adoc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc index 879873f69f9..5b5f928d252 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testing.adoc @@ -870,13 +870,11 @@ Alternatively, you can specify a source for your test, which disables the behavi [[features.testing.spring-boot-applications.spock]] ==== Using Spock to Test Spring Boot Applications -If you wish to use Spock to test a Spring Boot application, you should add a dependency on Spock's `spock-spring` module to your application's build. +Spock 2.x can be used to test a Spring Boot application. +To do so, add a dependency on Spock's `spock-spring` module to your application's build. `spock-spring` integrates Spring's test framework into Spock. See https://spockframework.org/spock/docs/2.0/modules.html#_spring_module[the documentation for Spock's Spring module] for further details. -NOTE: As of Spring Boot 2.5.x and its support for Groovy 3.x you have two options to make use of Spock: -Either use the latest Spock 2.x release that is compatible with Groovy 3.x or stick with Spock 1.3 and downgrade Spring Boot's Groovy version to 2.5.x. - [[features.testing.utilities]]