diff --git a/pom.xml b/pom.xml index b0c4e154..dda24f89 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 999999-SNAPSHOT jenkinsci/${project.artifactId}-plugin - 2.0.0.AM25 + 2.0.0.AM27 2.479 ${jenkins.baseline}.1 @@ -119,11 +119,11 @@ org.bouncycastle - bcprov-jdk15on + bcpkix-jdk15on - - commons-codec - commons-codec + + org.bouncycastle + bcprov-jdk15on @@ -163,13 +163,6 @@ test - - org.apache.directory.server - apacheds-interceptor-kerberos - ${apacheds.version} - test - - org.apache.directory.server apacheds-jdbm-partition @@ -177,13 +170,6 @@ test - - org.apache.directory.server - apacheds-kerberos-codec - ${apacheds.version} - test - - org.apache.directory.server apacheds-ldif-partition @@ -205,19 +191,16 @@ test - - org.apache.directory.server - apacheds-protocol-kerberos - ${apacheds.version} - test - - org.apache.directory.server apacheds-protocol-ldap ${apacheds.version} test + + org.bouncycastle + bcpkix-jdk15on + org.bouncycastle bcprov-jdk15on 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();