Skip to content

Commit 3cb19f6

Browse files
ryanjbaxterryanjbaxter
authored
Merge pull request #2327 from ryanjbaxter/boot-4.0.0-rc1
2 parents db9c3d7 + 1bd6595 commit 3cb19f6

File tree

33 files changed

+107
-107
lines changed

33 files changed

+107
-107
lines changed

‎docker/spring-cloud-contract-docker/project/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ dependencies {
115115

116116
contractTest {
117117
useJUnitPlatform {
118-
version = "5.13.1"
118+
version = "6.0.0"
119119
}
120120
if (getProp(envVars, "MESSAGING_TYPE") != "") {
121121
systemProperty("spring.profiles.active", "messagingtype")

‎docker/spring-cloud-contract-docker/project/buildSrc/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repositories {
77

88
ext {
99
roasterVersion = "2.22.3.Final"
10-
junit5Version = "5.13.1"
10+
junit5Version = "6.0.0"
1111
}
1212

1313
dependencies {
@@ -17,6 +17,6 @@ dependencies {
1717

1818
test {
1919
useJUnitPlatform {
20-
version = "5.13.1"
20+
version = "6.0.0"
2121
}
2222
}

‎docker/spring-cloud-contract-docker/project/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.daemon=false
22
org.gradle.parallel=false
33
verifierVersion=5.0.0-SNAPSHOT
4-
springBootVersion=4.0.0-M3
4+
springBootVersion=4.0.0-RC1
55
camelVersion=3.22.4

‎docs/modules/ROOT/pages/howto/contract-dsl-rest-docs.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
include::partial$_attributes.adoc[]
55

66
When you want to include the requests and responses of your API by using Spring REST Docs,
7-
you only need to make some minor changes to your setup if you are using MockMvc and RestAssuredMockMvc.
7+
you only need to make some minor changes to your setup if you are using MockMvc.
88
To do so, include the following dependencies (if you have not already done so):
99

1010
{samples_code}/standalone/dsl/http-server/pom.xml[Click here to see the Maven code]

‎docs/modules/ROOT/pages/project-features-flows/rest-docs.adoc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
include::partial$_attributes.adoc[]
55

66
You can use https://projects.spring.io/spring-restdocs[Spring REST Docs] to generate
7-
documentation (for example, in Asciidoc format) for an HTTP API with Spring MockMvc,
8-
WebTestClient, or RestAssured. At the same time that you generate documentation for your API, you can also
7+
documentation (for example, in Asciidoc format) for an HTTP API with Spring MockMvc or
8+
WebTestClient. At the same time that you generate documentation for your API, you can also
99
generate WireMock stubs by using Spring Cloud Contract WireMock. To do so, write your
1010
normal REST Docs test cases and use `@AutoConfigureRestDocs` to have stubs be
1111
automatically generated in the REST Docs output directory. The following UML diagram shows
@@ -184,6 +184,8 @@ number of different ways, including by using
184184
`@AutoConfigureWireMock(stubs="classpath:resource.json")`, as described earlier in this
185185
document.
186186

187+
NOTE: In Spring Cloud Contract 5.0.x support for Rest Assured in Spring Rest Docs was removed due to https://github.com/spring-projects/spring-restdocs/issues/1000[Rest Assured being incompatible with Groovy 5].
188+
187189
[[features-rest-docs-contracts]]
188190
== Generating Contracts with REST Docs
189191

‎pom.xml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<inceptionYear>2016</inceptionYear>
2424

2525
<properties>
26-
<spring-boot.version>4.0.0-M3</spring-boot.version>
26+
<spring-boot.version>4.0.0-RC1</spring-boot.version>
2727
<!-- Align it also in Docker image under [docker/spring-cloud-contract-docker/project/gradle.properties] -->
2828
<camel.version>4.14.0</camel.version>
2929
<jsch-agent.version>0.0.9</jsch-agent.version>
@@ -37,16 +37,15 @@
3737
<cglib.version>3.3.0</cglib.version>
3838
<spock-spring.version>2.3-groovy-4.0
3939
</spock-spring.version> <!-- @releaser:version-check-off -->
40-
<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
4140
<handlebars.version>4.5.0</handlebars.version>
4241
<commons-text.version>1.14.0</commons-text.version>
4342
<jgit.version>7.3.0.202506031305-r</jgit.version>
4443
<json-unit-assertj.version>4.1.1</json-unit-assertj.version>
4544
<rest-assured.version>5.5.6</rest-assured.version>
4645
<slf4j.version>[2.0.0,)</slf4j.version>
4746
<thin-jar.version>1.0.31.RELEASE</thin-jar.version>
48-
<junit-vintage.version>5.13.4</junit-vintage.version>
49-
<junit-jupiter.version>5.13.4</junit-jupiter.version>
47+
<junit-vintage.version>6.0.0</junit-vintage.version>
48+
<junit-jupiter.version>6.0.0</junit-jupiter.version>
5049
<gmavenplus-plugin.version>4.2.1</gmavenplus-plugin.version>
5150
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version> <!-- @releaser:version-check-off -->
5251
<awaitility.version>4.3.0</awaitility.version>
@@ -216,11 +215,6 @@
216215
<artifactId>spock-junit4</artifactId>
217216
<version>${spock-spring.version}</version>
218217
</dependency>
219-
<dependency>
220-
<groupId>io.specto</groupId>
221-
<artifactId>hoverfly-junit</artifactId>
222-
<version>${hoverfly-junit.version}</version>
223-
</dependency>
224218
<dependency>
225219
<groupId>org.apache.commons</groupId>
226220
<artifactId>commons-text</artifactId>

‎spring-cloud-contract-stub-runner/pom.xml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,6 @@
168168
<artifactId>spring-boot-autoconfigure-processor</artifactId>
169169
<optional>true</optional>
170170
</dependency>
171-
<!-- Git Stub Downloader -->
172-
<dependency>
173-
<groupId>io.specto</groupId>
174-
<artifactId>hoverfly-junit</artifactId>
175-
<scope>test</scope>
176-
</dependency>
177171
<dependency>
178172
<groupId>org.glassfish.jersey.core</groupId>
179173
<artifactId>jersey-client</artifactId>
@@ -250,7 +244,28 @@
250244
<artifactId>spock-junit4</artifactId>
251245
<scope>test</scope>
252246
</dependency>
247+
<dependency>
248+
<groupId>org.springframework.boot</groupId>
249+
<artifactId>spring-boot-webmvc-test</artifactId>
250+
<scope>test</scope>
251+
</dependency>
252+
<dependency>
253+
<groupId>org.springframework.boot</groupId>
254+
<artifactId>spring-boot-resttestclient</artifactId>
255+
<scope>test</scope>
256+
</dependency>
253257
</dependencies>
258+
<dependencyManagement>
259+
<dependencies>
260+
<dependency>
261+
<groupId>org.junit</groupId>
262+
<artifactId>junit-bom</artifactId>
263+
<version>${junit-jupiter.version}</version>
264+
<type>pom</type>
265+
<scope>import</scope>
266+
</dependency>
267+
</dependencies>
268+
</dependencyManagement>
254269
<build>
255270
<plugins>
256271
<plugin>

‎spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/AutoConfigureStubRunner.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@
2323
import java.lang.annotation.Target;
2424

2525
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
26-
import org.springframework.boot.test.autoconfigure.properties.PropertyMapping;
27-
import org.springframework.boot.test.autoconfigure.properties.SkipPropertyMapping;
26+
import org.springframework.boot.test.context.PropertyMapping;
2827
import org.springframework.cloud.contract.stubrunner.HttpServerStubConfigurer;
2928
import org.springframework.cloud.contract.stubrunner.HttpServerStubConfigurer.NoOpHttpServerStubConfigurer;
3029
import org.springframework.cloud.contract.verifier.messaging.boot.AutoConfigureMessageVerifier;
3130

31+
import static org.springframework.boot.test.context.PropertyMapping.Skip.ON_DEFAULT_VALUE;
32+
3233
/**
3334
* @author Dave Syer
3435
*
@@ -38,7 +39,7 @@
3839
@Documented
3940
@ImportAutoConfiguration
4041
@AutoConfigureMessageVerifier
41-
@PropertyMapping(value = "spring.cloud.contract.stubrunner", skip = SkipPropertyMapping.ON_DEFAULT_VALUE)
42+
@PropertyMapping(value = "spring.cloud.contract.stubrunner", skip = ON_DEFAULT_VALUE)
4243
public @interface AutoConfigureStubRunner {
4344

4445
/**

‎spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/EurekaStubsRegistrar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.apache.commons.logging.LogFactory;
3232

3333
import org.springframework.beans.BeansException;
34-
import org.springframework.boot.actuate.health.StatusAggregator;
34+
import org.springframework.boot.health.actuate.endpoint.StatusAggregator;
3535
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
3636
import org.springframework.cloud.commons.util.InetUtils;
3737
import org.springframework.cloud.contract.stubrunner.StubConfiguration;

‎spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/AetherStubDownloaderSpec.groovy‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package org.springframework.cloud.contract.stubrunner
1818

19-
import io.specto.hoverfly.junit.HoverflyRule
2019
import org.eclipse.aether.RepositorySystemSession
2120
import org.eclipse.aether.repository.Authentication
2221
import org.junit.Rule
@@ -29,9 +28,6 @@ import org.springframework.util.ResourceUtils
2928

3029
class AetherStubDownloaderSpec extends Specification {
3130

32-
@Rule
33-
HoverflyRule hoverflyRule = HoverflyRule.inSimulationMode("simulation.json")
34-
3531
@Rule
3632
TemporaryFolder folder = new TemporaryFolder()
3733

0 commit comments

Comments
 (0)