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 8e4647fcf646359485ff9c5fc05233bead0d95d2 Merge: 7339f6d3f2 d94f8f6c5e Author: Andriy Redko <[email protected]> AuthorDate: Wed Apr 10 12:38:08 2024 -0400 Merge remote-tracking branch 'origin/main' into CXF-8671 distribution/src/main/release/samples/pom.xml | 2 +- .../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 27 ++++-- parent/pom.xml | 4 +- .../apache/cxf/jaxrs/ext/search/Beanspector.java | 101 ++++++++++++--------- .../cxf/rs/security/jose/common/JoseConstants.java | 5 + .../apache/cxf/rs/security/jose/jwe/JweUtils.java | 5 +- .../jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java | 15 +++ .../security/jose/jwe/JwePbeHmacAesWrapTest.java | 34 +++++++ .../kerberos/wssec/kerberos/KerberosTokenTest.java | 4 + systests/microprofile/pom.xml | 2 +- 10 files changed, 143 insertions(+), 56 deletions(-) diff --cc parent/pom.xml index 92cd015e83,28907d34a9..e5ee9a5963 --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -192,11 -192,10 +192,11 @@@ <cxf.olingo.version>2.0.12</cxf.olingo.version> <cxf.openjpa.version>3.2.2</cxf.openjpa.version> <cxf.opentelemetry.version>1.34.1</cxf.opentelemetry.version> - <cxf.opentelemetry.semconv.version>1.24.0-alpha</cxf.opentelemetry.semconv.version> + <cxf.opentelemetry.semconv.version>1.25.0-alpha</cxf.opentelemetry.semconv.version> <cxf.opentracing.version>0.33.0</cxf.opentracing.version> <cxf.openwebbeans.version>2.0.27</cxf.openwebbeans.version> - <cxf.persistence-api.version>3.0.0</cxf.persistence-api.version> + <cxf.parsson.version>1.1.5</cxf.parsson.version> + <cxf.persistence-api.version>3.1.0</cxf.persistence-api.version> <cxf.plexus-archiver.version>4.9.2</cxf.plexus-archiver.version> <cxf.plexus-utils.version>3.5.1</cxf.plexus-utils.version> <cxf.reactivestreams.version>1.0.4</cxf.reactivestreams.version> @@@ -221,10 -220,10 +221,10 @@@ <cxf.swagger.ui.version>5.13.0</cxf.swagger.ui.version> <cxf.swagger.v3.version>2.2.21</cxf.swagger.v3.version> <cxf.tika.version>2.9.1</cxf.tika.version> - <cxf.tomcat.version>10.1.18</cxf.tomcat.version> + <cxf.tomcat.version>10.1.20</cxf.tomcat.version> <cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version> - <cxf.undertow.version>2.2.20.Final</cxf.undertow.version> - + <cxf.undertow.version>2.3.7.Final</cxf.undertow.version> + <cxf.yasson.version>3.0.3</cxf.yasson.version> <!-- the Export-Package is the same as the Maven artifact version (with the Final), but we don't want an import package with a version with a qualifier. We do want a range. -->
