X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fext%2Ftest%2Forg%2Fargeo%2Fosgi%2Fuseradmin%2FLdifUserAdminTest.java;h=a8a7d226a1aa124c135d038882782af8e93bf291;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=e76769d71078150dc61ec24798729a9de15a8780;hpb=10b1584cd1e3550ecdd1d35dded9c4266d1cb4d8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
index e76769d71..a8a7d226a 100644
--- a/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
+++ b/org.argeo.security.core/ext/test/org/argeo/osgi/useradmin/LdifUserAdminTest.java
@@ -8,6 +8,7 @@ import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
@@ -15,9 +16,6 @@ import java.util.UUID;
 
 import javax.transaction.TransactionManager;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.IOUtils;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
@@ -95,7 +93,8 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 		assertEquals("root@localhost", rootUser.getProperties().get("mail"));
 
 		// credentials
-		byte[] hashedPassword = ("{SHA}" + Base64.encodeBase64String(DigestUtils.sha1("demo".getBytes()))).getBytes();
+		byte[] hashedPassword = ("{SHA}" + Base64.getEncoder().encodeToString(DigestUtils.sha1("demo".getBytes())))
+				.getBytes();
 		assertTrue(rootUser.hasCredential(LdifName.userPassword.name(), hashedPassword));
 		assertTrue(demoUser.hasCredential(LdifName.userPassword.name(), hashedPassword));
 
@@ -116,7 +115,7 @@ public class LdifUserAdminTest extends TestCase implements BasicTestConstants {
 			ByteArrayOutputStream out = new ByteArrayOutputStream();
 			((LdifUserAdmin) userAdmin).save(out);
 			byte[] arr = out.toByteArray();
-			IOUtils.closeQuietly(out);
+			out.close();
 			userAdmin.destroy();
 			// String written = new String(arr);
 			// System.out.print(written);