Migrating to Apache DS 2.0.0.AM27 and LDAP API 2.1.5

apache · Oct 26, 2023 · 4690a56 · 4690a56
1 parent bb0f47a
commit 4690a56
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 22 deletions.
diff --git a/...java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractLdapIdentityBackendTest.java b/...java/org/apache/kerby/kerberos/kerb/identity/backend/AbstractLdapIdentityBackendTest.java
@@ -23,7 +23,7 @@
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend;
 import org.apache.kerby.kerberos.kerb.KrbException;
-import org.junit.jupiter.api.After;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 public abstract class AbstractLdapIdentityBackendTest extends  BackendTest {
@@ -51,7 +51,7 @@ public static void setLdapServer(LdapServer ldapServer) {
         AbstractLdapIdentityBackendTest.ldapServer = ldapServer;
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         backend.stop();
         backend.release();

diff --git a/...ava/org/apache/kerby/kerberos/kerb/identity/backend/DirectoryLdapIdentityBackendTest.java b/...ava/org/apache/kerby/kerberos/kerb/identity/backend/DirectoryLdapIdentityBackendTest.java
@@ -26,13 +26,13 @@
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.annotations.CreatePartition;
 import org.apache.directory.server.core.api.LdapCoreSessionConnection;
-import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
 import org.apache.kerby.config.Conf;
 import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend;
-import org.junit.jupiter.api.Before;
-import org.junit.jupiter.api.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-@RunWith(FrameworkRunner.class)
+@ExtendWith({ ApacheDSTestExtension.class })
 @CreateDS(name = "KerberosKRBProtocolTest-class",
         partitions =
                 {
@@ -63,7 +63,7 @@ public class DirectoryLdapIdentityBackendTest extends AbstractLdapIdentityBacken
     private static final String ADMIN_PW = "secret";
 
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         Conf config = new Conf();
         config.setString("admin_dn", ADMIN_DN);

diff --git a/...end/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapBackendKdcTest.java b/...end/src/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapBackendKdcTest.java
@@ -24,22 +24,22 @@
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.annotations.CreatePartition;
-import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
 import org.apache.kerby.config.Conf;
 import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend;
 import org.apache.kerby.kerberos.kerb.KrbException;
 import org.apache.kerby.kerberos.kerb.server.KdcConfigKey;
 import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
 import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
-import org.junit.jupiter.api.After;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Before;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.runner.RunWith;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(FrameworkRunner.class)
+@ExtendWith({ ApacheDSTestExtension.class })
 @CreateDS(name = "KerberosKRBProtocolTest-class",
         partitions =
                 {
@@ -70,7 +70,7 @@ public class LdapBackendKdcTest extends AbstractLdapBackendKdcTest {
     private static final String ADMIN_DN = "uid=admin,ou=system";
     private static final String ADMIN_PW = "secret";
 
-    @Before
+    @BeforeEach
     public void startUp() throws Exception {
         Conf config = new Conf();
         config.setString("host", "127.0.0.1");
@@ -83,7 +83,7 @@ public void startUp() throws Exception {
         backend.start();
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         backend.stop();
         backend.release();

diff --git a/...rc/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapIdentityBackendTest.java b/...rc/test/java/org/apache/kerby/kerberos/kerb/identity/backend/LdapIdentityBackendTest.java
@@ -24,13 +24,13 @@
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
 import org.apache.directory.server.core.annotations.CreatePartition;
-import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.ApacheDSTestExtension;
 import org.apache.kerby.config.Conf;
 import org.apache.kerby.kerberos.kdc.identitybackend.LdapIdentityBackend;
-import org.junit.jupiter.api.Before;
-import org.junit.jupiter.api.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-@RunWith(FrameworkRunner.class)
+@ExtendWith({ ApacheDSTestExtension.class })
 @CreateDS(name = "KerberosKRBProtocolTest-class",
         partitions =
                 {
@@ -60,7 +60,7 @@ public class LdapIdentityBackendTest extends AbstractLdapIdentityBackendTest {
     private static final String ADMIN_DN = "uid=admin,ou=system";
     private static final String ADMIN_PW = "secret";
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         Conf config = new Conf();
         config.setString("host", "127.0.0.1");
@@ -72,4 +72,5 @@ public void setUp() throws Exception {
         backend.initialize();
         backend.start();
     }
+
 }
diff --git a/kerby-backend/pom.xml b/kerby-backend/pom.xml
@@ -51,7 +51,7 @@
       </activation>
       <modules>
         <module>json-backend</module>
-        <!--<module>ldap-backend</module>-->
+        <module>ldap-backend</module>
         <module>mavibot-backend</module>
         <module>zookeeper-backend</module>
         <module>mysql-backend</module>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -29,11 +29,11 @@
     <packaging>pom</packaging>
 
     <properties>
-        <apacheds.version>2.0.0.AM26</apacheds.version>
+        <apacheds.version>2.0.0.AM27</apacheds.version>
         <commons-io.version>2.12.0</commons-io.version>
         <gson.version>2.10.1</gson.version>
         <h2.version>2.2.224</h2.version>
-        <ldap.api.version>2.1.4</ldap.api.version>
+        <ldap.api.version>2.1.5</ldap.api.version>
         <junit.version>5.10.0</junit.version>
         <nimbus.jose.version>9.37</nimbus.jose.version>
         <slf4j.version>1.7.36</slf4j.version>