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 2025/04/05 21:14:02 UTC

(cxf) branch 4.0.x-fixes updated (7b75cdf8ea -> e83925f7fd)

This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


    from 7b75cdf8ea [CXF-9124]TransportURIResolver prints stack trace to stderr when using HTTP Authentication
     new 86e6668212 Bump net.sourceforge.pmd:pmd-core from 7.11.0 to 7.12.0 (#2341)
     new f15ca28e35 Bump com.puppycrawl.tools:checkstyle from 10.21.4 to 10.22.0 (#2343)
     new a929675771 Bump org.apache.maven.plugins:maven-surefire-report-plugin (#2342)
     new cf0354cadc Bump github/codeql-action from 3.28.12 to 3.28.13 (#2340)
     new 878305d416 Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.2 to 3.5.3 (#2345)
     new 0a0784455e Bump org.asynchttpclient:async-http-client from 3.0.1 to 3.0.2 (#2347)
     new 9af72c6182 Bump com.puppycrawl.tools:checkstyle from 10.22.0 to 10.23.0 (#2349)
     new 5f7daa89b0 Bump org.webjars:swagger-ui from 5.20.1 to 5.20.3 (#2350)
     new bc55664152 CXF-9121: LEAK: ByteBuf.release() was not called before it's garbage-collected (#2339)
     new 9c00f7ec5e Update Mockito to 5.17.0
     new f627b954d6 Recording .gitmergeinfo Changes
     new e83925f7fd Recording .gitmergeinfo Changes

The 12 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/codeql-analysis.yml                |  4 ++--
 .gitmergeinfo                                        |  9 +++++++++
 distribution/src/main/release/samples/pom.xml        |  4 ++--
 parent/pom.xml                                       | 10 +++++-----
 pom.xml                                              |  4 ++--
 .../http/netty/client/NettyHttpConduit.java          |  2 +-
 .../http2/netty/jaxws/JAXWSAsyncClientTest.java      | 20 ++++++++++++++++++++
 7 files changed, 41 insertions(+), 12 deletions(-)


(cxf) 07/12: Bump com.puppycrawl.tools:checkstyle from 10.22.0 to 10.23.0 (#2349)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 9af72c6182569b22bd1ddc5f1bcfcb22c106d411
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Apr 3 07:35:29 2025 -0400

    Bump com.puppycrawl.tools:checkstyle from 10.22.0 to 10.23.0 (#2349)
    
    Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.22.0 to 10.23.0.
    - [Release notes](https://github.com/checkstyle/checkstyle/releases)
    - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.22.0...checkstyle-10.23.0)
    
    ---
    updated-dependencies:
    - dependency-name: com.puppycrawl.tools:checkstyle
      dependency-version: 10.23.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit d2bd124875bb238bdafe49406090eeb4c5e3e628)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f4f47b7104..5c5f8893bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -393,7 +393,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>10.22.0</version>
+                            <version>10.23.0</version>
                         </dependency>
                     </dependencies>
                     <configuration>


(cxf) 01/12: Bump net.sourceforge.pmd:pmd-core from 7.11.0 to 7.12.0 (#2341)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 86e66682126b2d75faba34ad22ddd92fa8c6e48c
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 31 07:25:25 2025 -0400

    Bump net.sourceforge.pmd:pmd-core from 7.11.0 to 7.12.0 (#2341)
    
    Bumps [net.sourceforge.pmd:pmd-core](https://github.com/pmd/pmd) from 7.11.0 to 7.12.0.
    - [Release notes](https://github.com/pmd/pmd/releases)
    - [Changelog](https://github.com/pmd/pmd/blob/main/docs/render_release_notes.rb)
    - [Commits](https://github.com/pmd/pmd/compare/pmd_releases/7.11.0...pmd_releases/7.12.0)
    
    ---
    updated-dependencies:
    - dependency-name: net.sourceforge.pmd:pmd-core
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 1a4c3d2f3e4e865587d2144ab4df02c68f374189)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 3706c16326..357e22b043 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -431,7 +431,7 @@
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-core</artifactId>
-                            <version>7.11.0</version>
+                            <version>7.12.0</version>
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>


(cxf) 08/12: Bump org.webjars:swagger-ui from 5.20.1 to 5.20.3 (#2350)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 5f7daa89b0aa93f7c3212f42eeac25c294fd0ecd
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Apr 3 13:08:56 2025 -0400

    Bump org.webjars:swagger-ui from 5.20.1 to 5.20.3 (#2350)
    
    Bumps [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) from 5.20.1 to 5.20.3.
    - [Release notes](https://github.com/swagger-api/swagger-ui/releases)
    - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc)
    - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.20.1...v5.20.3)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars:swagger-ui
      dependency-version: 5.20.3
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 842957ece9761b2cd23946cdd82f4a3a77de3e0f)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index d5ae36e583..bbb46400ee 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -36,7 +36,7 @@
         <cxf.jetty11.version>11.0.25</cxf.jetty11.version>
         <cxf.netty.version>4.1.119.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>5.20.1</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.20.3</cxf.swagger.ui.version>
         <cxf.tika.version>2.9.1</cxf.tika.version>
         <cxf.tomcat.version>10.1.35</cxf.tomcat.version>
         <cxf.jboss.weld.version>4.0.3.Final</cxf.jboss.weld.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 5c5f8893bf..8f96cc61a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,7 +216,7 @@
         <cxf.spring.security.version>6.1.9</cxf.spring.security.version>
         <cxf.spring.version>6.0.23</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>5.20.1</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.20.3</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.2.29</cxf.swagger.v3.version>
         <cxf.tika.version>2.9.1</cxf.tika.version>
         <cxf.tomcat.version>10.1.35</cxf.tomcat.version>


(cxf) 10/12: Update Mockito to 5.17.0

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 9c00f7ec5e14d1bdecda742e8bb4d5c5f6fbea20
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Apr 5 11:21:22 2025 -0400

    Update Mockito to 5.17.0
    
    (cherry picked from commit 44187e59b8e7e744953bc1bcc56d115e35231efa)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 8f96cc61a4..50d256cd60 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -182,7 +182,7 @@
         <cxf.microprofile.rest.client.version>3.0.1</cxf.microprofile.rest.client.version>
         <cxf.microprofile.openapi.version>3.0</cxf.microprofile.openapi.version>
         <cxf.mina.version>2.2.4</cxf.mina.version>
-        <cxf.mockito.version>5.16.1</cxf.mockito.version>
+        <cxf.mockito.version>5.17.0</cxf.mockito.version>
         <cxf.msv.version>2022.7</cxf.msv.version>
         <cxf.neethi.version>3.2.1</cxf.neethi.version>
         <cxf.netty.version.range>[4,5)</cxf.netty.version.range>


(cxf) 09/12: CXF-9121: LEAK: ByteBuf.release() was not called before it's garbage-collected (#2339)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit bc556641529cdd12193181af334466a81913c44d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Apr 5 10:31:23 2025 -0400

    CXF-9121: LEAK: ByteBuf.release() was not called before it's garbage-collected (#2339)
    
    (cherry picked from commit b200e8ac644bfc41f3a2ec095e41e5afd774fc11)
---
 .../http/netty/client/NettyHttpConduit.java          |  2 +-
 .../http2/netty/jaxws/JAXWSAsyncClientTest.java      | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index de55fdbd30..9cbfc95d73 100644
--- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -611,7 +611,7 @@ public class NettyHttpConduit extends HttpClientHTTPConduit implements BusLifeCy
 
         @Override
         protected InputStream getInputStream() throws IOException {
-            return new ByteBufInputStream(getHttpResponseContent().content());
+            return new ByteBufInputStream(getHttpResponseContent().content(), true);
         }
 
         @Override
diff --git a/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/jaxws/JAXWSAsyncClientTest.java b/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/jaxws/JAXWSAsyncClientTest.java
index 183f8e1f63..5fdb455e26 100644
--- a/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/jaxws/JAXWSAsyncClientTest.java
+++ b/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/jaxws/JAXWSAsyncClientTest.java
@@ -32,6 +32,7 @@ import jakarta.jws.WebService;
 import jakarta.xml.ws.Response;
 import jakarta.xml.ws.soap.SOAPFaultException;
 import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.ext.logging.LoggingFeature;
 import org.apache.cxf.greeter_control.AbstractGreeterImpl;
 import org.apache.cxf.greeter_control.Greeter;
 import org.apache.cxf.greeter_control.types.GreetMeResponse;
@@ -179,4 +180,23 @@ public class JAXWSAsyncClientTest  extends AbstractBusClientServerTestBase {
                        || ex.getCause() instanceof ReadTimeoutException);
         }
     }
+
+    @Test
+    public void testAsyncClientWithLogging() throws Exception {
+        // setup the feature by using JAXWS front-end API
+        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
+        factory.setAddress("http://localhost:" + PORT + "/SoapContext/GreeterPort");
+        factory.setServiceClass(Greeter.class);
+        factory.setFeatures(List.of(new LoggingFeature()));
+        Greeter proxy = factory.create(Greeter.class);
+
+        Response<GreetMeResponse>  response = proxy.greetMeAsync("cxf");
+        int waitCount = 0;
+        while (!response.isDone() && waitCount < 15) {
+            Thread.sleep(1000);
+            waitCount++;
+        }
+        
+        assertTrue("Response still not received.", response.isDone());
+    }
 }


(cxf) 05/12: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.2 to 3.5.3 (#2345)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 878305d41699f2769efb027b475e2b22f7c6028a
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Apr 1 07:27:13 2025 -0400

    Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.2 to 3.5.3 (#2345)
    
    Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.2 to 3.5.3.
    - [Release notes](https://github.com/apache/maven-surefire/releases)
    - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.2...surefire-3.5.3)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-surefire-plugin
      dependency-version: 3.5.3
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 5f7b931bebb9592ef9e15b9d780f3ff22f6fa161)
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 pom.xml                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 61a3a420a0..d5ae36e583 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -224,7 +224,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.5.2</version>
+                    <version>3.5.3</version>
                 </plugin>
                 <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index c9231171bb..8d44b02a2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -484,7 +484,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.5.2</version>
+                    <version>3.5.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


(cxf) 06/12: Bump org.asynchttpclient:async-http-client from 3.0.1 to 3.0.2 (#2347)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 0a0784455e30b8b8eb904ffb6b13f92aed616b04
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Apr 1 07:28:13 2025 -0400

    Bump org.asynchttpclient:async-http-client from 3.0.1 to 3.0.2 (#2347)
    
    Bumps [org.asynchttpclient:async-http-client](https://github.com/AsyncHttpClient/async-http-client) from 3.0.1 to 3.0.2.
    - [Release notes](https://github.com/AsyncHttpClient/async-http-client/releases)
    - [Changelog](https://github.com/AsyncHttpClient/async-http-client/blob/main/CHANGES.md)
    - [Commits](https://github.com/AsyncHttpClient/async-http-client/compare/async-http-client-project-3.0.1...async-http-client-project-3.0.2)
    
    ---
    updated-dependencies:
    - dependency-name: org.asynchttpclient:async-http-client
      dependency-version: 3.0.2
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 62e23148a7a7435eb874965f76fa098613814dc4)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index fc478f6cb0..f4f47b7104 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,7 @@
 
         <!-- please maintain alphabetical order here -->
         <cxf.activemq.artemis.version>2.39.0</cxf.activemq.artemis.version>
-        <cxf.ahc.version>3.0.1</cxf.ahc.version>
+        <cxf.ahc.version>3.0.2</cxf.ahc.version>
         <cxf.arquillian.version>1.8.1.Final</cxf.arquillian.version>
         <cxf.arquillian.weld.container.version>3.0.0.Final</cxf.arquillian.weld.container.version>
         <cxf.aspectj.version>1.9.23</cxf.aspectj.version>


(cxf) 02/12: Bump com.puppycrawl.tools:checkstyle from 10.21.4 to 10.22.0 (#2343)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f15ca28e354cb050e6529de032fde93a41c0e19d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 31 12:44:43 2025 -0400

    Bump com.puppycrawl.tools:checkstyle from 10.21.4 to 10.22.0 (#2343)
    
    Bumps [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle) from 10.21.4 to 10.22.0.
    - [Release notes](https://github.com/checkstyle/checkstyle/releases)
    - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-10.21.4...checkstyle-10.22.0)
    
    ---
    updated-dependencies:
    - dependency-name: com.puppycrawl.tools:checkstyle
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 6df95f38f9fdcbca90a8089a662da75f79def752)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 357e22b043..fc478f6cb0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -393,7 +393,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>10.21.4</version>
+                            <version>10.22.0</version>
                         </dependency>
                     </dependencies>
                     <configuration>


(cxf) 12/12: Recording .gitmergeinfo Changes

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit e83925f7fdd4d980bafbacf5bcb382130a762893
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Apr 5 17:13:46 2025 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 60786b46ae..a789f1e44f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -307,6 +307,7 @@ M ace3b1901cb64a6f98e51dc9bbffe7cbeb4f4c1c
 M adc03075632112696a69b992ac1a7cb117a3889c
 M ae53e58f4924d53ef22e73175232b08a160bae25
 M af232b8eae217295823e399396f1567493c262ab
+M af589b8ec039ee62997936fdf78bba6f413bf5f0
 M af7038490d5685a456d9f7e9e424a228416d1bf5
 M af85f026d6c57aa79263e46657aba7e5d2d590ea
 M affbe9a07091190130fa3e44975a3e3d952bea72


(cxf) 11/12: Recording .gitmergeinfo Changes

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f627b954d6fa2c7728fef81b75044d0dc7924623
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Apr 5 17:11:22 2025 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index acfeffd54e..60786b46ae 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -64,6 +64,8 @@ M 22b4825062439d0494b399d1ed89ba978450c81b
 M 22bd868f6b57b1121e2542e2d8e60f86c26c54b0
 M 234eab1d3505bd892f0517a2f6b9bc512475facf
 M 23fe6df440bb1718a46d2499a253b1b7b421a73d
+M 25269d19b3b94a38ba463f107b6f6858ab01f5cb
+M 25d9a390d83b9a8eb3b8aba7b7ea27f9b2460e22
 M 261528901c836356beff20d53db97a7d9d629ea8
 M 26426e6870a81442ce9fd62824fe5c3e23d229bd
 M 283c8616ddfe26dd38906fd3a7451f33a03fb950
@@ -121,6 +123,7 @@ M 40fdadbdd3dfb3d4d8a1ea179b47faf45f8be6d6
 M 415869c2eeba4d814677ab447df81d41c110f6ed
 M 432487e9e45c24d9f4fc8246fb92298a0e8db765
 M 436721d94079bf5b91a18e37bdcbf3fb7560d270
+M 44187e59b8e7e744953bc1bcc56d115e35231efa
 M 444e480e92412407e2c17f60b5ab6c493157a9f3
 M 446a06489e4a8d9e1f84157abb4c0ff4e0dd93dc
 M 4490c7cfd23b4afebc65ecf3e423bbae9abc2ed3
@@ -177,6 +180,7 @@ M 60273e60cbd10d75c36aa2dd712d49c04bbe5b28
 M 60d308c3d5aefabbc150aa698882b050b513ba96
 M 61ee24c505d0225fdb57a8332f4c5edb2fcaa664
 M 62495cd1415f6073b12dea8a0c4d4248188ca63f
+M 62e23148a7a7435eb874965f76fa098613814dc4
 M 634cf811939ab89979fa8be7c9d0a05a739356d8
 M 650a19442a78b2bb330212bb680ed94c486c3e95
 M 65c4e43d7c33a926bea2c493b7f9fb652c04baa0
@@ -223,6 +227,7 @@ M 7c4b82edbbbe2589ac098991d096183718cff929
 M 7cdfacdb8840c440cedc23b26e2a15f5d544e9eb
 M 7e7bccecbdbdd1669578dfeb157b635f1588fa2d
 M 7f33a57480f7377bc1c7be9f281e9905a2df9792
+M 7fad171d335ae28bd8709eb6ad8d01766c0d1be8
 M 80e803bc50256fd0f1b5a371658fa09e6265a6fa
 M 81115252cc4815c383c5713795f41fe7a9b6dc2f
 M 81411744866170442147022698e9ed6ca7153860
@@ -230,6 +235,7 @@ M 81a3dc73acf4bb5ec52099ab65137662984dea85
 M 81f2683bfe081b44514a57bb80f0b1ca4986742e
 M 82bea1f66a38bf11efaeae776566baa796d841a4
 M 8412ed8a29be3d0ae1481d7344c7a296ea42494b
+M 842957ece9761b2cd23946cdd82f4a3a77de3e0f
 M 847055984da12293aa6b3c2fe1dfe4845200dff9
 M 84a53f9c81fcbb87e0286c9e6df75853c09cd93b
 M 8588de147e96abfc5852645768a11bebde53a851
@@ -314,6 +320,7 @@ M b39a7bd570f32b1b5298636bad48d925c33f1e35
 M b3dff1fec1fc923e9f341c6e38d8b7146685863c
 M b4c84facc9ccaad04eecce6bb489e899ab6fb050
 M b4e1c830697e3e7e1a13ee943cffee8daba6da69
+M b634966917a71e79ce65bc6fa40a1ae1453ae316
 M b660f71147311745fb7aee2e8834f30d12e98037
 M b6d1e6978bdea139d6d093656f92979b7d6cb204
 M b8cf8adf5842b98e6a2cac53a40a7aba414e13a0
@@ -383,6 +390,7 @@ M df3b6880152358d4357867cc091ce72b88e8d752
 M dfab9996b015d1dbef4bf7c953fe17cbe94feec9
 M dfccd9b9ffa46612cd2f08332e81c212c21bcc01
 M dfe46604f08d402abe750812ae81a4704639ba95
+M dfe5b5870f9d9f437106d948d3ff750bb77767f7
 M dfe8bc122f2f88804f086dc864feaf14046070b2
 M e094bb4e318597c15c53711997aa109d60f3b1cd
 M e17b6d78ec2e46cbdb7f7760d12ede92c5a63b2f


(cxf) 04/12: Bump github/codeql-action from 3.28.12 to 3.28.13 (#2340)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit cf0354cadcf0187df4d8ecfb89d345c9c58f3e59
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 31 12:45:17 2025 -0400

    Bump github/codeql-action from 3.28.12 to 3.28.13 (#2340)
    
    Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.12 to 3.28.13.
    - [Release notes](https://github.com/github/codeql-action/releases)
    - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/github/codeql-action/compare/5f8171a638ada777af81d42b55959a643bb29017...1b549b9259bda1cb5ddde3b41741a82a2d15a841)
    
    ---
    updated-dependencies:
    - dependency-name: github/codeql-action
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 25d9a390d83b9a8eb3b8aba7b7ea27f9b2460e22)
    
    # Conflicts:
    #       .github/workflows/scorecards.yml
---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6051967303..83533dfbfa 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+      uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
       with:
         languages: java
         #config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -72,4 +72,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+      uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13


(cxf) 03/12: Bump org.apache.maven.plugins:maven-surefire-report-plugin (#2342)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit a929675771999c4b029aa4946073f60a4633e0ad
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Mar 31 12:45:00 2025 -0400

    Bump org.apache.maven.plugins:maven-surefire-report-plugin (#2342)
    
    Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.5.2 to 3.5.3.
    - [Release notes](https://github.com/apache/maven-surefire/releases)
    - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.2...surefire-3.5.3)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 23057ed97f7479e94282df7279c1700c824c7fb0)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3283a169da..c9231171bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -553,7 +553,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>3.5.2</version>
+                    <version>3.5.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>