Skip to content

Commit 7a7b07f

Browse files
lor6lor6
authored
Merge pull request eugenp#6707 from jessbringlarsen/updateVersion
Version update: Spring Boot to 2.1.4 and Spring Cloud Contract to 2.1.1
2 parents 47e6077 + 134e19e commit 7a7b07f

File tree

4 files changed

+45
-36
lines changed

4 files changed

+45
-36
lines changed

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,45 @@
1919
<module>spring-cloud-contract-consumer</module>
2020
</modules>
2121

22+
<dependencyManagement>
23+
<dependencies>
24+
<dependency>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot-starter-web</artifactId>
27+
<version>${spring-boot.version}</version>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.springframework.boot</groupId>
31+
<artifactId>spring-boot-starter-data-rest</artifactId>
32+
<version>${spring-boot.version}</version>
33+
</dependency>
34+
35+
<dependency>
36+
<groupId>org.springframework.cloud</groupId>
37+
<artifactId>spring-cloud-contract-wiremock</artifactId>
38+
<version>${spring-cloud.version}</version>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.springframework.cloud</groupId>
43+
<artifactId>spring-cloud-contract-stub-runner</artifactId>
44+
<version>${spring-cloud.version}</version>
45+
<scope>test</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.springframework.cloud</groupId>
49+
<artifactId>spring-cloud-starter-contract-verifier</artifactId>
50+
<version>${spring-cloud.version}</version>
51+
<scope>test</scope>
52+
</dependency>
53+
</dependencies>
54+
</dependencyManagement>
55+
56+
<properties>
57+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
58+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
59+
<java.version>1.8</java.version>
60+
<spring-cloud.version>2.1.1.RELEASE</spring-cloud.version>
61+
<spring-boot.version>2.1.4.RELEASE</spring-boot.version>
62+
</properties>
2263
</project>

‎spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,27 @@
2020
<dependency>
2121
<groupId>org.springframework.cloud</groupId>
2222
<artifactId>spring-cloud-contract-wiremock</artifactId>
23-
<version>${spring-cloud.version}</version>
2423
<scope>test</scope>
2524
</dependency>
2625
<dependency>
2726
<groupId>org.springframework.cloud</groupId>
2827
<artifactId>spring-cloud-contract-stub-runner</artifactId>
29-
<version>${spring-cloud.version}</version>
3028
<scope>test</scope>
3129
</dependency>
3230
<dependency>
3331
<groupId>org.springframework.boot</groupId>
3432
<artifactId>spring-boot-starter-web</artifactId>
35-
<version>${spring-boot.version}</version>
3633
</dependency>
3734
<dependency>
3835
<groupId>org.springframework.boot</groupId>
3936
<artifactId>spring-boot-starter-data-rest</artifactId>
40-
<version>${spring-boot.version}</version>
4137
</dependency>
4238
<dependency>
4339
<groupId>com.baeldung.spring.cloud</groupId>
4440
<artifactId>spring-cloud-contract-producer</artifactId>
45-
<version>1.0.0-SNAPSHOT</version>
41+
<version>${project.parent.version}</version>
4642
<scope>test</scope>
4743
</dependency>
4844
</dependencies>
4945

50-
<properties>
51-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
52-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
53-
<spring-cloud.version>1.2.2.RELEASE</spring-cloud.version>
54-
<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
55-
</properties>
5646
</project>

‎spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
88
import org.springframework.boot.test.context.SpringBootTest;
99
import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner;
10+
import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
1011
import org.springframework.http.MediaType;
1112
import org.springframework.test.context.junit4.SpringRunner;
1213
import org.springframework.test.web.servlet.MockMvc;
@@ -19,7 +20,7 @@
1920
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK)
2021
@AutoConfigureMockMvc
2122
@AutoConfigureJsonTesters
22-
@AutoConfigureStubRunner(workOffline = true,
23+
@AutoConfigureStubRunner(stubsMode = StubRunnerProperties.StubsMode.LOCAL,
2324
ids = "com.baeldung.spring.cloud:spring-cloud-contract-producer:+:stubs:8090")
2425
public class BasicMathControllerIntegrationTest {
2526

‎spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,18 @@
2525
<dependency>
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-web</artifactId>
28-
<version>${spring-boot.version}</version>
2928
</dependency>
3029
<dependency>
3130
<groupId>org.springframework.boot</groupId>
3231
<artifactId>spring-boot-starter-data-rest</artifactId>
33-
<version>${spring-boot.version}</version>
3432
</dependency>
3533
</dependencies>
3634
<build>
3735
<plugins>
3836
<plugin>
3937
<groupId>org.springframework.cloud</groupId>
4038
<artifactId>spring-cloud-contract-maven-plugin</artifactId>
41-
<version>1.2.2.RELEASE</version>
39+
<version>2.1.1.RELEASE</version>
4240
<extensions>true</extensions>
4341
<configuration>
4442
<baseClassForTests>com.baeldung.spring.cloud.springcloudcontractproducer.BaseTestClass
@@ -47,25 +45,4 @@
4745
</plugin>
4846
</plugins>
4947
</build>
50-
51-
52-
<dependencyManagement>
53-
<dependencies>
54-
<dependency>
55-
<groupId>org.springframework.cloud</groupId>
56-
<artifactId>spring-cloud-dependencies</artifactId>
57-
<version>${spring-cloud.version}</version>
58-
<type>pom</type>
59-
<scope>import</scope>
60-
</dependency>
61-
</dependencies>
62-
</dependencyManagement>
63-
64-
<properties>
65-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
66-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
67-
<spring-cloud.version>Edgware.SR1</spring-cloud.version>
68-
<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
69-
</properties>
70-
7148
</project>

0 commit comments

Comments
 (0)