You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2022/11/25 17:18:55 UTC
[cxf] branch main updated: Update Spring Framework to 6.0.2 and Spring Boot to 3.0.0 (#1036)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 96a2e7f27f Update Spring Framework to 6.0.2 and Spring Boot to 3.0.0 (#1036)
96a2e7f27f is described below
commit 96a2e7f27fde6ebdffd511ce69120adfff7b9dcb
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Nov 25 12:18:48 2022 -0500
Update Spring Framework to 6.0.2 and Spring Boot to 3.0.0 (#1036)
---
.../src/main/java/sample/rs/service/SampleRestApplication.java | 4 ++--
.../src/main/java/sample/rs/client/SampleRestClientApplication.java | 4 ++--
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index f085e03d0b..4fb97bcef9 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -20,11 +20,11 @@ package sample.rs.service;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@SpringBootApplication
-@EnableEurekaClient
+@EnableDiscoveryClient
public class SampleRestApplication {
public static void main(String[] args) {
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
index 013738fda0..5c8c5e61b2 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -36,14 +36,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
import sample.rs.service.HelloService;
@SpringBootApplication
-@EnableEurekaClient
+@EnableDiscoveryClient
@EnableJaxRsProxyClient
public class SampleRestClientApplication {
public static void main(String[] args) {
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index efdf272e15..d9903c237b 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -31,8 +31,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>3.0.0-RC2</spring.boot.version>
- <spring.cloud.eureka.version>4.0.0-RC1</spring.cloud.eureka.version>
+ <spring.boot.version>3.0.0</spring.boot.version>
+ <spring.cloud.eureka.version>4.0.0-RC2</spring.cloud.eureka.version>
<cxf.jetty11.version>11.0.12</cxf.jetty11.version>
<cxf.netty.version>4.1.85.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 94965a527a..7fe08f566e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,11 +181,11 @@
<cxf.slf4j.version>2.0.3</cxf.slf4j.version>
<cxf.snakeyaml.version>1.33</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>3.0.0-RC2</cxf.spring.boot.version>
+ <cxf.spring.boot.version>3.0.0</cxf.spring.boot.version>
<cxf.spring.ldap.version>3.0.0</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.security.version>6.0.0</cxf.spring.security.version>
- <cxf.spring.version>6.0.0-RC4</cxf.spring.version>
+ <cxf.spring.version>6.0.2</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>4.15.5</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.2.7</cxf.swagger.v3.version>