From 9df0c0351216575123c607a39c5c7ec453bae64b Mon Sep 17 00:00:00 2001
From: maximthomas <maxim.thomas@gmail.com>
Date: Tue, 29 Apr 2025 07:55:53 +0000
Subject: [PATCH] Merge branch 'master' into update-jdk-11

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/BackendCreationHelper.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendCreationHelper.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendCreationHelper.java
index 7696218..1cbb46e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendCreationHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/BackendCreationHelper.java
@@ -98,14 +98,16 @@
 
   /** Default indexes to add in a new backend. */
   public static final CreateIndex[] DEFAULT_INDEXES = {
-    CreateIndex.withEqualityAndSubstring("cn"),
-    CreateIndex.withEqualityAndSubstring("givenName"),
-    CreateIndex.withEqualityAndSubstring("mail"),
-    CreateIndex.withEqualityAndSubstring("sn"),
-    CreateIndex.withEqualityAndSubstring("telephoneNumber"),
-    CreateIndex.withEquality("member"),
-    CreateIndex.withEquality("uid"),
-    CreateIndex.withEquality("uniqueMember")
+// Default indexes moved to the PluggableBackendConfiguration.xml file,
+// see https://github.com/OpenIdentityPlatform/OpenDJ/issues/497
+//    CreateIndex.withEqualityAndSubstring("cn"),
+//    CreateIndex.withEqualityAndSubstring("givenName"),
+//    CreateIndex.withEqualityAndSubstring("mail"),
+//    CreateIndex.withEqualityAndSubstring("sn"),
+//    CreateIndex.withEqualityAndSubstring("telephoneNumber"),
+//    CreateIndex.withEquality("member"),
+//    CreateIndex.withEquality("uid"),
+//    CreateIndex.withEquality("uniqueMember")
   };
 
   /**

--
Gitblit v1.10.0