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/02/19 00:20:17 UTC
[cxf] branch 3.4.x-fixes updated (c26f2bb -> 67ffd07)
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 c26f2bb Recording .gitmergeinfo Changes
new 138cb28 Update Spring LDAP to 2.3.6.RELEASE
new 67ffd07 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 | 4 ++++
parent/pom.xml | 2 +-
2 files changed, 5 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 67ffd07d06ad6ee63882829adc50063972f41763
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Feb 18 19:19:50 2022 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 813c10f..f55cd4c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -147,6 +147,7 @@ M 299d6a844b99a69555355b2f9baca3e6ec13a918
M 29e9ae1bd69a373e7a33d84405510a5e825a6508
M 2a1614e5be080b6749fc72d1be2c253215c1bae7
M 2b112dd1e05bd43ed25c7d77f1bc437fc976bd5a
+M 2bc6347335a4dff32b7ac11149c983d57996e123
M 2c7b64383d81db5e7bd14abc90fbbbf0597044af
M 2c9b67fd1777c6a3bdf965eda75c4b7359d544a1
M 2cd495719e7532657f7e8cad5b5347cedccd2de8
@@ -174,6 +175,7 @@ M 4680528c0f9379ee51a0758ab52ad2e6de2cb0a6
M 469f06b67b716b30bb5f115639644d1284dbe4b1
M 4852a50d335817c50882f641197fd189207571eb
M 4992b309f274750c0074d544b491e46402dd928b
+M 4b2bc5f1cd35c732d8da4eb3fea3372e16a94100
M 4b714edc4805395974da2ff9c683b61ec9b23db9
M 4b76fac643915ec9e3409f00c1ce62ba83994265
M 4c3c5196be3e9295c31b5bc592ebc8f911c93c6d
@@ -217,12 +219,14 @@ M 700cf3929763d551d9fac6c570c2560039c6238c
M 70c7d6a1e3f23522609d58b72b61c52e3cbc919a
M 72abe7416755fcba5943a64299d5e687661cb4c1
M 72fee532816746a107f32cacad53f391b89073eb
+M 7381411c96166c7320e07f9809182e060d52e7df
M 73c22d0a0c0f98a6def324f28c4eee10bda917ea
M 752a8a2dafff76ed8098cd73f1e071ffa0514754
M 79f8c812ec3e61d5702adb5ec54f5aecb7e04a8e
M 7a05e4fb0b67a89b86ed6eee68b9416005d6f631
M 7c15ae9596cf879bb4e8089816c3deffcd309c76
M 80bfaa1fbb9302ca257db211b36c3f0622356d56
+M 814a5de1e3dd84b621f239c73c56b3ac5ff32cf1
M 81d82da19ed43bbeaae12a7eda052a64890ec970
M 8231ba3d86cb225738453d51c5a4ee7781e08f62
M 840666d155ce5593801d1b9228e5bcf7f720eb7f
[cxf] 01/02: Update Spring LDAP to 2.3.6.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 138cb28c172e6c2abb04cf5da28d2e12a96f2d93
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Feb 18 14:33:37 2022 -0500
Update Spring LDAP to 2.3.6.RELEASE
(cherry picked from commit 158e046aaa3608bc9405a69f43c95bb36e928397)
(cherry picked from commit 7381411c96166c7320e07f9809182e060d52e7df)
# 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 c5c81b7..4145d00 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -204,7 +204,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.5.RELEASE</cxf.spring.ldap.version>
+ <cxf.spring.ldap.version>2.3.6.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>