You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/05/14 09:50:48 UTC
[cxf] branch 3.3.x-fixes updated (087247e -> 4717dd7)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 087247e Recording .gitmergeinfo Changes
new 525f1c4 Updating Spring LDAP to 2.3.3
new 4717dd7 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 co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4717dd751016a7c25ae2e815293d10192963a2e6
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 14 10:50:27 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 59b214c..24b01be 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -307,6 +307,7 @@ M cbc0fde7f85d01e379e40a7f27fe5cea20169ddf
M ccb743e48e9ed99e240ae05f373b6ff799085049
M ce504146b81a2ffb2e8cda36d8bdf8486730e485
M d17a51cbff36aa314374d4621434968422fb9c9f
+M d37c3907c3ae94e607a8cc411f9243562637aaa2
M d5ad40bf29cf57f13aaeeca31e0aac61487095b4
M d5b612c220bab496c3dab1731e56b3fea36c1b07
M d8619b13cd9ff375590946c1349f6fe374959f30
[cxf] 01/02: Updating Spring LDAP to 2.3.3
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 525f1c447ae0877e66054c3b2bafb8ce84d61e65
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu May 14 10:49:38 2020 +0100
Updating Spring LDAP to 2.3.3
(cherry picked from commit d37c3907c3ae94e607a8cc411f9243562637aaa2)
# 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 e42cc41..fca53e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,7 @@
<cxf.snakeyaml.version>1.26</cxf.snakeyaml.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
<cxf.spring.boot.version>2.1.14.RELEASE</cxf.spring.boot.version>
- <cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
+ <cxf.spring.ldap.version>2.3.3.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.security.version>5.1.10.RELEASE</cxf.spring.security.version>