Skip to content

Commit 19f59c6

Browse files
authored
Merge pull request #111 from codecentric/renovate/spring-boot
Update spring boot to v2.5.0
2 parents 505ebba + 9980a8a commit 19f59c6

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
.studio
1313
target
1414

15+
.gradle
16+
1517
# Apple #
1618
.DS_Store
1719

cxf-spring-boot-starter-samples/cxf-boot-simple-client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
<groupId>de.codecentric.soap</groupId>
77
<artifactId>cxf-boot-simple-client</artifactId>
8-
<version>2.4.0-SNAPSHOT</version>
8+
<version>2.5.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<description>Demo project for using cxf-spring-boot-starter</description>
1212

1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>2.4.5</version>
16+
<version>2.5.2</version>
1717
</parent>
1818

1919
<properties>
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>de.codecentric</groupId>
2929
<artifactId>cxf-spring-boot-starter</artifactId>
30-
<version>2.4.1</version>
30+
<version>2.5.0-SNAPSHOT</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.springframework.boot</groupId>

cxf-spring-boot-starter-samples/cxf-boot-simple/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>de.codecentric.soap</groupId>
77
<artifactId>cxf-boot-simple</artifactId>
8-
<version>2.4.0-SNAPSHOT</version>
8+
<version>2.5.0-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<name>cxf-boot-simple</name>
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.4.5</version>
17+
<version>2.5.0</version>
1818
</parent>
1919

2020
<properties>
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>de.codecentric</groupId>
2828
<artifactId>cxf-spring-boot-starter</artifactId>
29-
<version>2.4.1</version>
29+
<version>2.5.0-SNAPSHOT</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.springframework.boot</groupId>

cxf-spring-boot-starter-samples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>de.codecentric</groupId>
66
<artifactId>cxf-spring-boot-starter-reactor</artifactId>
7-
<version>2.4.0-SNAPSHOT</version>
7+
<version>2.5.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>cxf-spring-boot-starter-samples</artifactId>
1010

cxf-spring-boot-starter/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>de.codecentric</groupId>
66
<artifactId>cxf-spring-boot-starter-reactor</artifactId>
7-
<version>2.4.0-SNAPSHOT</version>
7+
<version>2.5.0-SNAPSHOT</version>
88
</parent>
99
<artifactId>cxf-spring-boot-starter</artifactId>
1010
<description>Boot starter for SOAP-Webservices with Apache CXF using JAX-WS &amp; JAXB with Annotations only</description>
@@ -18,7 +18,7 @@
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1919

2020
<!-- Project dependencies -->
21-
<spring.boot.version>2.4.5</spring.boot.version>
21+
<spring.boot.version>2.5.2</spring.boot.version>
2222
<cxf-spring-boot-starter-maven-plugin.version>2.3.0.RELEASE</cxf-spring-boot-starter-maven-plugin.version>
2323
<cxf.version>3.4.4</cxf.version>
2424
<jakarta.activation.version>2.0.1</jakarta.activation.version>

cxf-spring-boot-starter/src/test/java/de/codecentric/cxf/endpoint/WeatherServiceRelativeUrlTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,26 @@
77
import org.junit.jupiter.api.Test;
88
import org.springframework.beans.factory.annotation.Autowired;
99
import org.springframework.boot.test.context.SpringBootTest;
10+
import org.springframework.boot.web.server.LocalServerPort;
1011

1112
import static org.hamcrest.MatcherAssert.assertThat;
1213

1314
@SpringBootTest(
1415
classes=TestApplication.class,
15-
webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT,
16-
properties = { "server.port:8098"}
16+
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
1717
)
1818
public class WeatherServiceRelativeUrlTest {
1919

20+
@LocalServerPort
21+
private int port;
22+
2023
@Autowired
2124
private SoapRawClient soapRawClient;
2225

2326
@Test
2427
public void should_return_a_relative_url() throws Exception {
2528
final String response = Request
26-
.Get("http://localhost:8098/soap-api/Weather?wsdl")
29+
.Get("http://localhost:" + port + "/soap-api/Weather?wsdl")
2730
.execute()
2831
.returnContent()
2932
.asString();

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>de.codecentric</groupId>
66
<artifactId>cxf-spring-boot-starter-reactor</artifactId>
77
<name>cxf-spring-boot-starter-reactor</name>
8-
<version>2.4.0-SNAPSHOT</version>
8+
<version>2.5.0-SNAPSHOT</version>
99

1010
<description>Reactor Maven project for the cxf-spring-boot-starter</description>
1111
<packaging>pom</packaging>

0 commit comments

Comments
 (0)