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/06/04 02:37:28 UTC

(cxf) branch 3.5.x-fixes updated (231d37ed06 -> 12cb1ac7a7)

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 231d37ed06 Recording .gitmergeinfo Changes
     new 79a8f73fba Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#1903)
     new 198f9512c3 Bump org.webjars:swagger-ui from 5.17.11 to 5.17.14 (#1904)
     new a4c3e8f22b Bump github/codeql-action from 3.25.6 to 3.25.7 (#1907)
     new 9b6dc6f274 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.13.0 to 3.13.1 (#1909)
     new ea88d5540c Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 (#1910)
     new 8c3354d0ea CXF-9009: Async operations fails (netty-conduit) (#1868)
     new 84cc3cc034 Fix checkstyle violations (post-merge)
     new 899268235c Recording .gitmergeinfo Changes
     new 12cb1ac7a7 Fix Java 8 API usage (post-merge)

The 9 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                                      |  4 ++
 distribution/src/main/release/samples/pom.xml      |  2 +-
 parent/pom.xml                                     |  4 +-
 pom.xml                                            |  6 +--
 .../client/NettyHttpClientPipelineFactory.java     | 13 +++---
 .../http/netty/client/NettyHttpConduit.java        | 16 ++++---
 systests/transport-netty/pom.xml                   | 18 +++++---
 .../http2/netty}/jaxws/JAXWSAsyncClientTest.java   | 50 ++++++++++++++++++++--
 9 files changed, 88 insertions(+), 29 deletions(-)
 copy systests/{transport-hc5/src/test/java/org/apache/cxf/systest/hc5 => transport-netty/src/test/java/org/apache/cxf/systest/http2/netty}/jaxws/JAXWSAsyncClientTest.java (71%)


(cxf) 09/09: Fix Java 8 API usage (post-merge)

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 12cb1ac7a7222fc15b0b9ac5c47cc6a63b6d08a7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jun 3 22:34:58 2024 -0400

    Fix Java 8 API usage (post-merge)
---
 .../org/apache/cxf/systest/http2/netty/jaxws/JAXWSAsyncClientTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 1ddc1deee0..acb4fc1644 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
@@ -20,6 +20,7 @@
 package org.apache.cxf.systest.http2.netty.jaxws;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
@@ -138,7 +139,7 @@ public class JAXWSAsyncClientTest  extends AbstractBusClientServerTestBase {
         Greeter proxy = factory.create(Greeter.class);
 
         final Callable<Object> callable = () -> proxy.greetMeAsync("cxf", resp -> { }).get(5, TimeUnit.SECONDS);
-        final List<Future<Object>> futures = executor.invokeAll(List.of(callable, callable, callable));
+        final List<Future<Object>> futures = executor.invokeAll(Arrays.asList(callable, callable, callable));
 
         for (final Future<?> response: futures) {
             int waitCount = 0;


(cxf) 07/09: Fix checkstyle violations (post-merge)

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 84cc3cc0349b1f56dd12e6ecc673201bff79fa17
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jun 3 21:29:35 2024 -0400

    Fix checkstyle violations (post-merge)
    
    (cherry picked from commit 1a4c5067e22b83c6bd2989683b622916220f1afd)
---
 .../org/apache/cxf/systest/http2/netty/jaxws/JAXWSAsyncClientTest.java   | 1 +
 1 file changed, 1 insertion(+)

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 ab141b4201..1ddc1deee0 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
@@ -27,6 +27,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+
 import javax.jws.WebService;
 import javax.xml.ws.Response;
 import javax.xml.ws.soap.SOAPFaultException;


(cxf) 02/09: Bump org.webjars:swagger-ui from 5.17.11 to 5.17.14 (#1904)

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 198f9512c33e7bc2bb6b0e50f9766ed87ab62d57
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri May 31 15:08:47 2024 -0400

    Bump org.webjars:swagger-ui from 5.17.11 to 5.17.14 (#1904)
    
    Bumps [org.webjars:swagger-ui](https://github.com/swagger-api/swagger-ui) from 5.17.11 to 5.17.14.
    - [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.17.11...v5.17.14)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars:swagger-ui
      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 8cc050b21a33c6c917eb50d0785286a7a43f76df)
    (cherry picked from commit 13b1e78401d3d8def254331c2423a9da00c2c3e6)
    
    # Conflicts:
    #       parent/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 45be2e4efc..509aa4e4b3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
         <cxf.jetty9.version>9.4.54.v20240208</cxf.jetty9.version>
         <cxf.netty.version>4.1.109.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>5.17.11</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.17.14</cxf.swagger.ui.version>
         <cxf.tika.version>2.9.1</cxf.tika.version>
         <cxf.tomcat.version>9.0.89</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b0c5b5b7b..df05a9c6be 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -213,7 +213,7 @@
         <cxf.spring.security.version>5.7.12</cxf.spring.security.version>
         <cxf.spring.version>5.3.36</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>5.17.11</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.17.14</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.1.13</cxf.swagger.v3.version>
         <cxf.swagger2.version>1.6.11</cxf.swagger2.version>
         <cxf.swagger2.guava.version>31.1-jre</cxf.swagger2.guava.version>


(cxf) 08/09: 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 899268235cb1c185c57ea01ae129c269514c60ee
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jun 3 22:21:02 2024 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index eb5fab00f2..9411bb3fce 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -112,6 +112,7 @@ B 399a35267366297a4e2b9e7e8c53972edfa24591
 B 3a4465da89afbc929590559b11e994b697d5c119
 B 3b1c2fe16231f7844969981d92132464a9f99452
 B 3bd832d9d0efac926e59a613919604e9beb1efab
+B 3bea343258c084b3a80fd5d3ec0a11ab7f7c6607
 B 3c0519cb77f0a090851b0d480913330bec663cbf
 B 3c08e505cd219365a9473bd98a460c93041c358f
 B 3c0bc31cf4f6c754c21115b83c846ca17548817d
@@ -321,6 +322,7 @@ B a80d62290a1101621bb80beb3926a5348b73b2d2
 B a8bd24a6ef8269854e1d1a4fdc7c23c35ceb9bf2
 B a948ca8934c4e731ad6a9da9c7d0233101778f5a
 B aa732af19fc413a3d8efe09c272066180fdb8a52
+B aac1b45d795ecf5d56c733ae82860a8578d95d9b
 B aaf83088ca660871fb0d457b095c6239dac27719
 B ac13b2f6847fee944b843610f19e82b6013ec0d1
 B ac15d88752d507319e66b65da82c5d4045647e17
@@ -508,6 +510,7 @@ M 1272358a3cb94c981d9b29526b6f8818a754ec6a
 M 12a10e4b4a2c1b3c809bc7deb20dc4a74a7fde21
 M 1311a271f8ff9ed3e0a39cffa3a1694d68de174b
 M 132c8fce376a2bb08de5917207cd28531d7e2aff
+M 13b1e78401d3d8def254331c2423a9da00c2c3e6
 M 13c592c7bc7b6861f644e937b3bed555d3ee836b
 M 14d900254df9b7710588b498b85a530d28c090e0
 M 15063b0f08c66011f24f2d32352200736ee83710
@@ -651,6 +654,7 @@ M 53176f98f8259befa7864a0f7afe2875c86ecb70
 M 5341de3fa53845df2e3b34eba10adc1917f0ccb7
 M 538dcf9874147f5477fda43a1c5ffdbc02a7b3e1
 M 539186659b20b60db89b9cb0d4786480ed57aa12
+M 53ba81fbd3674cc3326c9c349a86b38271de3f3b
 M 5493624ac70af916217193398f64b80d73078524
 M 54b55ac35a101af792f3aa8e1598a200ef704c9e
 M 54f65e5b70deb43bd27a2a5ed728377afca54c8c


(cxf) 03/09: Bump github/codeql-action from 3.25.6 to 3.25.7 (#1907)

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 a4c3e8f22b0c831def00bad6a47c30c154b6e9a7
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jun 3 07:53:09 2024 -0400

    Bump github/codeql-action from 3.25.6 to 3.25.7 (#1907)
    
    Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.6 to 3.25.7.
    - [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/9fdb3e49720b44c48891d036bb502feb25684276...f079b8493333aace61c81488f8bd40919487bd9f)
    
    ---
    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 3194e058bde505738093191819de399e5bcb013c)
    
    # Conflicts:
    #       .github/workflows/scorecards.yml
    (cherry picked from commit 87c94eb52d6a06ed23948d8845b3c04c42ae88fd)
---
 .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 70000bb55e..6a1fe88a20 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -54,7 +54,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+      uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
       with:
         languages: ${{ matrix.language }}
         #config-file: ./.github/codeql/codeql-cxf-config.yml
@@ -82,4 +82,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+      uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7


(cxf) 06/09: CXF-9009: Async operations fails (netty-conduit) (#1868)

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 8c3354d0ea50886fe86020fc8b0b05d26a4fbdf7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jun 3 18:32:28 2024 -0400

    CXF-9009: Async operations fails (netty-conduit) (#1868)
    
    (cherry picked from commit 87f68a95dbe0738b75f70a6a2c7796b8988023de)
---
 .../client/NettyHttpClientPipelineFactory.java     |  13 +-
 .../http/netty/client/NettyHttpConduit.java        |  16 +-
 systests/transport-netty/pom.xml                   |  18 +-
 .../http2/netty/jaxws/JAXWSAsyncClientTest.java    | 182 +++++++++++++++++++++
 4 files changed, 211 insertions(+), 18 deletions(-)

diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientPipelineFactory.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientPipelineFactory.java
index be44b9c4ec..a39ff9ad51 100644
--- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientPipelineFactory.java
+++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpClientPipelineFactory.java
@@ -69,8 +69,11 @@ import io.netty.handler.ssl.util.SimpleKeyManagerFactory;
 import io.netty.handler.ssl.util.SimpleTrustManagerFactory;
 import io.netty.handler.stream.ChunkedWriteHandler;
 import io.netty.handler.timeout.ReadTimeoutHandler;
+import io.netty.util.AttributeKey;
 
 public class NettyHttpClientPipelineFactory extends ChannelInitializer<Channel> {
+    private static final String WHEN_READY_KEY = "WhenReady-Key";
+    private static final AttributeKey<ChannelFuture> WHEN_READY = AttributeKey.valueOf(WHEN_READY_KEY);
 
     private static final Logger LOG =
         LogUtils.getL7dLogger(NettyHttpClientPipelineFactory.class);
@@ -79,7 +82,6 @@ public class NettyHttpClientPipelineFactory extends ChannelInitializer<Channel>
     private final int readTimeout;
     private final int maxContentLength;
     private final boolean enableHttp2;
-    private ChannelPromise readyFuture;
 
     public NettyHttpClientPipelineFactory(TLSClientParameters clientParameters) {
         this(clientParameters, 0);
@@ -115,8 +117,9 @@ public class NettyHttpClientPipelineFactory extends ChannelInitializer<Channel>
         }
 
         final NettyHttpClientHandler responseHandler = new NettyHttpClientHandler();
-        readyFuture = ch.newPromise();
-        
+        final ChannelPromise readyFuture = ch.newPromise();
+        ch.attr(WHEN_READY).set(readyFuture);
+
         if (enableHttp2) {
             final Http2Connection connection = new DefaultHttp2Connection(false);
             final Http2SettingsHandler settingsHandler = new Http2SettingsHandler(readyFuture);
@@ -188,8 +191,8 @@ public class NettyHttpClientPipelineFactory extends ChannelInitializer<Channel>
         }
     }
 
-    public ChannelFuture whenReady() {
-        return readyFuture; 
+    ChannelFuture whenReady(Channel channel) {
+        return channel.attr(NettyHttpClientPipelineFactory.WHEN_READY).get();
     }
 
     private SslHandler configureClientSSLOnDemand(Channel channel) throws Exception {
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 6ba0675331..32e1946a18 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
@@ -458,15 +458,17 @@ public class NettyHttpConduit extends URLConnectionHTTPConduit implements BusLif
                         @Override
                         public void operationComplete(ChannelFuture future) throws Exception {
                             if (future.isSuccess()) {
-                                handler.whenReady().addListener(new ChannelFutureListener() {
-                                    @Override
-                                    public void operationComplete(ChannelFuture future) throws Exception {
-                                        if (future.isSuccess()) {
-                                            ChannelFuture channelFuture = future.channel().writeAndFlush(entity);
-                                            channelFuture.addListener(writeFailureListener);
+                                handler.whenReady(future.channel())
+                                    .addListener(new ChannelFutureListener() {
+                                        @Override
+                                        public void operationComplete(ChannelFuture future) throws Exception {
+                                            if (future.isSuccess()) {
+                                                ChannelFuture channelFuture = future.channel().writeAndFlush(entity);
+                                                channelFuture.addListener(writeFailureListener);
+                                            }
                                         }
                                     }
-                                });
+                                );
                             }
                         }
                     });
diff --git a/systests/transport-netty/pom.xml b/systests/transport-netty/pom.xml
index d6a02d6dae..a722eb5101 100644
--- a/systests/transport-netty/pom.xml
+++ b/systests/transport-netty/pom.xml
@@ -95,27 +95,32 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-core</artifactId>
-            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-databinding-jaxb</artifactId>
-            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-rs-client</artifactId>
-            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -140,7 +145,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-netty-client</artifactId>
-            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -192,6 +197,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
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
new file mode 100644
index 0000000000..ab141b4201
--- /dev/null
+++ b/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/jaxws/JAXWSAsyncClientTest.java
@@ -0,0 +1,182 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.http2.netty.jaxws;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import javax.jws.WebService;
+import javax.xml.ws.Response;
+import javax.xml.ws.soap.SOAPFaultException;
+
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.greeter_control.AbstractGreeterImpl;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.greeter_control.types.GreetMeResponse;
+import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.transport.http.HTTPConduit;
+
+import io.netty.handler.timeout.ReadTimeoutException;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class JAXWSAsyncClientTest  extends AbstractBusClientServerTestBase {
+    static final String PORT = allocatePort(Server.class);
+
+    public static class Server extends AbstractBusTestServerBase {
+
+        protected void run()  {
+            GreeterImpl implementor = new GreeterImpl();
+            String address = "http://localhost:" + PORT + "/SoapContext/GreeterPort";
+            javax.xml.ws.Endpoint.publish(address, implementor);
+        }
+
+        public static void main(String[] args) {
+            try {
+                Server s = new Server();
+                s.start();
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                System.exit(-1);
+            } finally {
+                System.out.println("done!");
+            }
+        }
+
+        @WebService(serviceName = "BasicGreeterService",
+                    portName = "GreeterPort",
+                    endpointInterface = "org.apache.cxf.greeter_control.Greeter",
+                    targetNamespace = "http://cxf.apache.org/greeter_control",
+                    wsdlLocation = "testutils/greeter_control.wsdl")
+        public class GreeterImpl extends AbstractGreeterImpl {
+            @Override
+            public String greetMe(String arg) {
+                if ("timeout".equalsIgnoreCase(arg)) {
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        // Do nothing
+                    }
+                }
+                
+                return super.greetMe(arg);
+            }
+        }
+    }
+
+
+    @BeforeClass
+    public static void startServers() throws Exception {
+        assertTrue("server did not launch correctly", launchServer(Server.class, true));
+    }
+
+    @AfterClass
+    public static void stopServers() throws Exception {
+        stopAllServers();
+    }
+
+    @Test
+    public void testAsyncClient() 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);
+        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());
+    }
+    
+    @Test
+    public void testAsyncClientConcurrently() throws Exception {
+        final ExecutorService executor = Executors.newFixedThreadPool(3);
+
+        // setup the feature by using JAXWS front-end API
+        JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
+        factory.setAddress("http://localhost:" + PORT + "/SoapContext/GreeterPort");
+        factory.setServiceClass(Greeter.class);
+        Greeter proxy = factory.create(Greeter.class);
+
+        final Callable<Object> callable = () -> proxy.greetMeAsync("cxf", resp -> { }).get(5, TimeUnit.SECONDS);
+        final List<Future<Object>> futures = executor.invokeAll(List.of(callable, callable, callable));
+
+        for (final Future<?> response: futures) {
+            int waitCount = 0;
+            while (!response.isDone() && waitCount < 15) {
+                Thread.sleep(1000);
+                waitCount++;
+            }
+        }
+
+        assertTrue("Response still not received.", futures.stream().allMatch(Future::isDone));
+        for (final Future<?> response: futures) {
+            assertThat(response.get(), is(not(nullValue())));
+        }
+        executor.shutdown();
+
+        assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void testTimeout() 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);
+        Greeter proxy = factory.create(Greeter.class);
+        
+        HTTPConduit cond = (HTTPConduit)((Client)proxy).getConduit();
+        cond.getClient().setReceiveTimeout(500);
+
+        try {
+            proxy.greetMeAsync("timeout").get();
+            fail("Should have faulted");
+        } catch (SOAPFaultException ex) {
+            fail("should not be a SOAPFaultException");
+        } catch (ExecutionException ex) {
+            //expected
+            assertTrue(ex.getCause().getClass().getName(),
+                       ex.getCause() instanceof IOException
+                       || ex.getCause() instanceof ReadTimeoutException);
+        }
+    }
+}


(cxf) 04/09: Bump org.apache.maven.plugins:maven-plugin-plugin from 3.13.0 to 3.13.1 (#1909)

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 9b6dc6f2742d93a07a04ede7fd4d643dafbfd4bd
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jun 3 07:53:43 2024 -0400

    Bump org.apache.maven.plugins:maven-plugin-plugin from 3.13.0 to 3.13.1 (#1909)
    
    Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.13.0 to 3.13.1.
    - [Release notes](https://github.com/apache/maven-plugin-tools/releases)
    - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.13.0...maven-plugin-tools-3.13.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-plugin-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 6d9ee67889fa2e002e95dc7a884ddb1c2df0fffb)
    (cherry picked from commit 48d58f7cf80aa5767b336b762e6234949cb0b8ae)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d1ad894d15..0a1d72886c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -564,7 +564,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>
-                    <version>3.13.0</version>
+                    <version>3.13.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>


(cxf) 05/09: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 (#1910)

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 ea88d5540c02bbd116b99548dcebe6737a3c30b4
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Jun 3 07:54:03 2024 -0400

    Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 (#1910)
    
    Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.3 to 3.7.0.
    - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
    - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.3...maven-javadoc-plugin-3.7.0)
    
    ---
    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 f5007a9386bc408a94876f4ee71992e019f18f3c)
    (cherry picked from commit 98868be4e02abf8831fba845dc043029e4722a2d)
---
 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 df05a9c6be..6b6538e5b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2043,7 +2043,7 @@
             <dependency>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.6.3</version>
+                <version>3.7.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ehcache</groupId>
diff --git a/pom.xml b/pom.xml
index 0a1d72886c..891b1d74dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,7 +467,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.3</version>
+                    <version>3.7.0</version>
                     <configuration>
                         <attach>true</attach>
                         <source>${cxf.jdk.version}</source>


(cxf) 01/09: Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#1903)

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 79a8f73fbaed75be0395cbd3dd4aacb7360216a5
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri May 31 08:06:21 2024 -0400

    Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#1903)
    
    Bumps [org.apache.maven.plugins:maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.4.1 to 3.5.0.
    - [Release notes](https://github.com/apache/maven-enforcer/releases)
    - [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.4.1...enforcer-3.5.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-enforcer-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 f3e2e6fc360d3c26ae489e552f60da6357479811)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    (cherry picked from commit 53ba81fbd3674cc3326c9c349a86b38271de3f3b)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ddb8502e9e..d1ad894d15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -646,7 +646,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.1</version>
+                    <version>3.5.0</version>
                     <configuration>
                         <rules>
                             <requireMavenVersion>