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 5c37d05ec7 Update Spring Boot to 3.0.0-M5 and Micrometer to 1.10.0-M6
5c37d05ec7 is described below
commit 5c37d05ec7a26a9e72c5169b1f427087cf123993
Author: Andriy Redko <[email protected]>
AuthorDate: Fri Sep 23 21:04:11 2022 -0400
Update Spring Boot to 3.0.0-M5 and Micrometer to 1.10.0-M6
---
.../autoconfigure/src/main/resources/META-INF/spring.factories | 5 -----
.../org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3 +++
parent/pom.xml | 4 ++--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git
a/integration/spring-boot/autoconfigure/src/main/resources/META-INF/spring.factories
b/integration/spring-boot/autoconfigure/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index ee6f554eaf..0000000000
---
a/integration/spring-boot/autoconfigure/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.cxf.spring.boot.autoconfigure.CxfAutoConfiguration,\
-org.apache.cxf.spring.boot.autoconfigure.openapi.OpenApiAutoConfiguration,\
-org.apache.cxf.spring.boot.autoconfigure.micrometer.MicrometerMetricsAutoConfiguration
diff --git
a/integration/spring-boot/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/integration/spring-boot/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000000..6f20cc12ef
--- /dev/null
+++
b/integration/spring-boot/autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+org.apache.cxf.spring.boot.autoconfigure.CxfAutoConfiguration
+org.apache.cxf.spring.boot.autoconfigure.openapi.OpenApiAutoConfiguration
+org.apache.cxf.spring.boot.autoconfigure.micrometer.MicrometerMetricsAutoConfiguration
diff --git a/parent/pom.xml b/parent/pom.xml
index 45d5451a08..c1b62ac1c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -169,7 +169,7 @@
<cxf.logback.classic.version>1.2.10</cxf.logback.classic.version>
<cxf.lucene.version>8.11.1</cxf.lucene.version>
<cxf.maven.core.version>3.6.3</cxf.maven.core.version>
- <cxf.micrometer.version>1.10.0-M3</cxf.micrometer.version>
+ <cxf.micrometer.version>1.10.0-M6</cxf.micrometer.version>
<cxf.microprofile.config.version>3.0.1</cxf.microprofile.config.version>
<cxf.microprofile.rest.client.version>3.0</cxf.microprofile.rest.client.version>
<cxf.microprofile.openapi.version>3.0</cxf.microprofile.openapi.version>
@@ -202,7 +202,7 @@
<cxf.slf4j.version>1.7.36</cxf.slf4j.version>
<cxf.snakeyaml.version>1.32</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>3.0.0-M4</cxf.spring.boot.version>
+ <cxf.spring.boot.version>3.0.0-M5</cxf.spring.boot.version>
<cxf.spring.ldap.version>3.0.0-M2</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
