This is an automated email from the ASF dual-hosted git repository.
chaitalithombare pushed a commit to branch atlas-2.5
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/atlas-2.5 by this push:
new 349a33ca9 ATLAS-5057: Atlas - Upgrade spring-ldap-core to 2.4.4/3.2.8
(#383) (cherry picked from commit ff3eeba0b18630b2b6fb12bd35ef8ce5dca0c540)
Co-authored-by: chaitalithombare <[email protected]>
349a33ca9 is described below
commit 349a33ca99820e286a9c2b85821d639ce3e111d0
Author: chaitalicod <[email protected]>
AuthorDate: Wed Jun 18 18:02:27 2025 +0530
ATLAS-5057: Atlas - Upgrade spring-ldap-core to 2.4.4/3.2.8 (#383)
(cherry picked from commit ff3eeba0b18630b2b6fb12bd35ef8ce5dca0c540)
Co-authored-by: chaitalithombare <[email protected]>
---
pom.xml | 1 +
webapp/pom.xml | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/pom.xml b/pom.xml
index 8e53b516b..e75555598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
<solr-test-framework.version>8.11.3</solr-test-framework.version>
<solr.version>8.11.3</solr.version>
<spray.version>1.3.1</spray.version>
+ <spring-ldap-core.version>2.4.4</spring-ldap-core.version>
<spring.security.version>5.8.15</spring.security.version>
<spring.version>5.3.39</spring.version>
<sqoop.classifier>hadoop260</sqoop.classifier>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 3598309dd..e9e52d21a 100755
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -398,6 +398,12 @@
<artifactId>spring-web</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.ldap</groupId>
+ <artifactId>spring-ldap-core</artifactId>
+ <version>${spring-ldap-core.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
@@ -411,6 +417,12 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.ldap</groupId>
+ <artifactId>spring-ldap-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
