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 2022/10/29 19:42:34 UTC
[cxf] branch 3.4.x-fixes updated (0922502d0a -> 4ff32e6cf0)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 0922502d0a Recording .gitmergeinfo Changes
new 3ea41e667a Update EasyMock to 5.0.1 (part of CXF-8407) (#1015)
new 4ff32e6cf0 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4ff32e6cf0f200174a1f9af80387d5e018afefa7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 29 15:36:05 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3109e0f265..183addf645 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -155,6 +155,7 @@ B aab3cb13cc61b0ec756680a2209db42fc3db933c
B ad1235af81d74fe0e9d68922d167b540965cc369
B aec252eda5197098f9306e62edbf6a46e35cd054
B b19a2308889e259caa19052e35954be756e3efe1
+B b26d5773caf507fc18abf82097805b75a8ff607e
B b341f7cd05a5130f53efd56c01d14136655afe35
B b729ec906ab4391e33152d0a9223506555a3c384
B b756a926aad920c977c16fe6df469630b189d1b6
[cxf] 01/02: Update EasyMock to 5.0.1 (part of CXF-8407) (#1015)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3ea41e667a0355553f52e49a4044e8be447ca84f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 29 13:30:55 2022 -0400
Update EasyMock to 5.0.1 (part of CXF-8407) (#1015)
(cherry picked from commit 84e897dfbda3bff1d6be3c3b44ef36c039cb8c92)
# Conflicts:
# parent/pom.xml
(cherry picked from commit dac65105d53cf8a020b52a7936797e76784d24f2)
(cherry picked from commit 9d4828e1b9653bbaf59a45998aa4c267fc3471c3)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f390a6f8de..181596b793 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
<cxf.asm.version>9.4</cxf.asm.version>
<cxf.osgi.asm.version>[3.0,10)</cxf.osgi.asm.version>
- <cxf.easymock.version>4.3</cxf.easymock.version>
+ <cxf.easymock.version>5.0.1</cxf.easymock.version>
<!-- OSGi related properties -->
<cxf.fragment.host />
<cxf.bundle.activation.policy>lazy</cxf.bundle.activation.policy>