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 2024/11/07 23:53:32 UTC

(cxf) branch 3.6.x-fixes updated (636ddfbea1 -> f432d3bba9)

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

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


    from 636ddfbea1 Recording .gitmergeinfo Changes
     new 06384c041d Bump org.apache.maven.plugins:maven-surefire-report-plugin (#2136)
     new a80423cbc0 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#2138)
     new 758ee408db Fixes NPE if ClientImpl has been closed/destroyed before the end of invokation (#2140)
     new f432d3bba9 Recording .gitmergeinfo Changes

The 4 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:
 .gitmergeinfo                                              | 1 +
 core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java | 4 +++-
 parent/pom.xml                                             | 2 +-
 pom.xml                                                    | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)


(cxf) 02/04: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#2138)

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

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

commit a80423cbc008d25da4b0fc77946d6233c419193c
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Nov 6 08:34:35 2024 -0500

    Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#2138)
    
    Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.1 to 3.11.1.
    - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
    - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.1...maven-javadoc-plugin-3.11.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
      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 ed8519d0715d36d073a9639c75624aa22927698a)
    (cherry picked from commit cccb3c1818e8c01ca6c09548788686061f8f676e)
---
 parent/pom.xml | 2 +-
 pom.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 718eeed8dd..e00005a135 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1959,7 +1959,7 @@
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.1</version>
             </dependency>
             <dependency>
                 <groupId>org.ehcache</groupId>
diff --git a/pom.xml b/pom.xml
index 12397455ec..c1e95f89e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,7 +466,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.10.1</version>
+                    <version>3.11.1</version>
                     <configuration>
                         <attach>true</attach>
                         <source>${cxf.jdk.version}</source>


(cxf) 01/04: Bump org.apache.maven.plugins:maven-surefire-report-plugin (#2136)

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

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

commit 06384c041d5c4fb752c65c9e568713699703cedf
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Nov 5 07:41:16 2024 -0500

    Bump org.apache.maven.plugins:maven-surefire-report-plugin (#2136)
    
    Bumps [org.apache.maven.plugins:maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2.
    - [Release notes](https://github.com/apache/maven-surefire/releases)
    - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2)
    
    ---
    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 3b89b45947b7db23e3292d5c1fb7fb39c2df2738)
    (cherry picked from commit 0d229d388816475b56ad679d6c984444f603c889)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd1e944577..12397455ec 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.1</version>
+                    <version>3.5.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


(cxf) 04/04: 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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit f432d3bba923d9b18788aa7fa4aed20f723e1c90
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 7 18:37:26 2024 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 498a42340e..3b2c27c109 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -108,6 +108,7 @@ B 60aa618e06d0bbaadd7bc65d3cd3503673e53a6b
 B 60f00a123ee85f6865e24ee35a91e4ec6eced62c
 B 6266242cb5e720efdd0add51842ea953376494f9
 B 62726aec4d9b70547d948dd17974e95d101b2311
+B 62d5b11c0907c318c4972fcc578f1cf47424eb05
 B 630d7368e073d379227d48ff4797c23377dc5ebf
 B 634758b2e0352a489e39cb96c9b834369fcb444f
 B 647408469988d9e244086efc839b2f6ab5e42cd7


(cxf) 03/04: Fixes NPE if ClientImpl has been closed/destroyed before the end of invokation (#2140)

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

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

commit 758ee408db4db6c03ff5bf54b06f3a49f3909301
Author: Cédric Tabin <ta...@gmail.com>
AuthorDate: Thu Nov 7 18:51:48 2024 +0100

    Fixes NPE if ClientImpl has been closed/destroyed before the end of invokation (#2140)
    
    * Fixes NPE if ClientImpl has been closed/destroyed before the end of the invokation
    
    * Guard setResponseContext
    
    * Fixes checkstyle
    
    (cherry picked from commit c6c68177d0434a88ba35e0d9f1423b18c956acb7)
    (cherry picked from commit 2298ca78b6713ec0b28cc70bd3bf23ea5b432266)
---
 core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 2dea60e2ba..72097949a4 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -543,7 +543,9 @@ public class ClientImpl
                 Integer responseCode = (Integer)exchange.get(Message.RESPONSE_CODE);
                 resContext.put(MessageContext.HTTP_RESPONSE_CODE, responseCode);
                 resContext.put(org.apache.cxf.message.Message.RESPONSE_CODE, responseCode);
-                setResponseContext(resContext);
+                if (null != responseContext) {
+                    setResponseContext(resContext);
+                }
             }
             if (origLoader != null) {
                 origLoader.reset();