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/09/08 02:29:47 UTC

[cxf] branch 3.5.x-fixes updated (f79fda70a4 -> dd6b536587)

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 f79fda70a4 CXF-8920: use the same approach with Temporal.class.isAssignableFrom check as used for non-collection fields to recognize and convert temporal values (#1408)
     new 4b891c38a1 Bump io.github.openfeign:feign-httpclient from 12.4 to 12.5 (#1407)
     new 78a88d73f0 Bump io.github.openfeign:feign-core from 12.4 to 12.5 (#1405)
     new c11a648886 [StepSecurity] ci: Harden GitHub Actions (#1414)
     new 64241099d7 Bump actions/setup-java from 3.10.0 to 3.12.0 (#1416)
     new 40470dc3c0 Bump actions/checkout from 3.4.0 to 4.0.0 (#1420)
     new 631f5cdc74 Bump cxf.aspectj.version from 1.9.20 to 1.9.20.1 (#1421)
     new ba3e299070 Bump org.webjars:swagger-ui from 5.4.2 to 5.6.1 (#1423)
     new f2d318ccac [CXF-8925] Prevent double logging on fault in out chain (#1426)
     new b43740b5d7 Update Wiremock to 2.35.1
     new 31bc2a98a0 Recording .gitmergeinfo Changes
     new dd6b536587 Update Wiremock to 2.35.1

The 11 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              |  7 ++-
 .github/workflows/pull-request-build.yml           | 28 +++++++++
 .gitmergeinfo                                      | 23 ++++++++
 .../samples/jax_rs/tracing_opentelemetry/pom.xml   |  4 +-
 .../samples/jax_rs/tracing_opentracing/pom.xml     |  4 +-
 distribution/src/main/release/samples/pom.xml      |  4 +-
 parent/pom.xml                                     |  6 +-
 .../cxf/ext/logging/LoggingOutInterceptor.java     |  5 ++
 .../java/org/apache/cxf/ext/logging/FaultTest.java | 69 ++++++++++++++++++++++
 .../apache/cxf/ext/logging/LogEventSenderMock.java | 13 +++-
 rt/rs/microprofile-client/pom.xml                  |  2 +-
 systests/jaxrs/pom.xml                             |  2 +-
 systests/microprofile/client/async/pom.xml         |  2 +-
 systests/microprofile/client/nocdi/pom.xml         |  2 +-
 14 files changed, 154 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/pull-request-build.yml
 create mode 100644 rt/features/logging/src/test/java/org/apache/cxf/ext/logging/FaultTest.java


[cxf] 07/11: Bump org.webjars:swagger-ui from 5.4.2 to 5.6.1 (#1423)

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 ba3e299070003fe692dcba2021314ca55e77e293
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Sep 7 16:53:15 2023 -0400

    Bump org.webjars:swagger-ui from 5.4.2 to 5.6.1 (#1423)
    
    Bumps [org.webjars:swagger-ui](https://github.com/webjars/swagger-ui) from 5.4.2 to 5.6.1.
    - [Commits](https://github.com/webjars/swagger-ui/compare/swagger-ui-5.4.2...swagger-ui-5.6.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars:swagger-ui
      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 b44d82d3496cfd27e920b81c563c06aa4f7763e4)
    (cherry picked from commit 19e4039acfa543f8e2ddadc6378b07fd04a4a422)
    
    # 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 50573c0464..5ccce71b9d 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.52.v20230823</cxf.jetty9.version>
         <cxf.netty.version>4.1.97.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>5.4.2</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.6.1</cxf.swagger.ui.version>
         <cxf.tika.version>2.7.0</cxf.tika.version>
         <cxf.tomcat.version>9.0.80</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9228173336..cfd0d0320d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -212,7 +212,7 @@
         <cxf.spring.security.version>5.6.12</cxf.spring.security.version>
         <cxf.spring.version>5.3.29</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>5.4.2</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.6.1</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] 11/11: Update Wiremock to 2.35.1

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 dd6b5365872e7bdb49e2a846decdcc34bd9b3e49
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Sep 7 22:29:26 2023 -0400

    Update Wiremock to 2.35.1
---
 rt/rs/microprofile-client/pom.xml | 2 +-
 systests/jaxrs/pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml
index 121dc6cc59..4ff854fa5b 100644
--- a/rt/rs/microprofile-client/pom.xml
+++ b/rt/rs/microprofile-client/pom.xml
@@ -189,7 +189,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-jre8</artifactId>
             <version>${cxf.wiremock.version}</version>
             <scope>test</scope>
             <exclusions>
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 53e1216468..7b06a66440 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -536,7 +536,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-jre8</artifactId>
             <version>${cxf.wiremock.version}</version>
             <scope>test</scope>
             <exclusions>


[cxf] 04/11: Bump actions/setup-java from 3.10.0 to 3.12.0 (#1416)

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 64241099d7536f1959c77b95f1309e6afb2a0c89
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Sep 4 09:57:44 2023 -0400

    Bump actions/setup-java from 3.10.0 to 3.12.0 (#1416)
    
    Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.10.0 to 3.12.0.
    - [Release notes](https://github.com/actions/setup-java/releases)
    - [Commits](https://github.com/actions/setup-java/compare/v3.10.0...cd89f46ac9d01407894225f350157564c9c7cee2)
    
    ---
    updated-dependencies:
    - dependency-name: actions/setup-java
      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 2f05ce4f502106063af8a4c06549bcdc05540e27)
    
    # Conflicts:
    #       .github/workflows/codeql-analysis.yml
    (cherry picked from commit 915d86f9f691b958cccea00611224a4853572416)
---
 .github/workflows/codeql-analysis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cf03f96e45..9a6cb0775b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,6 +35,11 @@ jobs:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
+    - name: Setup JDK 11
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      with:
+        distribution: 'temurin'
+        java-version: '11'
     - name: Cache local Maven repository
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:


[cxf] 05/11: Bump actions/checkout from 3.4.0 to 4.0.0 (#1420)

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 40470dc3c0f10e5f735ace8d2e4f74ad82476d78
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Sep 4 17:56:19 2023 -0400

    Bump actions/checkout from 3.4.0 to 4.0.0 (#1420)
    
    Bumps [actions/checkout](https://github.com/actions/checkout) from 3.4.0 to 4.0.0.
    - [Release notes](https://github.com/actions/checkout/releases)
    - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/actions/checkout/compare/v3.4.0...3df4ab11eba7bda6032a0b82a6bb43b11571feac)
    
    ---
    updated-dependencies:
    - dependency-name: actions/checkout
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit d93a3befba6e8d507f395cf7514f2fd4edcd3a8c)
    
    # Conflicts:
    #       .github/workflows/codeql-analysis.yml
    #       .github/workflows/pull-request-build.yml
    #       .github/workflows/scorecards.yml
    (cherry picked from commit b3c8e0b661509bc40a708698269d37ee727e7c6c)
---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9a6cb0775b..39603a814e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@24cb9080177205b6e8c946b17badbe402adc938f # v3.4.0
+      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.


[cxf] 02/11: Bump io.github.openfeign:feign-core from 12.4 to 12.5 (#1405)

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 78a88d73f07d78b266f8cb5e5ca94cf2fdaf1c97
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Aug 30 10:32:42 2023 -0400

    Bump io.github.openfeign:feign-core from 12.4 to 12.5 (#1405)
    
    Bumps [io.github.openfeign:feign-core](https://github.com/openfeign/feign) from 12.4 to 12.5.
    - [Release notes](https://github.com/openfeign/feign/releases)
    - [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/openfeign/feign/compare/12.4...12.5)
    
    ---
    updated-dependencies:
    - dependency-name: io.github.openfeign:feign-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 ab9c703f06108ce8cacc475f68f426ca5a0bbdaa)
    (cherry picked from commit 1689d5c842ddde6088e4f1a071ea69c45aaa60db)
---
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml       | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index 7fedcc51d3..f4002209b5 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -130,7 +130,7 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>12.4</version>
+            <version>12.5</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index dd87eef215..b9d084e952 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>12.4</version>
+            <version>12.5</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>


[cxf] 01/11: Bump io.github.openfeign:feign-httpclient from 12.4 to 12.5 (#1407)

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 4b891c38a137a5a5b4fd43792e29d39abb82acf7
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Aug 30 10:32:17 2023 -0400

    Bump io.github.openfeign:feign-httpclient from 12.4 to 12.5 (#1407)
    
    Bumps [io.github.openfeign:feign-httpclient](https://github.com/openfeign/feign) from 12.4 to 12.5.
    - [Release notes](https://github.com/openfeign/feign/releases)
    - [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/openfeign/feign/compare/12.4...12.5)
    
    ---
    updated-dependencies:
    - dependency-name: io.github.openfeign:feign-httpclient
      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 2d4464ecdf669ce480c6e8e148129bdb1f1662df)
    (cherry picked from commit 7d770b79666e434b5b58723220c452a3c2009e8f)
---
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml       | 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index 88c38f708d..7fedcc51d3 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-httpclient</artifactId>
-            <version>12.4</version>
+            <version>12.5</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign.opentracing</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
index 4f79add941..dd87eef215 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/pom.xml
@@ -139,7 +139,7 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-httpclient</artifactId>
-            <version>12.4</version>
+            <version>12.5</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign.opentracing</groupId>


[cxf] 03/11: [StepSecurity] ci: Harden GitHub Actions (#1414)

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 c11a64888662f2e5bc49e09a01c363ec6438d67c
Author: StepSecurity Bot <bo...@stepsecurity.io>
AuthorDate: Fri Sep 1 00:07:25 2023 -0700

    [StepSecurity] ci: Harden GitHub Actions (#1414)
    
    Signed-off-by: StepSecurity Bot <bo...@stepsecurity.io>
    (cherry picked from commit 3a5bf6699e32c4831f3a952535190df3da6fe1fa)
    
    # Conflicts:
    #       .github/workflows/pull-request-build.yml
    (cherry picked from commit 806b0be50b703fd6f7292a0afc716b1f7612b896)
    
    # Conflicts:
    #       .github/workflows/pull-request-build.yml
---
 .github/workflows/pull-request-build.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
new file mode 100644
index 0000000000..112420fdbe
--- /dev/null
+++ b/.github/workflows/pull-request-build.yml
@@ -0,0 +1,28 @@
+name: "Build and Test"
+
+on:
+  pull_request:
+    branches: ['3.5.x-fixes']
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read  
+      pull-requests: read
+    timeout-minutes: 130
+    steps:
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - name: Set up JDK 8
+        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: maven
+      - name: Build with Apache Maven
+        run: mvn -U clean install -Djava.awt.headless=true -fae -B -Peverything
+    env: 
+       MAVEN_OPTS: "-Xmx1024M"


[cxf] 10/11: 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 31bc2a98a04af622b10201b6b93eee4382ebd7a7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Sep 7 22:03:20 2023 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8a99f448c8..4d1d06c970 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -93,11 +93,13 @@ B 40c04c10f9cc5855d9170828b32c4169ff7ab00d
 B 44919916b3747beb059cadd95a34e0bf15202a0d
 B 44b60ff6a49811ebfe2cd94b6aff64e785bd3767
 B 450be91e2fa03528baae61006a188d3624c19565
+B 453287d2990a2b417b498ddf178f05d6b5e475da
 B 45f87b690fb702336e751bfba0dc1c4d317780d3
 B 493e3b1a9ba7f31ddcf8ccb2cfd82604a988b5cc
 B 4a7a8b57e712dd05e187cf4de6fd58b9b1236847
 B 4b63dbb428488f3a6d0b7114632404b31458a521
 B 4cf375c5436f3e806293a73a5bb6a8510f7ac961
+B 4dd1a221c07430e83a5087206c964a2dc205d3d0
 B 4e49ccab53e40384a5bc3cd966b7a8f2636dcbb3
 B 4e9cc3b98770fc42065104441e85cc4785626616
 B 4fb98f6023bc6dab00cbf27f4a33ae0ea20f3b38
@@ -192,6 +194,7 @@ B 92f5d20576e3f424f03f988dbdfb8b5e813bb5f7
 B 9313c2a54131b44e8f9c4332671e881bfc35a01e
 B 937fb0646cca5d15eda0f9d131309bc9c4871de9
 B 93dd95007be0ac506ae4bf56d1ed25544831c8cb
+B 959404f8cc72a91a9ed108bf407c500ed2764688
 B 9652ad4297404686df2d9efc2b5b1cbb0bebd700
 B 9723e32190d3a820e0eecf19177561155399c867
 B 972af69bce584057637ee887432c5388eb7d8d8d
@@ -270,6 +273,7 @@ B cef0733a835c917d7c2c26a67d69dae4efaa332d
 B cf47776be516c10d72911674c9ed3c0c876658b1
 B cf4cf71fcac2f2f872f8c0620ef44f3e44a30108
 B cfca13411eb72d2d07ca243e24ced6e9743e6124
+B d2d18dcfcb99c1d3276ad82d7fff8ba898a8759f
 B d303d5d9436fbdc0c747479fb4c6681fcc22cb35
 B d30602dda6a86c80c58aa7665f1f6ac11b94845d
 B d30a0882a39c772b185f21d699bfdc02344f8706
@@ -290,6 +294,7 @@ B d8030d394f2e8e93ada987e0203a8dfe2bd0840e
 B d96f89f7129f79c59fee767398e44f6d33abdea8
 B d9f4efab8105f9dbf6a6b322ba049b4d7654ea87
 B da206ac5e64b92232087ea577ea48b253399f9e0
+B da99e3a5ec9955f27fcb65e1afcc6d4ffc77c333
 B dab72900c97b508025c6b6e84f6658a6c0605b04
 B db5c33a600968c9f8a359d6ae9899cb5dcc816e7
 B dc04e17b532e96b269e3b05a8d757ad284abc3f0
@@ -317,6 +322,7 @@ B ef369f2efd144ac4fec2fac43e1805a794e777a6
 B efb861810246c780402ed0d7ed23f057f20dbb63
 B eff76728e1e914a267987cd047d52f8ca66db598
 B f2e8dd622870acfbee61b57fa19da0326e335674
+B f3e1f49b725668fcff23b434f5627a199d91bc69
 B f4231a3f22a3736eaf3235ef83268f9bc8051d77
 B f8c09f8234a9a546a0ca7ef8368a31bfe43fdf61
 B fa2c872e46f91fea091e52f1b166d825002ec7df
@@ -329,6 +335,8 @@ B fe651165c83e893336d162e95fe9fedcc0ed0a74
 B fe6a12297b48e818c3bf5c665b1a283d320ca569
 M 00b6fe804da2cdff8a1641e9aa20c6cab713fef6
 M 01cf70330332480c5c29c8c3d715503f83253bac
+M 02be25361d4f90485cebcd32ce41df8aa4249cbb
+M 039ef658541017e2b8ddeaa0f49d771564e7d1f2
 M 03e554cf370fc4543a1a611c525e787527e8a02f
 M 04826f6520173b51bbb95b7a208e6a6662894ba3
 M 058bacfe750631f987469b0e1141db158dbd97b4
@@ -338,6 +346,7 @@ M 096e96e0da4ef08c0d81ff859224540045fe5caf
 M 0b9a55685abc679afbe6905a95b3a96abced57bb
 M 0d148c31a6264884878d5cc82d972af4046e15d1
 M 0f2b22f554f402cbd19327194cccd33963686ba7
+M 101afcaf01814ac166f6091eb76bb9b18a96fff9
 M 10c6232ee9af28bbea549433f5c6e64af470fc1d
 M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
 M 1166144105280eb921f917636091979693618a74
@@ -351,10 +360,12 @@ M 15063b0f08c66011f24f2d32352200736ee83710
 M 1518efb8ccb30cf1878d18b6573c7616b5d28c78
 M 157e2cbef796e9fc9c9ba5c5e79bd0cd7a46692e
 M 16307f3833422cd93e68a694df9a872b2b08bb43
+M 16857a21d0b304a3e26fe49cde8c8b0f9997125b
 M 169decc5418733dd11d2d2ef2abfe6de29f4dc7e
 M 1740f8741542a1567101cc15dba7608394888415
 M 1799bba4e9cc6b6220c20bff9a185afe57c2406b
 M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
+M 19e4039acfa543f8e2ddadc6378b07fd04a4a422
 M 1a4649fa6386315a4c5e83c5e9ef0ccc3517318a
 M 1b4c763d8d8da47ed05f618ac5650ee10c10edbf
 M 1d125604a756ee0c4da875545013c70355f77542
@@ -374,6 +385,7 @@ M 275af06b63778db104c6ac4fa888c01bc3e73c3e
 M 28619eec5e848d620ef740416a606bd4951b2a91
 M 28a1ac7d0f8d0b6c6ee56c7a543232e187a09035
 M 28a64c46105bfa14abe4a217d9b45c41561eba3e
+M 2923b3324db22481b8f2b3868c3c66ddff29b222
 M 29bc5661b0c09e45d2ff72bf29d53c2a6c376fc3
 M 2afed183de17550a2a57d266ca4ad666ed1edbf0
 M 2c67a400a5dec9dc6bd8d7b72160f2cb58021f1f
@@ -383,6 +395,7 @@ M 2d68a2e46debfcc27fc845ea08fbe078a8abff1a
 M 2f59ffac0752b453ba8b0673f321d5c29e1d7781
 M 2fda4dd66aba6ac290b9f3773e423c2bc5c61dcb
 M 2ff109358027653d1afd6f252cf6f25048cafbb9
+M 30652e492955b14354f2aa3cb9175b58d9d430a3
 M 309cfbf5710dab302eb4a611ac34dc288d1d8203
 M 30ce96e369dc7a54634c1def4ebe611be1d78ec1
 M 310f93d91a00f4ab6297af2f574a0bfeda3e94f0
@@ -403,6 +416,7 @@ M 3d40d621a8212c92e4a38355f8bfe19fec2b8e85
 M 3d71fe88f5d9649f3b770598b5b170cb6bc8871f
 M 3dabee6e40229669b98654c72723392e9e06f6be
 M 3e83c742e89621b37b4668768918e90b966d17b6
+M 40054466be34b5dab36f3641f90ad30de718abb5
 M 40b02ca3e9d96e7d035f5361556778f9e7cbbef6
 M 40d34074f87d33e430e1cf0234f3362ffa00b091
 M 40f09e6a0db63c8cddbd937bc4e26c3dd7ab7425
@@ -441,6 +455,7 @@ M 5c01cd8eb77e0e5eadf161d022238eaae4c894d3
 M 5c254d17cf60921be3780c5817647563de3bbf6e
 M 5dd706067e6d8bb3e2fa30a2515480046a1af067
 M 5e2395dc80435ddf4ee12b087a832cc8c94bd364
+M 5e99df45a0ca001c9606b86cf340c75760f3a220
 M 5edde854544744a3230bf672d4c51f12e69f2128
 M 5f01178a1fa46f35c7b75076742cbcef2e615152
 M 5f48aad15a5ba4eb99016dbef1117eca5d84f666
@@ -461,7 +476,9 @@ M 6d00f9b2ca2f7fa6936fb3868e7e29594bbc70d6
 M 6d68137820399873504ea5d7edeee12b0c17aaec
 M 6ea9ff22de288343f78f73e44f47983888cbf0b2
 M 6f950f663e0f2689fc39449f0acf01dc4ce1dd1f
+M 6fa71dd2796347e8f32f07955e27a1f6cc60983f
 M 70fc9973114ae8cfb0db0cf5e6bb5b698dee7b56
+M 711899d6d0698060fef79262acbc72f9ea0785b5
 M 719c96a310c0afa62d430588cf38e77523080fa2
 M 72d28bbf1d9f39d93f0503aeefd5eed6ef38c816
 M 7375465024d468ef63fce0133a093b6ea55cd813
@@ -479,6 +496,7 @@ M 7a4d0b1b6b71e5253e6a4e21b45e4b6fd1d714ae
 M 7b2e7af4f94bd26db08866fd24563df53af8977c
 M 7ce7ebb281c5cb9f335de28c30fdf97fac9b852c
 M 7fb5cdd08ab862f60bb867086e0d667bf4333f37
+M 806b0be50b703fd6f7292a0afc716b1f7612b896
 M 8108bd9bdbc5ec3d00d7dad8b775eff72689560d
 M 810ac858b479d933629abde47b44067be423c6ca
 M 819ff756a4a0ff34a6318661854cc57a24955e8a
@@ -515,6 +533,7 @@ M 97052f26eecc13fa181a13701e15e87d31c545e6
 M 970a061cbd24ce19f93368eec0d32998b2cc504a
 M 97dc25412eac3342f643ea5faa38c9718d2139bf
 M 980ebec9b4e3cb99c0386ba3c795cad21e924ac7
+M 982a7acf559e3e378555b599970626d32bffdb4c
 M 99a3b2ce160848b6dd4eafc2cbca9e4a3467b5f3
 M 9a8b2c051c3cd9381398915a9069e8faf48dc887
 M 9ae9e3a3d8ee4d7a057f8abeb1ec058a496a40b3
@@ -526,6 +545,7 @@ M 9ea53266ba0b51a43344b9dcc2e020bac26dfd4d
 M 9ebf3d40ac6db1dc51aa49fd9e3a5c3129b252c9
 M 9efdd3ece67ca3f3f29b56c1388614ce0124aa95
 M 9f1c04b14ba55a88f77204380626c3aafaf6d56d
+M a26dea8c265b43da8b766d314bb2d42a6896674c
 M a44c0f50b9d451b9f6201602722297f5b132b1dd
 M a4bcbe87bdc69af1bd3367089d1be4bcaa66282e
 M a529faa54dc55f8b489908730d229b37da6638ed
@@ -545,6 +565,7 @@ M ac0687fe6b83cb34bcf78cb215df4543cc55c6ed
 M ac4e5c1a5e4b57f58ed3129455f3fdc2a86d60cc
 M ac5210e61d5a8d40c2ee9a3512f3e2ce3adc7e4a
 M acc74209fd321f12fa27dac0f0854cd1841ba388
+M ad8f02a3550cf5580a79dc5e2a03bf35b5dee33a
 M adb6d3b5565d83b7612f3eededd9723dd2d6b5f2
 M adfe67ca302ba3c4ddf40a734493cf75d3439b9b
 M aeaf2276fd852ad0932730477de81ce520e0d1af
@@ -610,6 +631,7 @@ M da73da6c8011d7d76c275a1636bbe64849072563
 M db6fcc8871fd8469907f3bfadfa6f1824e52a966
 M dc7541fe5a7bbed90c48c35bba959fcb0dd345a1
 M dec561cf2c2a6628071a6ca74a2ff917afff9868
+M dee4fedb2caa9dc0bc0101d0b7165beddc4a03db
 M e216f887e073d9fc6a595b8443682c6a66b27227
 M e272423b0ab885aa886901850360c04d11eb5ba2
 M e2f56083cb79b8b6dc4aa099d795222c8164428a
@@ -621,6 +643,7 @@ M e9471c7c9aff40a106452b2cc5c307585d8c1e57
 M ea2164f64ea5b710f001ad4befa92cb2f09313ed
 M eacb444c21101d8020ce4da6641439604ed21939
 M ec2d67972cf26ab674fde8aa11a56512b196275d
+M eccc7e35ad256694be64c05e115c0de8038612da
 M ee4b170dbb3c699eb5e91cbe1dc9c35d75519ef7
 M ef3a5748290855774c8cb0a757c80c6a167c4ed0
 M efc701dca822db063d4dc77e31acde00898903fb


[cxf] 06/11: Bump cxf.aspectj.version from 1.9.20 to 1.9.20.1 (#1421)

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 631f5cdc741d7618e84593aaab9a2970e6353b94
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Tue Sep 5 11:30:41 2023 -0400

    Bump cxf.aspectj.version from 1.9.20 to 1.9.20.1 (#1421)
    
    Bumps `cxf.aspectj.version` from 1.9.20 to 1.9.20.1.
    
    Updates `org.aspectj:aspectjweaver` from 1.9.20 to 1.9.20.1
    - [Release notes](https://github.com/eclipse/org.aspectj/releases)
    - [Commits](https://github.com/eclipse/org.aspectj/commits)
    
    Updates `org.aspectj:aspectjrt` from 1.9.20 to 1.9.20.1
    - [Release notes](https://github.com/eclipse/org.aspectj/releases)
    - [Commits](https://github.com/eclipse/org.aspectj/commits)
    
    ---
    updated-dependencies:
    - dependency-name: org.aspectj:aspectjweaver
      dependency-type: direct:production
      update-type: version-update:semver-patch
    - dependency-name: org.aspectj:aspectjrt
      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 d62ffb116bf1725f9c1eaa66f1e32a1e0dafae6e)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    #       parent/pom.xml
    (cherry picked from commit 16857a21d0b304a3e26fe49cde8c8b0f9997125b)
    
    # 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 86e1617985..50573c0464 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -39,7 +39,7 @@
         <cxf.tika.version>2.7.0</cxf.tika.version>
         <cxf.tomcat.version>9.0.80</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
-        <cxf.aspectj.version>1.9.20</cxf.aspectj.version>
+        <cxf.aspectj.version>1.9.20.1</cxf.aspectj.version>
         <cxf.brave.version>5.16.0</cxf.brave.version>
     </properties>
     <dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index eaa5ee6905..9228173336 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -85,7 +85,7 @@
         <cxf.arquillian.version>1.6.0.Final</cxf.arquillian.version>
         <cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>
         <cxf.arquillian.weld.container.version>2.0.1.Final</cxf.arquillian.weld.container.version>
-        <cxf.aspectj.version>1.9.20</cxf.aspectj.version>
+        <cxf.aspectj.version>1.9.20.1</cxf.aspectj.version>
         <cxf.assertj.version>3.24.2</cxf.assertj.version>
         <cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
         <cxf.atmosphere.version>2.6.1</cxf.atmosphere.version>


[cxf] 08/11: [CXF-8925] Prevent double logging on fault in out chain (#1426)

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 f2d318ccacce27e6d77d3344393cf2cf4a69ec05
Author: Rand Hillerøe <si...@gmail.com>
AuthorDate: Thu Sep 7 22:53:24 2023 +0200

    [CXF-8925] Prevent double logging on fault in out chain (#1426)
    
    Signed-off-by: Randi H <rh...@dk.ibm.com>
    (cherry picked from commit d6842c9aa6fd15d5a9a64286dceed303e9829e1c)
    (cherry picked from commit 1c785dfb906da4767bc09f79143ec5f761168742)
---
 .../cxf/ext/logging/LoggingOutInterceptor.java     |  5 ++
 .../java/org/apache/cxf/ext/logging/FaultTest.java | 69 ++++++++++++++++++++++
 .../apache/cxf/ext/logging/LogEventSenderMock.java | 13 +++-
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
index c6673c06dc..7e68a7c5cc 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
@@ -61,6 +61,11 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
     public void handleMessage(Message message) throws Fault {
         if (isLoggingDisabledNow(message)) {
             return;
+        } else {
+            //ensure only logging once for a certain message
+            //this can prevent message logging again when fault
+            //happen after PRE_STREAM phase(LoggingOutInterceptor is called both in out chain and fault out chain)
+            message.put(LIVE_LOGGING_PROP, Boolean.FALSE);
         }
         createExchangeId(message);
         final OutputStream os = message.getContent(OutputStream.class);
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/FaultTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/FaultTest.java
new file mode 100644
index 0000000000..dd99dcebfa
--- /dev/null
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/FaultTest.java
@@ -0,0 +1,69 @@
+/**
+ * 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.ext.logging;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.ExchangeImpl;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class FaultTest {
+    @Test
+    public void logOnceForFaultsOccurringAfterLoggingOutPhase() throws IOException {
+
+        Message message = new MessageImpl();
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        message.setContent(OutputStream.class, outputStream);
+        Exchange exchange = new ExchangeImpl();
+        message.setExchange(exchange);
+        LogEventSenderMock logEventSender = new LogEventSenderMock();
+        LoggingOutInterceptor interceptor = new LoggingOutInterceptor(logEventSender);
+        
+        interceptor.handleMessage(message);
+        OutputStream preFaultOut = message.getContent(OutputStream.class);
+        
+        // simulate fault happening after message is already handled in out chain
+        interceptor.handleFault(message); // first we unwind
+        interceptor.handleMessage(message); // then we handle in the fault chain
+        
+        byte[] payload = "TestMessage".getBytes(StandardCharsets.UTF_8);
+        // simulate writing that is setup based on the pre-fault output stream on message
+        // this is what happens when StaxOutInterceptor is in use
+        // StaxOutInterceptor sets XmlStreamWriter content wrapping the OutputStream in the message at that time
+        // it does not recreate XmlStreamWriter during out fault chain, as it is already set during out chain
+        preFaultOut.write(payload);
+        
+        // Then close is called through close on Conduit, 
+        // which means close is called on the OutputStream in message at the time of close 
+        OutputStream postFaultOut = message.getContent(OutputStream.class);
+        postFaultOut.close();
+        
+        assertEquals(1, logEventSender.getLogEvents().size());
+        assertEquals("TestMessage", logEventSender.getLogEvents().get(0).getPayload());
+    }
+}
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/LogEventSenderMock.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/LogEventSenderMock.java
index 8f723be169..645faefb74 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/LogEventSenderMock.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/LogEventSenderMock.java
@@ -18,20 +18,27 @@
  */
 package org.apache.cxf.ext.logging;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.cxf.ext.logging.event.LogEvent;
 import org.apache.cxf.ext.logging.event.LogEventSender;
 
 public class LogEventSenderMock implements LogEventSender {
 
-    private LogEvent logEvent;
+    private List<LogEvent> logEvents = new ArrayList<>();
 
     @Override
     public void send(LogEvent event) {
-        logEvent = event;
+        logEvents.add(event);
     }
 
     public LogEvent getLogEvent() {
-        return logEvent;
+        return logEvents.isEmpty() ? null : logEvents.get(0);
+    }
+    
+    public List<LogEvent> getLogEvents() {
+        return logEvents;
     }
 
 }


[cxf] 09/11: Update Wiremock to 2.35.1

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 b43740b5d7051c235125f6f4f589f5ba8f4b4829
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Sep 7 20:09:03 2023 -0400

    Update Wiremock to 2.35.1
    
    (cherry picked from commit 40054466be34b5dab36f3641f90ad30de718abb5)
    
    # Conflicts:
    #       parent/pom.xml
    #       systests/microprofile/client/async/pom.xml
    #       systests/microprofile/client/nocdi/pom.xml
---
 parent/pom.xml                             | 2 +-
 systests/microprofile/client/async/pom.xml | 2 +-
 systests/microprofile/client/nocdi/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index cfd0d0320d..943af0c622 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -230,7 +230,7 @@
         <cxf.validation.api.version>2.0.2</cxf.validation.api.version>
         <cxf.velocity.version>2.3</cxf.velocity.version>
         <cxf.wildfly.common.version>1.5.4.Final</cxf.wildfly.common.version>
-        <cxf.wiremock.version>2.27.2</cxf.wiremock.version>
+        <cxf.wiremock.version>2.35.1</cxf.wiremock.version>
         <cxf.woodstox.core.version>6.4.0</cxf.woodstox.core.version>
         <cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version>
         <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
diff --git a/systests/microprofile/client/async/pom.xml b/systests/microprofile/client/async/pom.xml
index 41fee0b097..05403c3571 100644
--- a/systests/microprofile/client/async/pom.xml
+++ b/systests/microprofile/client/async/pom.xml
@@ -130,7 +130,7 @@
             </dependency>
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock</artifactId>
+                <artifactId>wiremock-jre8</artifactId>
                 <version>${cxf.wiremock.version}</version>
                 <scope>test</scope>
                 <exclusions>
diff --git a/systests/microprofile/client/nocdi/pom.xml b/systests/microprofile/client/nocdi/pom.xml
index 3958a91744..883c9d38f4 100644
--- a/systests/microprofile/client/nocdi/pom.xml
+++ b/systests/microprofile/client/nocdi/pom.xml
@@ -126,7 +126,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-jre8</artifactId>
             <version>${cxf.wiremock.version}</version>
             <scope>test</scope>
             <exclusions>