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/02/04 18:54:49 UTC
[cxf] branch 3.6.x-fixes updated (c03222caa4 -> 592cf5b16d)
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 c03222caa4 Update Apache Karaf to 4.4.3
new 74e0559ac8 Update Mockito to 5.1.1
new 592cf5b16d 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 | 1 +
parent/pom.xml | 2 +-
2 files changed, 2 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 592cf5b16d5988ab68187af5369541ead7b4292a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Feb 4 13:54:35 2023 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index a9e2ea62f6..4bb8acbf2c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -143,6 +143,7 @@ M 654444433f3b17123cbc00fd17ea1c10d7de7a9c
M 683e2b1bbd5f629d2d6d5726849f6f8d16298202
M 688e0c16e8a760c839c52f01e210998c947c0037
M 6bb1a69c531ec15a521bd736db6195e9506a4679
+M 6cc5829898b4c2324732ac98a885ea9ea1a50662
M 6d39cd9e515334e17ca84ec08deee5e6cc0dc698
M 70f4636993734f4a13741f3a7de7c416b19edd83
M 710a2be5307b6e734d9533e8abd4848f48ec1f79
[cxf] 01/02: Update Mockito to 5.1.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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 74e0559ac8a2333e25a75f0cbf11bff2567b84d5
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Feb 4 11:52:55 2023 -0500
Update Mockito to 5.1.1
(cherry picked from commit 6cc5829898b4c2324732ac98a885ea9ea1a50662)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ef6ab73ba..fea650979a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -173,7 +173,7 @@
<cxf.microprofile.rest.client.version>2.0</cxf.microprofile.rest.client.version>
<cxf.microprofile.openapi.version>2.0</cxf.microprofile.openapi.version>
<cxf.mina.version>2.1.5</cxf.mina.version>
- <cxf.mockito.version>5.1.0</cxf.mockito.version>
+ <cxf.mockito.version>5.1.1</cxf.mockito.version>
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.0</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>