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 2021/12/21 00:23:33 UTC

[cxf] branch 3.4.x-fixes updated (f231ff0 -> 38ab3d3)

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 f231ff0  Update Spring Security to 5.3.13.RELEAS
     new 568f184  Update Spring LDAP to 5.3.13.RELEASE
     new 38ab3d3  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  | 3 +++
 parent/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

[cxf] 01/02: Update Spring LDAP to 5.3.13.RELEASE

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 568f184b914989bb66c0308a32a6276168db7df7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Dec 20 19:13:22 2021 -0500

    Update Spring LDAP to 5.3.13.RELEASE
    
    (cherry picked from commit 22b3f2a9d09ba5d1d3a7883c54df36b548aad83c)
    (cherry picked from commit 5b850b3fa3760c9863ecd49855efeb0612003138)
    
    # 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 dbb0e8f..b8715c0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -201,7 +201,7 @@
         <cxf.snakeyaml.version>1.26</cxf.snakeyaml.version>
         <cxf.specs.jaxws.api.version>2.3_2</cxf.specs.jaxws.api.version>
         <cxf.spring.boot.version>2.3.12.RELEASE</cxf.spring.boot.version>
-        <cxf.spring.ldap.version>2.3.4.RELEASE</cxf.spring.ldap.version>
+        <cxf.spring.ldap.version>2.3.5.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.3.13.RELEASE</cxf.spring.security.version>

[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 38ab3d3e64b7b0934e276dab92c00687854dfd29
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Dec 20 19:16:40 2021 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 30e0beb..b35b2f0 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -34,6 +34,7 @@ B 46366e20613d4b17628d0309c5caa8e3af715391
 B 47a5b631ee8fee22c9a3e592666626f9d2123d3b
 B 48e63678e194e9a92c8ee0a5b43a3a04a53d44f1
 B 49169ac265c14a022fcdafded19b364e0f8b12d5
+B 493c6d6a2f01f53561ed785826ec72ef550a2de5
 B 4ad97d59e890524337e2b99215586ed9d475ef61
 B 4da29ea7d55227c652b930318666639adae0c77d
 B 4f0cf0632192b9327562ff65ca95546c73311b50
@@ -160,6 +161,7 @@ M 509db61fb9c8c5b36691d1293908f2f36aef3d30
 M 50bef0418d228a071a14ee117638d89827d58444
 M 5409cc649fa5542e0f68af24546ab05a4e38a50c
 M 59f2f96920558470d08483e924a9b088a85beaad
+M 5b850b3fa3760c9863ecd49855efeb0612003138
 M 5c9421e147f5f5b83559779b94cda7673c01c397
 M 5cbed0aaa0160a8588cca6d8a2290a61bba2cdbf
 M 5df02724d93f6a65ee790136e9c50be350748c26
@@ -227,6 +229,7 @@ M a894689ac803c234bf38a59f7d845aec4f4d70e0
 M ac656dd13ac54b83aeb0c877e01dfb277d38ca96
 M ad194637ee3dd22f445e34b6db72d314ee650d79
 M ade1129cd94291f7fbd12cb536bc9367b19bb870
+M b31779839e148b756d31ffac3886e291a03ef5f5
 M b5c6ed22d517c217f178b4403ad367e5a3bab1bf
 M b72f0ce5426eb342145611ee5529c7df172d71c7
 M b8a2f139f8a4f80a90ef49c2a0757395cb303be6