From 3d6c5bf04afd821f1124fa2736c04dc107a72213 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Fri, 5 Feb 2021 14:07:54 -0700 Subject: [PATCH] Migrate LDAP Samples to UnboundId Closes gh-9414 --- .../ldap/spring-security-samples-javaconfig-ldap.gradle | 2 +- samples/javaconfig/ldap/src/main/resources/users.ldif | 6 +++--- samples/xml/ldap/spring-security-samples-xml-ldap.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle b/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle index 1fc70cb879..87169c4ce4 100644 --- a/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle +++ b/samples/javaconfig/ldap/spring-security-samples-javaconfig-ldap.gradle @@ -27,7 +27,7 @@ dependencies { compile 'javax.xml.bind:jaxb-api' compile 'org.hibernate:hibernate-validator' compile 'org.springframework:spring-webmvc' - compile apachedsDependencies + compile 'com.unboundid:unboundid-ldapsdk' compile slf4jDependencies providedCompile 'javax.servlet:javax.servlet-api' diff --git a/samples/javaconfig/ldap/src/main/resources/users.ldif b/samples/javaconfig/ldap/src/main/resources/users.ldif index fde2456d46..e76a28db92 100644 --- a/samples/javaconfig/ldap/src/main/resources/users.ldif +++ b/samples/javaconfig/ldap/src/main/resources/users.ldif @@ -30,13 +30,13 @@ userPassword: password dn: cn=user,ou=groups,dc=springframework,dc=org objectclass: top -objectclass: groupOfNames +objectclass: groupOfUniqueNames cn: user uniqueMember: uid=admin,ou=people,dc=springframework,dc=org uniqueMember: uid=user,ou=people,dc=springframework,dc=org dn: cn=admin,ou=groups,dc=springframework,dc=org objectclass: top -objectclass: groupOfNames +objectclass: groupOfUniqueNames cn: admin -uniqueMember: uid=admin,ou=people,dc=springframework,dc=org \ No newline at end of file +uniqueMember: uid=admin,ou=people,dc=springframework,dc=org diff --git a/samples/xml/ldap/spring-security-samples-xml-ldap.gradle b/samples/xml/ldap/spring-security-samples-xml-ldap.gradle index 6e7b2a6cce..4670def5aa 100644 --- a/samples/xml/ldap/spring-security-samples-xml-ldap.gradle +++ b/samples/xml/ldap/spring-security-samples-xml-ldap.gradle @@ -22,7 +22,7 @@ dependencies { runtime project(':spring-security-web') runtime project(':spring-security-config') runtime project(':spring-security-ldap') - runtime apachedsDependencies + runtime 'com.unboundid:unboundid-ldapsdk' runtime slf4jDependencies providedCompile 'javax.servlet:javax.servlet-api'