This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch CXF-8671
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d2863563e1d1aaac677d7fd9919f259dc4e576b7
Merge: 2f3949c5b7 39e6fb9f99
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Thu Dec 21 16:54:53 2023 -0500
Merge remote-tracking branch 'origin/main' into CXF-8671
.../src/main/release/samples/jax_rs/tracing_brave/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 4 ++--
parent/pom.xml | 12 ++++++------
pom.xml | 6 +++---
systests/container-integration/grizzly/pom.xml | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --cc distribution/src/main/release/samples/pom.xml
index 9bb1668d53,4532cd32f7..5f475fff4c
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@@ -31,9 -31,9 +31,9 @@@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
-
<cxf.spring.cloud.eureka.version>4.0.3</cxf.spring.cloud.eureka.version>
+ <cxf.spring.boot.version>3.2.0</cxf.spring.boot.version>
+
<cxf.spring.cloud.eureka.version>4.1.0</cxf.spring.cloud.eureka.version>
- <cxf.jetty11.version>11.0.18</cxf.jetty11.version>
+ <cxf.jetty11.version>11.0.19</cxf.jetty11.version>
<cxf.netty.version>4.1.104.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.10.3</cxf.swagger.ui.version>
diff --cc parent/pom.xml
index cb5e83d84b,b220b9a941..45527ff702
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@@ -97,8 -97,8 +97,8 @@@
<cxf.atmosphere.version.range>[3.0,
4.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>3.0.3</cxf.atmosphere.version>
<cxf.bcprov.version>1.77</cxf.bcprov.version>
- <cxf.brave.version>5.16.0</cxf.brave.version>
+ <cxf.brave.version>5.17.0</cxf.brave.version>
- <cxf.cdi.api.version>3.0.0</cxf.cdi.api.version>
+ <cxf.cdi.api.version>4.0.1</cxf.cdi.api.version>
<cxf.classgraph.version>4.8.25</cxf.classgraph.version>
<cxf.classmate.version>1.5.1</cxf.classmate.version>
<cxf.commons-codec.version>1.16.0</cxf.commons-codec.version>
@@@ -213,14 -211,14 +213,14 @@@
<cxf.slf4j.version>2.0.9</cxf.slf4j.version>
<cxf.snakeyaml.version>2.2</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
- <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
- <cxf.spring.ldap.version>3.0.6</cxf.spring.ldap.version>
+ <cxf.spring.boot.version>3.2.0</cxf.spring.boot.version>
+ <cxf.spring.ldap.version>3.2.1</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
- <cxf.spring.security.version>6.0.8</cxf.spring.security.version>
- <cxf.spring.version>6.0.15</cxf.spring.version>
+ <cxf.spring.security.version>6.2.1</cxf.spring.security.version>
+ <cxf.spring.version>6.1.2</cxf.spring.version>
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>5.10.3</cxf.swagger.ui.version>
- <cxf.swagger.v3.version>2.2.19</cxf.swagger.v3.version>
+ <cxf.swagger.v3.version>2.2.20</cxf.swagger.v3.version>
<cxf.tika.version>2.7.0</cxf.tika.version>
<cxf.tomcat.version>10.1.17</cxf.tomcat.version>
<cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
@@@ -254,7 -251,7 +254,7 @@@
<cxf.dom4j.bundle.version>2.1.3_1</cxf.dom4j.bundle.version>
<cxf.fastinfoset.bundle.version>1.2.18_1</cxf.fastinfoset.bundle.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
- <cxf.istack.bundle.version>4.2.0</cxf.istack.bundle.version>
- <cxf.istack.version>3.0.12</cxf.istack.version>
++ <cxf.istack.version>4.2.0</cxf.istack.version>
<cxf.jakarta.angus.mail.version>1.0.0</cxf.jakarta.angus.mail.version>
<cxf.jakarta.angus.activation.version>2.0.1</cxf.jakarta.angus.activation.version>
<cxf.jasypt.bundle.version>1.9.3_1</cxf.jasypt.bundle.version>
