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 2023/10/28 00:54:11 UTC

(cxf) branch 3.5.x-fixes updated (bb8034d5d1 -> c68d2b8811)

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

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


    from bb8034d5d1 Recording .gitmergeinfo Changes
     new 79d2a8c30e Bump io.opentelemetry.semconv:opentelemetry-semconv (#1494)
     new bf8775ecdc [JAX-WS] The client out interceptor chain is not called in case of oneway operation (fix exchange and interceptor chain issues)
     new c68d2b8811 Recording .gitmergeinfo Changes

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


(cxf) 02/03: [JAX-WS] The client out interceptor chain is not called in case of oneway operation (fix exchange and interceptor chain issues)

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

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

commit bf8775ecdc6d37e0d091df455cb833115ddc54b6
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Oct 27 20:46:36 2023 -0400

    [JAX-WS] The client out interceptor chain is not called in case of oneway operation (fix exchange and interceptor chain issues)
    
    (cherry picked from commit 5cd30df44e67317dcaf6fbabdd0ffb0752fdf6a4)
---
 core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 2bee3982ae..2dea60e2ba 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -707,7 +707,6 @@ public class ClientImpl
         }
 
         final Message message = endpoint.getBinding().createMessage(original);
-        message.getExchange().setInMessage(message);
         message.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
         message.put(Message.INBOUND_MESSAGE, Boolean.TRUE);
         PhaseManager pm = bus.getExtension(PhaseManager.class);
@@ -758,7 +757,7 @@ public class ClientImpl
         }
     }
     
-    private List<Interceptor<? extends Message>> filterOneway(List<Interceptor<? extends Message>> interceptors) {
+    private List<Interceptor<? extends Message>> filterOneway(Collection<Interceptor<? extends Message>> interceptors) {
         return interceptors
             .stream()
             .filter(OneWayInterceptor.class::isInstance)
@@ -1122,7 +1121,7 @@ public class ClientImpl
         Collection<Interceptor<? extends Message>> is
             = CastUtils.cast((Collection<?>)ctx.get(Message.IN_INTERCEPTORS));
         if (is != null) {
-            chain.add(is);
+            chain.add(filterOneway(is));
         }
     }
 


(cxf) 01/03: Bump io.opentelemetry.semconv:opentelemetry-semconv (#1494)

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

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

commit 79d2a8c30ea9ed74b33333b159f71380ab1ea751
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Oct 27 07:55:40 2023 -0400

    Bump io.opentelemetry.semconv:opentelemetry-semconv (#1494)
    
    Bumps [io.opentelemetry.semconv:opentelemetry-semconv](https://github.com/open-telemetry/semantic-conventions-java) from 1.21.0-alpha to 1.22.0-alpha.
    - [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases)
    - [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits)
    
    ---
    updated-dependencies:
    - dependency-name: io.opentelemetry.semconv:opentelemetry-semconv
      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 437f688f1b5823542fae46033b9e8fc756e30fd2)
    (cherry picked from commit c4268b373b7e7f868786c26f81f4ccee5f550211)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 955031ab66..4e8fca6861 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,7 +186,7 @@
         <cxf.opensaml.osgi.version.range>[3.1,4)</cxf.opensaml.osgi.version.range>
         <cxf.opensaml.osgi.version>3.4.6_3</cxf.opensaml.osgi.version>
         <cxf.opentelemetry.version>1.31.0</cxf.opentelemetry.version>
-        <cxf.opentelemetry.semconv.version>1.21.0-alpha</cxf.opentelemetry.semconv.version>
+        <cxf.opentelemetry.semconv.version>1.22.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>2.2.3</cxf.persistence-api.version>


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

commit c68d2b88115b34de52167662d3c497e6cd028d23
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Oct 27 20:47:17 2023 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2c29213769..f6995f2158 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -149,6 +149,7 @@ B 5d6eedf32fd49a7f9cedc916084ad44dbec74846
 B 5e7433512c2b4ca1d0dc3329926ed154e9678924
 B 5e7f4272c98df43c37a7a96bbf3cbb3a321cb871
 B 6106da5e1fe9d83814806b3b76be4837dfae85a3
+B 6122ba337ea4a61c79d0bae3565f0ecbe10f32f5
 B 61aedf5441c7d266cb07e8bf19c572b07f585ef1
 B 62c0b2858d0cbd437e436b37c32cf686f424c909
 B 6374b6439d18c521d232de0b28e43b5eb5e45f23
@@ -493,6 +494,7 @@ M 4b51a9540867466a4e966df9f6e15387919da7bc
 M 4e25650e84daa3293ce20c65b572b8f7de05c8a8
 M 4ef710250f5bb21bbcd3c5fd672543b06c1acb73
 M 4f128130f7ce73089f2cc7079beb3e608dbe2af9
+M 4f5b943e7286fa562d563a6224c6a099e8aadc0f
 M 4f5cb0b82ca992b2c996770f0ebe88749b73ea73
 M 50bb0d6a83c2fbfac7b3f0e0d4d14a2a7535f680
 M 512d8c7050eaf9696e73eaf029760fe12a65a5d3