From e4e82d89d9dae28f8569e487bc9d0f794be54d86 Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Thu, 11 Jul 2024 18:02:09 -0600
Subject: [PATCH] Add UnboundId Compatibility Check

Closes gh-15400
---
 gradle/libs.versions.toml        |  1 +
 ldap/spring-security-ldap.gradle | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 73a8d27421..cd21a208a8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -25,6 +25,7 @@ com-nimbusds-oauth2-oidc-sdk = "com.nimbusds:oauth2-oidc-sdk:9.43.4"
 com-squareup-okhttp3-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "com-squareup-okhttp3" }
 com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3" }
 com-unboundid-unboundid-ldapsdk = "com.unboundid:unboundid-ldapsdk:6.0.11"
+com-unboundid-unboundid-ldapsdk7 = "com.unboundid:unboundid-ldapsdk:7.0.1"
 commons-collections = "commons-collections:commons-collections:3.2.2"
 io-micrometer-micrometer-observation = "io.micrometer:micrometer-observation:1.12.8"
 io-mockk = "io.mockk:mockk:1.13.11"
diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle
index c4f6c082ed..29272a9709 100644
--- a/ldap/spring-security-ldap.gradle
+++ b/ldap/spring-security-ldap.gradle
@@ -1,5 +1,9 @@
 apply plugin: 'io.spring.convention.spring-module'
 
+configurations {
+	unboundid7 { extendsFrom(optional, tests) }
+}
+
 dependencies {
 	management platform(project(":spring-security-dependencies"))
 	api project(':spring-security-core')
@@ -35,9 +39,20 @@ dependencies {
 	testImplementation "org.mockito:mockito-junit-jupiter"
 	testImplementation "org.springframework:spring-test"
 	testImplementation 'org.skyscreamer:jsonassert'
+	unboundid7 libs.com.unboundid.unboundid.ldapsdk7
+
 }
 
 integrationTest {
 //	  exclude('**/OpenLDAPIntegrationTestSuite.class')
 	maxParallelForks = 1
 }
+
+tasks.register("unboundid7Test", Test) {
+	useJUnitPlatform()
+	classpath = sourceSets.test.output + sourceSets.main.output + configurations.unboundid7
+}
+
+tasks.named("check") {
+	dependsOn unboundid7Test
+}