From ce1bfc7d5d1e4b0ac6a873546f36e54baf130e68 Mon Sep 17 00:00:00 2001 From: Sonia Zaldana Date: Tue, 19 Jan 2021 09:47:06 -0500 Subject: [PATCH] [ELY-2071] Upgrade Apache DS to version AM26 --- pom.xml | 2 +- .../test/java/org/wildfly/security/apacheds/LdapService.java | 1 - .../security/credential/store/KeystorePasswordStoreTest.java | 2 +- .../java/org/wildfly/security/ldap/DirContextFactoryRule.java | 1 - .../java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java | 2 +- .../src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java | 1 - 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 9d9f2cf9b76..5f89578fd53 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2.0.13 2.0.2 3.8.1 - 2.0.0-M24 + 2.0.0.AM26 1.0.0 2.0.0-M3 1.0.0-M8 diff --git a/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java b/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java index 66405961cbd..6952fa783d2 100644 --- a/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java +++ b/tests/base/src/test/java/org/wildfly/security/apacheds/LdapService.java @@ -143,7 +143,6 @@ public Builder addPartition(final String id, final String partitionName, final i for (String current : indexes) { partitionFactory.addIndex(partition, current, indexSize); } - partition.setCacheService(directoryService.getCacheService()); partition.initialize(); directoryService.addPartition(partition); diff --git a/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java b/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java index 4c25b0e4162..dac1018aafd 100644 --- a/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java +++ b/tests/base/src/test/java/org/wildfly/security/credential/store/KeystorePasswordStoreTest.java @@ -35,7 +35,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.function.Supplier; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java b/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java index b32c294bc41..6b8753245d2 100644 --- a/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java +++ b/tests/base/src/test/java/org/wildfly/security/ldap/DirContextFactoryRule.java @@ -98,7 +98,6 @@ private static void createStores(KeyStore localhostKeyStore, KeyStore scarabKeyS .addExtension(false, "BasicConstraints", "CA:true,pathlen:2147483647") .build(); X509Certificate issuerCertificate = issuerSelfSignedX509CertificateAndSigningKey.getSelfSignedCertificate(); - localhostKeyStore.setCertificateEntry("ca", issuerCertificate); trustStore.setCertificateEntry("mykey", issuerCertificate); // Generates certificate and keystore for Localhost diff --git a/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java b/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java index a42a8b3074e..0b29b35b41d 100644 --- a/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java +++ b/tests/base/src/test/java/org/wildfly/security/ldap/ModifiabilitySuiteChild.java @@ -72,7 +72,7 @@ public static void createRealm() throws InvalidNameException { AttributeMapping.fromIdentity().from("sn").to("lastName").build(), AttributeMapping.fromIdentity().from("description").to("description").build(), AttributeMapping.fromIdentity().from("telephoneNumber").to("phones").build(), - AttributeMapping.fromFilter("(&(objectClass=groupOfNames)(member={0}))").searchDn("ou=Finance,dc=elytron,dc=wildfly,dc=org").extractRdn("OU").to("businessArea").build()) + AttributeMapping.fromFilter("(&(objectClass=groupOfNames)(member=uid={0}))").searchDn("ou=Finance,dc=elytron,dc=wildfly,dc=org").extractRdn("OU").to("businessArea").build()) .setNewIdentityParent(new LdapName("dc=elytron,dc=wildfly,dc=org")) .setNewIdentityAttributes(attributes) .setIteratorFilter("(uid=*)") diff --git a/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java b/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java index 88789b58e58..a0f4bdc72bd 100644 --- a/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java +++ b/tests/base/src/test/java/org/wildfly/security/sasl/gssapi/TestKDC.java @@ -117,7 +117,6 @@ private static void createPartition(final DirectoryServiceFactory dsf, final Sch for (String current : indexAttributes) { pf.addIndex(p, current, 10); } - p.setCacheService(directoryService.getCacheService()); p.initialize(); directoryService.addPartition(p); }