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/07/11 16:40:20 UTC
[cxf] branch 3.5.x-fixes updated (d69cda51b1 -> d5382d1417)
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 d69cda51b1 Recording .gitmergeinfo Changes
new cdf211f959 Update Guava to 32.1.1-jre
new d5382d1417 Recording .gitmergeinfo Changes
The 2 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 | 12 ++++++++++++
parent/pom.xml | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
[cxf] 02/02: 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 d5382d1417a24aa5646817e7a70d440b429ca4dd
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 11 12:18:09 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f6033ea477..99e052071a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,5 +1,6 @@
origin/3.6.x-fixes
+B 009475b7c33165de61ea8b4c6183d2f75db00cd9
B 00bbab65e59b8f27366335aec19e50129b7759f0
B 0233bbf8fb5599639978d8c60b6df12e668d7d6b
B 026e79a86c47387ad3461210e53cd0dc0034ccbe
@@ -248,11 +249,13 @@ B cf4cf71fcac2f2f872f8c0620ef44f3e44a30108
B cfca13411eb72d2d07ca243e24ced6e9743e6124
B d303d5d9436fbdc0c747479fb4c6681fcc22cb35
B d30602dda6a86c80c58aa7665f1f6ac11b94845d
+B d30a0882a39c772b185f21d699bfdc02344f8706
B d319f8a2f5ca93e7bcaa028f8026c402e1046037
B d32310f72819e210f41e3e0fdcddccf0f436ca92
B d3a19b863fbc1531af8f2a90c6aeaf09334db2d5
B d4b9280f57018cf9c910ac22963a20140f301101
B d5895b3a227279bc913816cf1c95bacfa3931979
+B d6c8dd8413ec8cf9f729fd7f539858de82f6af61
B d735757f556a567f27bfa030dcd33936c5d4ce3f
B d75a54c236ad37c4a97c1fb5b0b97f9d28305a91
B d75ff08d8536c66d2f4faaad75f28fd6ca6df1c3
@@ -363,6 +366,7 @@ M 40b02ca3e9d96e7d035f5361556778f9e7cbbef6
M 40d34074f87d33e430e1cf0234f3362ffa00b091
M 40f09e6a0db63c8cddbd937bc4e26c3dd7ab7425
M 410728df7c306a759afb74e51c609ccac86920b5
+M 410a7aedabfc85a99f605138ad717b6bd3a51c07
M 4434d6055ac4be9f5e5cb3e2070966c5f04fd246
M 444f5fd0657b51be9899f5c7949d29705c6dfba5
M 485413b2c2f0f57e13ab4b91940334a5a3bebc01
@@ -388,6 +392,7 @@ M 5b9788a6dd477113da850f5eea48cde9064eac01
M 5bad9b0571ea6829abf584af95693229a3fd83be
M 5c01cd8eb77e0e5eadf161d022238eaae4c894d3
M 5c254d17cf60921be3780c5817647563de3bbf6e
+M 5dd706067e6d8bb3e2fa30a2515480046a1af067
M 5e2395dc80435ddf4ee12b087a832cc8c94bd364
M 5edde854544744a3230bf672d4c51f12e69f2128
M 5f01178a1fa46f35c7b75076742cbcef2e615152
@@ -442,6 +447,7 @@ M 901da059d3d23b9956d937ae3fdbcbb81c62eb75
M 9031457c538ccfe133357ab039afb2a013a2fe82
M 905f4f91e4d0b5c4d145729f16bad90b1847f0be
M 90a2082380d1656c42bd6087906e1c048ee493bf
+M 90ec7283673a9aae874b2d4e9a077701300ac0de
M 91c97378d9a64166b3099cad6a9f842d18c5bcad
M 937d6ca1fad9e39fa9684ea62c924b461b57d177
M 94fdc50f4436b6a14a2e2c22a615cf710b2cabef
@@ -474,6 +480,7 @@ M ac0687fe6b83cb34bcf78cb215df4543cc55c6ed
M acc74209fd321f12fa27dac0f0854cd1841ba388
M adb6d3b5565d83b7612f3eededd9723dd2d6b5f2
M adfe67ca302ba3c4ddf40a734493cf75d3439b9b
+M aeaf2276fd852ad0932730477de81ce520e0d1af
M aeeda25db3725df954a3bc48f52e3c7687807428
M b207c718e84bed8120bb114f1d79f575094c3a14
M b3503705c584c5b29a5e4e7a64b909c3609f7529
@@ -502,6 +509,7 @@ M ca648669c438c08da251b1bdc176a53dda555738
M ca7b6d8daff836949e95f41ef825155d66e512e2
M cbb59bbd3e9e4ae0259b43465fbff8b5c45991c0
M cdb3f7dbde40fc9670473b6c38d057594e11bfb6
+M ce8826bbe5c06569e9f522e7c11f922ea6231e9c
M cf85ed2aa618971bb4858608b189d7888453521f
M cff5795b28b8a5970fb7a00960ff14aa618e62f4
M d0505da69ca57e9fc4ce750622b6f368e73fcfb9
@@ -516,20 +524,24 @@ M d86920ce70dfe74836f18180dc5d47c8437f0250
M d891059f0de95a27e69179a0bfa0e80eb251bb3f
M da73da6c8011d7d76c275a1636bbe64849072563
M db6fcc8871fd8469907f3bfadfa6f1824e52a966
+M dec561cf2c2a6628071a6ca74a2ff917afff9868
M e216f887e073d9fc6a595b8443682c6a66b27227
M e272423b0ab885aa886901850360c04d11eb5ba2
M e2f56083cb79b8b6dc4aa099d795222c8164428a
M e60d84d2ad4a4e95be19eb5d326dcae1133eefb3
+M e621e802a612bd618a86bcef353dcda2ff3358f3
M e6fd52bd53f8b16082d5532a7276b5165463a8a5
M ea2164f64ea5b710f001ad4befa92cb2f09313ed
M ec2d67972cf26ab674fde8aa11a56512b196275d
M ee4b170dbb3c699eb5e91cbe1dc9c35d75519ef7
+M ef3a5748290855774c8cb0a757c80c6a167c4ed0
M efc701dca822db063d4dc77e31acde00898903fb
M f1f32b6f583ccd07d3a3b9421383f555a9ec75bb
M f25e81b813d776475641eb1a0875cb3bc9f45e51
M f339bcce2cea60cbb31fc296109e47bf66f61b39
M f466c1d881a996e45267f3b2e3210f0ebccdfdd4
M f50fd2ee733928a565bf98ead200780732ef03fe
+M f54de185fcd6dfc69b1dd6609d0486ed06b68b19
M f55be99cd50d9d1fe527bbeb55135174b7fab79b
M f9e41c9a78d69d06e6552ab3df48e93250088709
M fb569f0c4936f7ac7b5197ce823ef9a725453376
[cxf] 01/02: Update Guava to 32.1.1-jre
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 cdf211f95965c295efe0dec5c43b21fe399c06c4
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 11 08:30:39 2023 -0400
Update Guava to 32.1.1-jre
(cherry picked from commit 285c671de7cc1a3edf9de481cdd5d58e01cb5e7a)
# Conflicts:
# parent/pom.xml
(cherry picked from commit aeaf2276fd852ad0932730477de81ce520e0d1af)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 22463042e8..eb1a12dcdc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,7 +117,7 @@
<cxf.geronimo.openapi.version>1.0.15</cxf.geronimo.openapi.version>
<cxf.glassfish.el.version>3.0.1-b11</cxf.glassfish.el.version>
<cxf.glassfish.json.version>1.1.4</cxf.glassfish.json.version>
- <cxf.guava.version>30.1-jre</cxf.guava.version>
+ <cxf.guava.version>32.1.1-jre</cxf.guava.version>
<cxf.hamcrest.version>2.2</cxf.hamcrest.version>
<cxf.hazelcast.version>4.2.8</cxf.hazelcast.version>
<cxf.hibernate.em.version>5.6.15.Final</cxf.hibernate.em.version>