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/01/30 22:39:16 UTC

[cxf] branch 3.6.x-fixes updated (026e79a86c -> df24375f02)

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 026e79a86c Recording .gitmergeinfo Changes
     new 2d68a2e46d Update Jackson to 2.14.2
     new 2ef45351dc CXF-8393: Umbrella issue to address fixing flaky tests (#1084)
     new df24375f02 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  | 1 +
 parent/pom.xml | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)


[cxf] 01/03: Update Jackson to 2.14.2

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 2d68a2e46debfcc27fc845ea08fbe078a8abff1a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 30 10:02:10 2023 -0500

    Update Jackson to 2.14.2
    
    (cherry picked from commit 65157651638b73115b3623c617b842136acd3946)
---
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 9fc1183172..47b9db70f0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -127,8 +127,8 @@
         <cxf.httpcomponents.core.version>4.4.15</cxf.httpcomponents.core.version>
         <cxf.httpcomponents.client5.version>5.2</cxf.httpcomponents.client5.version>
         <cxf.httpcomponents.core5.version>5.2</cxf.httpcomponents.core5.version>
-        <cxf.jackson.version>2.14.1</cxf.jackson.version>
-        <cxf.jackson.databind.version>2.14.1</cxf.jackson.databind.version>
+        <cxf.jackson.version>2.14.2</cxf.jackson.version>
+        <cxf.jackson.databind.version>2.14.2</cxf.jackson.databind.version>
         <cxf.jacorb.version>3.9</cxf.jacorb.version>
         <cxf.jaeger.version>1.8.1</cxf.jaeger.version>
         <cxf.jakarta.activation.version>1.2.2</cxf.jakarta.activation.version>


[cxf] 02/03: CXF-8393: Umbrella issue to address fixing flaky tests (#1084)

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 2ef45351dcf22d375d7f526064e7f53fb55dc49a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 30 12:42:15 2023 -0500

    CXF-8393: Umbrella issue to address fixing flaky tests (#1084)
    
    (cherry picked from commit b7131a3588afe7514a920eeabc0652704ed52490)
---
 parent/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/parent/pom.xml b/parent/pom.xml
index 47b9db70f0..6c7839254b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,6 +38,7 @@
         <cxf.surefire.fork.vmargs>-ea</cxf.surefire.fork.vmargs>
         <cxf.server.launcher.vmargs>-ea</cxf.server.launcher.vmargs>
         <cxf.surefire.enable.assertions>true</cxf.surefire.enable.assertions>
+        <cxf.surefire.rerun.count>3</cxf.surefire.rerun.count>
         <cxf.checkstyle.extension />
         <cxf.compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</cxf.compile.flags>
         <cxf.compile.show.deprecation>true</cxf.compile.show.deprecation>
@@ -486,6 +487,7 @@
                         <enableAssertions>${cxf.surefire.enable.assertions}</enableAssertions>
                         <parallel>${cxf.surefire.parallel.mode}</parallel>
                         <forkNode implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
+                        <rerunFailingTestsCount>${cxf.surefire.rerun.count}</rerunFailingTestsCount>
                         <systemPropertyVariables>
                             <java.io.tmpdir>${basedir}/target</java.io.tmpdir>
                             <cxf.useRandomFirstPort>true</cxf.useRandomFirstPort>


[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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit df24375f02d2e16f0e24e91be57e5800361b483b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 30 17:35:22 2023 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6045ef39d1..e28f7c5cc7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -137,6 +137,7 @@ M 5c37d05ec7a26a9e72c5169b1f427087cf123993
 M 60e202dde133752bdf2de35bb8b0ca3dda6113fa
 M 63a2c2bbf4dcba37bd8fe669d35203f8eb0d019b
 M 64a534d641f55b5cf05500a3ff092f73cf041f8d
+M 65157651638b73115b3623c617b842136acd3946
 M 654444433f3b17123cbc00fd17ea1c10d7de7a9c
 M 683e2b1bbd5f629d2d6d5726849f6f8d16298202
 M 688e0c16e8a760c839c52f01e210998c947c0037