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 17:34:06 UTC
[cxf] branch 3.6.x-fixes updated (7fc2a0262c -> 8dfb8be99b)
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 7fc2a0262c Recording .gitmergeinfo Changes
new dac65105d5 Update EasyMock to 5.0.1 (part of CXF-8407) (#1015)
new 8dfb8be99b 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 8dfb8be99b235711087c9ced02f20c24ea48d935
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 29 13:33:54 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 305f5611da..f44298247a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -93,6 +93,7 @@ M 7501891ee05153ba43eab3cdadccf789dd15de1e
M 797df326d9b73cdaa02851a9cdc7d07bc05aad2c
M 7dc87bce5436a7aee3899c2bc67629cc56fc4623
M 80cf0d301fc3381b680538b0b4fae6c67efd4045
+M 84e897dfbda3bff1d6be3c3b44ef36c039cb8c92
M 890195ced00f76d0be680def9c6f08d85d63cbcd
M 8abb11abab186d2a76fafb41ab610f3c292d5fa8
M 8cba83cdbb6a1b0d28f6fd7e218b342a42305963
[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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dac65105d53cf8a020b52a7936797e76784d24f2
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
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e418f1610..dcbad31638 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>