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 01:48:21 UTC

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

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 682079d86b Recording .gitmergeinfo Changes
     new 23ab37cd28 Update Mockito to 5.1.0 (#1095)
     new 026e79a86c 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 026e79a86c47387ad3461210e53cd0dc0034ccbe
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jan 29 20:47:46 2023 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 346b178b1a..6045ef39d1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -228,6 +228,7 @@ M d828d5eeeb3dcdf85832387e5a6fe502f4fd00d7
 M d837b841f280998d56c3dbc2cde3043b51938d8f
 M d849512da6499d00e3e84eb60733a0343a473b44
 M d906a253018c37b36621973a0f4c8b4322cbac64
+M d9bb99deb7dc23de7986ef7b95c54aaec90316be
 M dd4c06bd2dffc77aa3f6a0e4ecd62e05803354e5
 M dec91b4086e0caa44688b50f056c22594983d764
 M ded51b955c67bc232e961200b6dc6b59c07bdf32


[cxf] 01/02: Update Mockito to 5.1.0 (#1095)

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 23ab37cd286315c30b19363fb098a884f29790c4
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jan 29 20:42:02 2023 -0500

    Update Mockito to 5.1.0 (#1095)
    
    (cherry picked from commit d9bb99deb7dc23de7986ef7b95c54aaec90316be)
    
    # 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 6e8d32b306..9fc1183172 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -172,7 +172,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>4.11.0</cxf.mockito.version>
+        <cxf.mockito.version>5.1.0</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>