From 695596a03152c6af82cbccb4b04abfdc79315201 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 20:28:09 +0000
Subject: [PATCH 1/3] Update apacheds.version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b0c4e154..c01e1a6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-    <apacheds.version>2.0.0.AM25</apacheds.version>
+    <apacheds.version>2.0.0.AM27</apacheds.version>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
     <jenkins.baseline>2.479</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.1</jenkins.version>

From 26f459d90b5dade00480dead8e5b018660832247 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 4 Nov 2024 12:29:06 -0800
Subject: [PATCH 2/3] Adapt to `apacheds` breaking changes

---
 pom.xml                                       | 21 -------------------
 .../security/plugins/ldap/LDAPRule.java       |  4 ----
 2 files changed, 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index c01e1a6e..77900b92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,13 +163,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-interceptor-kerberos</artifactId>
-      <version>${apacheds.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-jdbm-partition</artifactId>
@@ -177,13 +170,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-kerberos-codec</artifactId>
-      <version>${apacheds.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-ldif-partition</artifactId>
@@ -205,13 +191,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-protocol-kerberos</artifactId>
-      <version>${apacheds.version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.directory.server</groupId>
       <artifactId>apacheds-protocol-ldap</artifactId>
diff --git a/src/test/java/jenkins/security/plugins/ldap/LDAPRule.java b/src/test/java/jenkins/security/plugins/ldap/LDAPRule.java
index e8bb5b47..34b60c1b 100644
--- a/src/test/java/jenkins/security/plugins/ldap/LDAPRule.java
+++ b/src/test/java/jenkins/security/plugins/ldap/LDAPRule.java
@@ -59,7 +59,6 @@
 import org.apache.directory.api.util.exception.Exceptions;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.DefaultDirectoryService;
-import org.apache.directory.server.core.api.CacheService;
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.InstanceLayout;
@@ -266,9 +265,6 @@ private void initDirectoryService(File workDir) throws Exception {
         service = new DefaultDirectoryService();
         service.setInstanceId(currentTest.getDisplayName());
         service.setInstanceLayout(new InstanceLayout(workDir));
-        CacheService cacheService = new CacheService();
-        cacheService.initialize(service.getInstanceLayout(), "test");
-        service.setCacheService(cacheService);
 
         factory = new JdbmPartitionFactory();
 

From 64beb5c3262ce4b5d5420e7e292f5ef28d0efc54 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 4 Nov 2024 12:41:16 -0800
Subject: [PATCH 3/3] Clean up exclusions

---
 pom.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 77900b92..dda24f89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,11 +119,11 @@
       <exclusions>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
-          <artifactId>bcprov-jdk15on</artifactId>
+          <artifactId>bcpkix-jdk15on</artifactId>
         </exclusion>
-        <exclusion> <!-- core provides something else -->
-          <groupId>commons-codec</groupId>
-          <artifactId>commons-codec</artifactId>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -197,6 +197,10 @@
       <version>${apacheds.version}</version>
       <scope>test</scope>
       <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
           <artifactId>bcprov-jdk15on</artifactId>