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 23:01:29 UTC
[cxf] branch 3.5.x-fixes updated (b71634b793 -> 56ecaeb37e)
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 b71634b793 Recording .gitmergeinfo Changes
new 532ad5ebea Update Jackson to 2.14.2
new 268832075a CXF-8393: Umbrella issue to address fixing flaky tests (#1084)
new 56ecaeb37e 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 | 4 ++++
parent/pom.xml | 6 ++++--
2 files changed, 8 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 532ad5ebeac8c9b3f82ae98dab415a0e4e068ef6
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)
(cherry picked from commit 2d68a2e46debfcc27fc845ea08fbe078a8abff1a)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fbc09c75f9..2cb639dc37 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -129,8 +129,8 @@
<cxf.httpcomponents.core.version>4.4.15</cxf.httpcomponents.core.version>
<cxf.httpcomponents.client5.version>5.1.4</cxf.httpcomponents.client5.version>
<cxf.httpcomponents.core5.version>5.1.5</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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 268832075abe2d5a8cddfd6878fafbbaf2eb20c9
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)
(cherry picked from commit 2ef45351dcf22d375d7f526064e7f53fb55dc49a)
---
parent/pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2cb639dc37..2abdfefc43 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>
@@ -487,6 +488,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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 56ecaeb37e7cf058264c15d9810ffd682fa6643e
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 30 17:46:47 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 01105ccef6..834443fc41 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/3.6.x-fixes
B 00bbab65e59b8f27366335aec19e50129b7759f0
B 0233bbf8fb5599639978d8c60b6df12e668d7d6b
+B 026e79a86c47387ad3461210e53cd0dc0034ccbe
B 044b280cf89fad58502cc27e66022e517d5de577
B 0da7f36a16fe1bcbcd9b2a64d0bfe2c19d5c319c
B 0e9ba6cfe143f156721d6f8a1fd38d84946b5e8d
@@ -102,6 +103,7 @@ B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
B d7b9a3095d864a6b41dc0ee07dffbd0c36d7cdf6
B db5c33a600968c9f8a359d6ae9899cb5dcc816e7
B dd42fa32d05e5d02490f3a00f1dfd9c165a54b84
+B df24375f02d2e16f0e24e91be57e5800361b483b
B e2760b48867797054e7fc488f04e4b6e5a792716
B e7c2aee206ae5084204502b4744feed5a8e93e04
B e7d5bca0ba38b0f282f9da7f87bf964544b6b66a
@@ -131,11 +133,13 @@ M 1e6e2ac84a703685bb402c44b687a0cd4e2bcdee
M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
M 21131c03499c0e1f35838bf2667ef14d71b3acf1
M 21892efb49facc7243e7284d9fd5d3ba988c3a65
+M 23ab37cd286315c30b19363fb098a884f29790c4
M 27521a6a68a1db621ea65051ca2da6b251edb6e5
M 28a1ac7d0f8d0b6c6ee56c7a543232e187a09035
M 28a64c46105bfa14abe4a217d9b45c41561eba3e
M 2afed183de17550a2a57d266ca4ad666ed1edbf0
M 2d0342d51e6a13b7af5980863ba1b7436724daf8
+M 2d68a2e46debfcc27fc845ea08fbe078a8abff1a
M 2fda4dd66aba6ac290b9f3773e423c2bc5c61dcb
M 309cfbf5710dab302eb4a611ac34dc288d1d8203
M 310f93d91a00f4ab6297af2f574a0bfeda3e94f0