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/11/03 00:53:12 UTC
(cxf) branch 3.6.x-fixes updated (6b3ecdde7e -> 7f1bef0315)
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 6b3ecdde7e Updating WSS4J on 3.6.x (#1502)
new f51ede17d7 Update Mockito to 5.7.0
new 7f1bef0315 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 | 2 ++
parent/pom.xml | 2 +-
2 files changed, 3 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 7f1bef03152c188aa68357b5c399290f5d2b2dd0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 2 20:52:56 2023 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 809837b907..a91ecacd99 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -330,6 +330,7 @@ M 3a5bf6699e32c4831f3a952535190df3da6fe1fa
M 3b3ff83cda8fdbea1848d31f8e7fdd54a4a2c4c6
M 3b5bd6d81dcd3171faa1546e86e18864f587c2ac
M 3b700961ead8a1c23ef945275bfe4defe22ea81d
+M 3ba08991d5e7b6b411b6809700f74a1ae7c2cf91
M 3ce2db9d160b107c41c5bcee595ee13d862b7b88
M 3ce7a90d8b6b96fed6ee74f95f268167e77842eb
M 3d58af3c762a616d607120d85a3eea8e4a387ac9
@@ -561,6 +562,7 @@ M 9e6e0d3beb7a4b949a960d566b6af92518be260f
M 9e9baea9cdfc6c1e9a09d851b571e7cfa62df209
M 9ede4a76d78ffe913c593607ed28d523ba548ba3
M 9fdf22dfd1ed21a776d935754f1dd02aef67ce95
+M a08dba982737f3eb9e33cf7d906c38d3fc747c1e
M a25da60afef8051cab6b8b0a733346dad718f65a
M a293a80333443ac39c960aea695e65fc260d8bdd
M a2b22ff1cb5e3d00ece68733ca8d72b67fd023d6
(cxf) 01/02: Update Mockito to 5.7.0
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 f51ede17d7fec86ae5df8f130911347e52a3265d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 2 20:01:28 2023 -0400
Update Mockito to 5.7.0
(cherry picked from commit a08dba982737f3eb9e33cf7d906c38d3fc747c1e)
# 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 3a34e0337c..0ef507589e 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.6.0</cxf.mockito.version>
+ <cxf.mockito.version>5.7.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>