This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 85ba0e6 CXF-8134: Upgrade to Spring Boot 2.2
85ba0e6 is described below
commit 85ba0e6e65374df37b253f32a183b336b6d64991
Author: Dennis Kieselhorst <[email protected]>
AuthorDate: Sun Dec 22 21:47:08 2019 +0100
CXF-8134: Upgrade to Spring Boot 2.2
---
.../release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index 91be24d..4683a2f 100644
---
a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++
b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -32,10 +32,10 @@
</dependencies>
</dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+ <version>${spring.cloud.eureka.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/distribution/src/main/release/samples/pom.xml
b/distribution/src/main/release/samples/pom.xml
index 91fbe05..41f11b9 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,8 +30,8 @@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
-
<spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
+ <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
+
<spring.cloud.eureka.version>2.2.1.RELEASE</spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.24.v20191120</cxf.jetty9.version>
<cxf.httpcomponents.client.version>4.5.8</cxf.httpcomponents.client.version>
<cxf.tika.version>1.23</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1187c02..f6e32be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,7 @@
<cxf.slf4j.version>1.7.29</cxf.slf4j.version>
<cxf.snakeyaml.version>1.25</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>2.1.11.RELEASE</cxf.spring.boot.version>
+ <cxf.spring.boot.version>2.2.2.RELEASE</cxf.spring.boot.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
