Skip to content

Commit b61a193

Browse files
committed
Upgrade to 5.0.0-SNAPSHOT. Adjust to changes in Framework.
Signed-off-by: Olga Maciaszek-Sharma <[email protected]>
1 parent c09dc87 commit b61a193

File tree

36 files changed

+1215
-1065
lines changed

36 files changed

+1215
-1065
lines changed

docs/modules/ROOT/pages/project-features-flows/custom-mode.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The following example shows a generated test:
2525
package com.example.beer;
2626
2727
import com.example.BeerRestBase;
28-
import javax.inject.Inject;
28+
import org.springframework.beans.factory.annotation.Autowired;
2929
import org.springframework.cloud.contract.verifier.http.HttpVerifier;
3030
import org.springframework.cloud.contract.verifier.http.Request;
3131
import org.springframework.cloud.contract.verifier.http.Response;
@@ -38,7 +38,7 @@ import static org.springframework.cloud.contract.verifier.http.Request.given;
3838
3939
@SuppressWarnings("rawtypes")
4040
public class RestTest extends BeerRestBase {
41-
@Inject HttpVerifier httpVerifier;
41+
@Autowired HttpVerifier httpVerifier;
4242
4343
@Test
4444
public void validate_shouldGrantABeerIfOldEnough() throws Exception {

docs/modules/ROOT/pages/project-features-flows/graphql.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ metadata:
9191
----
9292
====
9393

94-
Adding the metadata section will change the way the default, WireMock stub is built. It will now use the Spring Cloud Contract request matcher, so that e.g. the `query` part of the GraphQL request gets compared against the real request by ignoring whitespaces.
94+
Adding the metadata section will change the way the default, WireMock stub is built.
95+
It will now use the Spring Cloud Contract request matcher, so that e.g. the `query` part of the GraphQL request gets compared against the real request by ignoring whitespaces.
9596

9697
[[features-graphql-producer]]
9798
== Producer Side Setup
@@ -177,7 +178,7 @@ public class BeerControllerGraphQLTest {
177178
.contentType(MediaType.APPLICATION_JSON)
178179
.body(REQUEST_BODY), String.class);
179180
180-
BDDAssertions.then(responseEntity.getStatusCodeValue()).isEqualTo(200);
181+
BDDAssertions.then(responseEntity.getStatusCode().value()).isEqualTo(200);
181182
182183
}
183184
}

pom.xml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
<spring-cloud-commons.version>5.0.0-SNAPSHOT</spring-cloud-commons.version>
3636
<jopt-simple.version>5.0.4</jopt-simple.version>
3737
<cglib.version>3.3.0</cglib.version>
38-
<spock-spring.version>2.3-groovy-4.0</spock-spring.version> <!-- @releaser:version-check-off -->
38+
<spock-spring.version>2.3-groovy-4.0
39+
</spock-spring.version> <!-- @releaser:version-check-off -->
3940
<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
4041
<commons-text.version>1.11.0</commons-text.version>
4142
<handlebars.version>4.3.1</handlebars.version>
4243
<jgit.version>6.10.1.202505221210-r</jgit.version>
43-
<javax-inject.version>1</javax-inject.version>
4444
<json-unit-assertj.version>2.38.0</json-unit-assertj.version>
4545
<rest-assured.version>5.2.1</rest-assured.version>
4646
<slf4j.version>[2.0.0,)</slf4j.version>
@@ -49,7 +49,8 @@
4949
<junit-vintage.version>5.12.1</junit-vintage.version>
5050
<junit-jupiter.version>5.12.1</junit-jupiter.version>
5151
<gmavenplus-plugin.version>1.13.0</gmavenplus-plugin.version>
52-
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version> <!-- @releaser:version-check-off -->
52+
<maven-surefire-plugin.version>3.2.5
53+
</maven-surefire-plugin.version> <!-- @releaser:version-check-off -->
5354
<awaitility.version>4.2.0</awaitility.version>
5455
<artemis.version>2.39.0</artemis.version>
5556
<testcontainers.version>1.19.8</testcontainers.version>
@@ -232,11 +233,6 @@
232233
<artifactId>handlebars</artifactId>
233234
<version>${handlebars.version}</version>
234235
</dependency>
235-
<dependency>
236-
<groupId>javax.inject</groupId>
237-
<artifactId>javax.inject</artifactId>
238-
<version>${javax-inject.version}</version>
239-
</dependency>
240236

241237
<!-- Git Stub Downloader-->
242238
<dependency>
@@ -414,9 +410,9 @@
414410
</dependency>
415411
<dependency>
416412
<groupId>org.sonatype.sisu</groupId>
417-
<artifactId>sisu-inject-plexus</artifactId>
413+
<artifactId>sisu-inject-plexus</artifactId>
418414
<version>${sisu-inject-plexus.version}</version>
419-
</dependency>
415+
</dependency>
420416
<dependency>
421417
<groupId>org.apache.maven.resolver</groupId>
422418
<artifactId>maven-resolver</artifactId>
@@ -632,7 +628,9 @@
632628
<repository>
633629
<id>netflix-candidates</id>
634630
<name>Netflix Candidates</name>
635-
<url>https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates</url>
631+
<url>
632+
https://artifactory-oss.prod.netflix.net/artifactory/maven-oss-candidates
633+
</url>
636634
<snapshots>
637635
<enabled>false</enabled>
638636
</snapshots>

spring-cloud-contract-shade/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<org.eclipse.sisu.plexus.version>0.3.5</org.eclipse.sisu.plexus.version>
99
<sisu-guice.version>4.2.0</sisu-guice.version>
1010
<guice.version>5.0.1</guice.version>
11-
<guava.version>33.0.0-jre</guava.version>
11+
<guava.version>33.4.8-jre</guava.version>
1212
<asm.version>9.6</asm.version>
1313
<checker.version>3.25.0</checker.version>
1414
<maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>

0 commit comments

Comments
 (0)