From fa6abdb620b5b6acc70773d98d84ab16a58c4578 Mon Sep 17 00:00:00 2001 From: Valera V Harseko Date: Sat, 11 Jul 2026 20:34:59 +0300 Subject: [PATCH 1/2] Enable Javadoc doclint (all,-missing) and fail on warnings - Replace none with a single inherited property all,-missing + ${doclint}; drop the per-module duplicates. - Bump maven-javadoc-plugin 3.11.2 -> 3.12.0 and enable true. - Fix every doclint error and warning across all modules on both JDK 11 and JDK 26: escape bare &, < and > in comments; -> ;
->
; drop self-closing

and empty

; fix heading hierarchy, broken {@link} references, malformed HTML and ASCII diagrams; add missing @param/@throws descriptions. - Fix the config generator: clientMO.xsl / serverMO.xsl emit null and true; fix two > typos in the HTTP*Authorization configuration XML; reword an LDAP filter example to avoid a bare &. - Pin org.openidentityplatform.commons.i18n-framework:maven-plugin to ${commons.version} and bump commons to 3.1.2-SNAPSHOT so message descriptor classes are generated with the HTML-escaping generator (OpenIdentityPlatform/commons#271); remove the **/*Messages.java Javadoc exclusion. Verified with mvn clean install on JDK 11 and JDK 26: 24/24 modules, 0 doclint errors, 0 warnings. --- .../forgerock/opendj/cli/CommonArguments.java | 5 +- .../opendj/cli/ConnectionFactoryProvider.java | 8 ++- .../opendj/cli/MultiChoiceArgument.java | 13 +++-- .../opendj/cli/MultiColumnPrinter.java | 5 +- .../java/com/forgerock/opendj/cli/Utils.java | 11 ++-- opendj-config/pom.xml | 2 +- .../config/DurationPropertyDefinition.java | 3 +- .../config/IntegerPropertyDefinition.java | 3 +- .../opendj/config/PropertyDefinition.java | 5 +- .../opendj/config/SizePropertyDefinition.java | 3 +- opendj-core/pom.xml | 3 +- .../forgerock/reactive/ReactiveFilter.java | 3 + .../opendj/ldap/ByteSequenceReader.java | 5 +- .../opendj/ldap/ByteStringBuilder.java | 5 +- .../org/forgerock/opendj/ldap/Connection.java | 16 ++---- .../forgerock/opendj/ldap/Connections.java | 33 +++++------ .../java/org/forgerock/opendj/ldap/DN.java | 9 +-- .../org/forgerock/opendj/ldap/Filter.java | 5 +- .../opendj/ldap/LDAPConnectionFactory.java | 3 +- .../java/org/forgerock/opendj/ldap/RDN.java | 8 +-- .../org/forgerock/opendj/ldap/SortKey.java | 5 +- .../ADNotificationRequestControl.java | 7 ++- .../opendj/ldap/controls/Control.java | 3 +- .../PasswordExpiredResponseControl.java | 3 +- .../PasswordExpiringResponseControl.java | 3 +- .../PasswordPolicyRequestControl.java | 3 +- .../PasswordPolicyResponseControl.java | 3 +- .../ServerSideSortRequestControl.java | 3 +- .../ServerSideSortResponseControl.java | 3 +- .../opendj/ldap/requests/ExtendedRequest.java | 3 +- .../PasswordModifyExtendedRequest.java | 3 +- .../ldap/requests/PlainSASLBindRequest.java | 5 +- .../opendj/ldap/requests/SASLBindRequest.java | 3 +- .../opendj/ldap/spi/LDAPConnectionImpl.java | 5 +- .../opendj/ldap/spi/LdapMessages.java | 2 +- .../java/org/forgerock/opendj/ldif/LDIF.java | 3 +- .../opendj/security/KeyStoreParameters.java | 3 +- .../opendj/security/package-info.java | 4 +- opendj-core/src/main/javadoc/overview.html | 4 +- opendj-doc-maven-plugin/pom.xml | 2 +- opendj-dsml-servlet/pom.xml | 1 - opendj-ldap-sdk-examples/pom.xml | 2 +- .../org/forgerock/opendj/examples/Proxy.java | 3 +- opendj-maven-plugin/pom.xml | 2 +- .../opendj/maven/ConcatSchemaMojo.java | 2 +- .../opendj/maven/GenerateConfigMojo.java | 16 +++--- .../resources/config/stylesheets/clientMO.xsl | 9 +-- .../resources/config/stylesheets/serverMO.xsl | 3 +- ...sicAuthorizationMechanismConfiguration.xml | 3 +- ...th2AuthorizationMechanismConfiguration.xml | 3 +- ...roughAuthenticationPolicyConfiguration.xml | 3 +- .../pom.xml | 2 +- ...enidmAccountStatusNotificationHandler.java | 3 +- .../openidm/accountchange/PersistedQueue.java | 4 +- opendj-rest2ldap/pom.xml | 2 +- .../opendj/rest2ldap/DnTemplate.java | 2 +- .../forgerock/opendj/rest2ldap/Rest2Ldap.java | 9 +-- .../rest2ldap/Rest2LdapJsonConfigurator.java | 3 +- .../authz/AuthenticationStrategies.java | 3 +- .../opendj/rest2ldap/authz/Authorization.java | 2 +- .../authz/Rfc7662AccessTokenResolver.java | 2 +- .../opendj/rest2ldap/schema/JsonSchema.java | 12 ++-- opendj-server-legacy/pom.xml | 1 - .../embedded/EmbeddedDirectoryServer.java | 3 +- .../java/org/opends/admin/ads/ADSContext.java | 3 +- .../browser/BrowserController.java | 5 +- .../java/org/opends/quicksetup/Constants.java | 3 +- .../org/opends/quicksetup/ui/FieldName.java | 5 +- .../org/opends/quicksetup/ui/QuickSetup.java | 2 +- .../quicksetup/util/ServerController.java | 3 +- .../org/opends/quicksetup/util/Utils.java | 5 +- .../admin/doc/ConfigGuideGeneration.java | 3 +- .../java/org/opends/server/api/Backend.java | 2 +- .../org/opends/server/api/LocalBackend.java | 2 +- .../dseecompat/EnumEvalResult.java | 3 +- .../server/backends/ChangelogBackend.java | 7 ++- .../server/backends/jeb/package-info.java | 55 ++++++------------- .../server/backends/pluggable/EntryID.java | 2 +- .../backends/pluggable/spi/EmptyCursor.java | 2 +- .../server/config/ConfigurationHandler.java | 1 - .../controls/PersistentSearchChangeType.java | 3 +- .../server/core/BackendConfigManager.java | 2 +- .../server/core/LoggerConfigManager.java | 1 - .../server/core/PasswordPolicyState.java | 2 +- .../opends/server/discovery/Partition.java | 4 +- .../org/opends/server/extensions/BCrypt.java | 15 ++--- .../opends/server/extensions/Sha2Crypt.java | 4 +- .../extensions/TraditionalWorkQueue.java | 1 - .../loggers/HTTPAccessLogPublisher.java | 5 +- .../server/protocols/http/HTTPStatistics.java | 3 +- .../server/protocols/http/HTTPStatsProbe.java | 2 +- .../LocalizedHttpApplicationException.java | 3 +- .../HttpAuthorizationMechanismFactory.java | 3 +- .../jmx/DirectoryRMIServerSocketFactory.java | 6 +- .../replication/common/ServerState.java | 5 +- .../replication/plugin/EntryHistorical.java | 2 +- .../replication/protocol/StartSessionMsg.java | 9 +-- .../replication/server/ChangelogState.java | 9 +-- .../server/replication/server/MsgQueue.java | 9 +-- .../replication/server/ServerHandler.java | 2 +- .../changelog/api/ReplicationDomainDB.java | 5 +- .../file/ECLEnabledDomainPredicate.java | 2 +- .../service/ReplicationDomain.java | 1 - .../replication/service/package-info.java | 3 +- .../opends/server/schema/SchemaConstants.java | 2 +- .../opends/server/schema/SchemaHandler.java | 2 +- .../opends/server/tools/LDAPConnection.java | 3 +- .../server/types/SubtreeSpecification.java | 3 +- .../opends/server/util/ServerConstants.java | 3 +- .../org/opends/server/util/StaticUtils.java | 1 - .../src/org/opends/server/snmp/DsMIBImpl.java | 3 +- .../server/snmp/SNMPInetAddressAcl.java | 3 +- .../org/opends/server/snmp/SNMPUserAcl.java | 5 +- opendj-server/pom.xml | 2 +- .../opendj/server/core/Attachment.java | 3 +- pom.xml | 13 ++++- 116 files changed, 295 insertions(+), 265 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java index 5cd5b86d64..8aa2e680d4 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package com.forgerock.opendj.cli; @@ -391,7 +392,7 @@ public static StringArgument baseDNArgument() throws ArgumentException { } /** - * Returns the "bindDN" string argument.
+ * Returns the "bindDN" string argument.
* N.B : the 'D' short option is also used by rootUserDN. * * @param defaultBindDN @@ -406,7 +407,7 @@ public static StringArgument bindDNArgument(final String defaultBindDN) throws A /** - * Returns the "bindDN" string argument.
+ * Returns the "bindDN" string argument.
* N.B : the 'D' short option is also used by rootUserDN. * * @param defaultBindDN diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index 056ea7c2ef..77c90ccd8f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2011-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package com.forgerock.opendj.cli; @@ -702,7 +703,8 @@ public String toString() { * If a problem occurs while loading with the key store. * @throws CertificateException * If a problem occurs while loading with the key store. - * @throws UnrecoverableKeyException + * @throws UnrecoverableKeyException + * If a problem occurs while recovering a key from the key store. */ public X509KeyManager getKeyManager(String keyStoreFile) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException { @@ -898,7 +900,7 @@ private String parseSASLOptionValue(final String option) throws ArgumentExceptio * user will be different as a normal connection. E.g if set : * * 

-     * >>>> Specify OpenDJ LDAP connection parameters
+     * >>>> Specify OpenDJ LDAP connection parameters
      *
      * Directory server administration port number [4444]:
      *
@@ -906,7 +908,7 @@ private String parseSASLOptionValue(final String option) throws ArgumentExceptio * vs normal mode * * 
-     * >>>> Specify OpenDJ LDAP connection parameters
+     * >>>> Specify OpenDJ LDAP connection parameters
      *
      * Directory server port number [1389]:
      *
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java index 7dd713c0ba..fc9499b19b 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java @@ -13,6 +13,7 @@ * * Copyright 2006-2008 Sun Microsystems, Inc. * Portions copyright 2014-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package com.forgerock.opendj.cli; @@ -36,7 +37,7 @@ public final class MultiChoiceArgument extends Argument { /** * Returns a builder which can be used for incrementally constructing a new - * {@link MultiChoiceArgument}. + * {@link MultiChoiceArgument}. * * @param * The type of values returned by this argument. @@ -48,7 +49,7 @@ public static Builder builder(final String longIdentifier) { return new Builder<>(longIdentifier); } - /** A fluent API for incrementally constructing {@link MultiChoiceArgument}. */ + /** A fluent API for incrementally constructing {@link MultiChoiceArgument}. */ public static final class Builder extends ArgumentBuilder, V, MultiChoiceArgument> { private final List allowedValues = new LinkedList<>(); @@ -62,10 +63,10 @@ Builder getThis() { } /** - * Specifies the set of values that are allowed for the {@link MultiChoiceArgument}. + * Specifies the set of values that are allowed for the {@link MultiChoiceArgument}. * * @param allowedValues - * The {@link MultiChoiceArgument} allowed values. + * The {@link MultiChoiceArgument} allowed values. * @return This builder. */ public Builder allowedValues(final Collection allowedValues) { @@ -74,10 +75,10 @@ public Builder allowedValues(final Collection allowedValues) { } /** - * Specifies the set of values that are allowed for the {@link MultiChoiceArgument}. + * Specifies the set of values that are allowed for the {@link MultiChoiceArgument}. * * @param allowedValues - * The {@link MultiChoiceArgument} allowed values. + * The {@link MultiChoiceArgument} allowed values. * @return This builder. */ @SuppressWarnings("unchecked") diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java index a1ece9ad2e..b83cd67c07 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package com.forgerock.opendj.cli; @@ -62,7 +63,7 @@ *

* The following code sample presents how to create a {@link MultiColumnPrinter} to write CSV data: * 

- * final List columns = new ArrayList<>();
+ * final List<MultiColumnPrinter.Column> columns = new ArrayList<>();
  * columns.add(MultiColumnPrinter.column("CountryNameColumnId", "country_name", 0));
  * columns.add(MultiColumnPrinter.column("populationDensityId", "population_density", 1));
  * columns.add(MultiColumnPrinter.column("GiniId", "gini", 1));
@@ -84,7 +85,7 @@
  * The following code sample presents how to configure a {@link MultiColumnPrinter}
  * to print the same data on console with some title headers.
  * 
- *     final List columns = new ArrayList<>();
+ *     final List<MultiColumnPrinter.Column> columns = new ArrayList<>();
  *     columns.add(MultiColumnPrinter.separatorColumn());
  *     columns.add(MultiColumnPrinter.column("CountryNameColumnId", "Country Name", 15, 0));
  *     columns.add(MultiColumnPrinter.column("populationDensityId", "Density", 10, 1));
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
index 59b77e54f0..b9dc254bc7 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package com.forgerock.opendj.cli;
 
@@ -612,10 +613,10 @@ public static void printWrappedText(final PrintStream stream, final LocalizableM
      * Repeats the given {@code char} n times.
      *
      * @param charToRepeat
-     *      The {code char} to repeat.
+     *      The {@code char} to repeat.
      * @param length
      *      The repetition count.
-     * @return The given {code char} n times.
+     * @return The given {@code char} n times.
      */
     public static String repeat(final char charToRepeat, final int length) {
         final char[] str = new char[length];
@@ -624,11 +625,11 @@ public static String repeat(final char charToRepeat, final int length) {
     }
 
     /**
-     * Return a {code ValidationCallback} which can be used to validate a port number.
+     * Return a {@code ValidationCallback} which can be used to validate a port number.
      *
      * @param defaultPort
      *        The default value to suggest to the user.
-     * @return a {code ValidationCallback} which can be used to validate a port number.
+     * @return a {@code ValidationCallback} which can be used to validate a port number.
      */
     public static ValidationCallback portValidationCallback(final int defaultPort) {
         return new ValidationCallback() {
@@ -673,7 +674,7 @@ public static void throwIfArgumentsConflict(final Argument arg1, final Argument
     }
 
     /**
-     * Adds a {@link LocalizableMessage} to the provided {@link Collection}
+     * Adds a {@link LocalizableMessage} to the provided {@link Collection}
      * if both provided {@link Argument} are presents in the command line arguments.
      *
      * @param errors
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 3b1e3502cf..0608fe5b1c 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2013-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
 -->
 
   4.0.0
@@ -66,7 +67,6 @@
     
       org.forgerock.opendj.*;provide:=true
     
-    none
   
 
   ${project.groupId}.${project.artifactId}
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
index 1f89a6f028..cae4f33d1c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.
  * Portions Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.config;
@@ -179,7 +180,7 @@ public final void setMaximumUnit(DurationUnit unit) {
          * Set the lower limit in milli-seconds.
          *
          * @param lowerLimit
-         *            The new lower limit (must be >= 0) in milli-seconds.
+         *            The new lower limit (must be >= 0) in milli-seconds.
          * @throws IllegalArgumentException
          *             If a negative lower limit was specified, or the lower
          *             limit is greater than the upper limit.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
index a993af158f..7f39eb6561 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.
  * Portions Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.config;
@@ -73,7 +74,7 @@ private Builder(AbstractManagedObjectDefinition d, String propertyName) {
          * Set the lower limit.
          *
          * @param lowerLimit
-         *            The new lower limit (must be >= 0).
+         *            The new lower limit (must be >= 0).
          * @throws IllegalArgumentException
          *             If a negative lower limit was specified or the lower
          *             limit is greater than the upper limit.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
index a16c3883f4..f8d3d9f335 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinition.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.
  * Portions Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.config;
@@ -338,8 +339,8 @@ public String encodeValue(T value) {
     /**
      * Indicates whether some other object is "equal to" this property
      * definition. This method must obey the general contract of
-     * Object.equals(Object). Additionally, this method can return
-     * true only if the specified Object is also a property
+     * Object.equals(Object). Additionally, this method can return
+     * true only if the specified Object is also a property
      * definition and it has the same name, as returned by {@link #getName()},
      * and also is deemed to be "compatible" with this property
      * definition. Compatibility means that the two property definitions share
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
index d7f440907b..0d06cc19df 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.
  * Portions Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.config;
 
@@ -71,7 +72,7 @@ private Builder(AbstractManagedObjectDefinition d, String propertyName) {
          * Set the lower limit in bytes.
          *
          * @param lowerLimit
-         *            The new lower limit (must be >= 0) in bytes.
+         *            The new lower limit (must be >= 0) in bytes.
          * @throws IllegalArgumentException
          *             If a negative lower limit was specified, or if the lower
          *             limit is greater than the upper limit.
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index 24afbb2519..36721f0f11 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -13,7 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2011-2016 ForgeRock AS.
-  Portions Copyright 2025 3A Systems LLC.
+  Portions Copyright 2025-2026 3A Systems LLC.
 -->
 
     4.0.0
@@ -120,7 +120,6 @@
             com.sun.security.auth*;resolution:=optional
         
         yyyy-MM-dd'T'HH:mm:ss'Z'
-        none
     
 
 
diff --git a/opendj-core/src/main/java/com/forgerock/reactive/ReactiveFilter.java b/opendj-core/src/main/java/com/forgerock/reactive/ReactiveFilter.java
index d04212c5b4..684393f5ea 100644
--- a/opendj-core/src/main/java/com/forgerock/reactive/ReactiveFilter.java
+++ b/opendj-core/src/main/java/com/forgerock/reactive/ReactiveFilter.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package com.forgerock.reactive;
 
@@ -21,6 +22,7 @@
 /**
  * Filters and/or transforms the request and/or response of an exchange.
  *
+ * 
{@code
  *                +--------+              +---------+
  *   ---> I1 ---> |        | ---> I2 ---> |         |
  *                | Filter |              | Handler |
@@ -32,6 +34,7 @@
  *                | Filter |              | Filter  |              | Handler |
  *   <--- O1 --<  |        | <--- O2 <--- |         | <--- O3 ---< |         |
  *                +--------+              +---------+              +---------+
+ * }

  *
  * @param 
  *            Context in which the filter will be evaluated
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
index a9ba54f7dd..c09d546c79 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2009 Sun Microsystems, Inc.
  * Portions copyright 2012-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.ldap;
 
@@ -299,7 +300,7 @@ public long readLong() {
     /**
      * Relative read method for reading a compacted long value.
      * Compaction allows to reduce number of bytes needed to hold long types
-     * depending on its value (i.e: if value < 128, value will be encoded using one byte only).
+     * depending on its value (i.e: if value < 128, value will be encoded using one byte only).
      * Reads the next bytes at this reader's current position, composing them into a long value
      * according to big-endian byte order, and then increments the position by the size of the
      * encoded long.
@@ -321,7 +322,7 @@ public long readCompactUnsignedLong() {
     /**
      * Relative read method for reading a compacted int value.
      * Compaction allows to reduce number of bytes needed to hold int types
-     * depending on its value (i.e: if value < 128, value will be encoded using one byte only).
+     * depending on its value (i.e: if value < 128, value will be encoded using one byte only).
      * Reads the next bytes at this reader's current position, composing them into an int value
      * according to big-endian byte order, and then increments the position by the size of the
      * encoded int.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java
index cb6702973e..3a6d332e5d 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2009 Sun Microsystems, Inc.
  * Portions copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.ldap;
 
@@ -300,7 +301,7 @@ public ByteStringBuilder(final ByteSequence bs) {
      *
      * 
      * int i = ...;
-     * int i8bits = i & 0xFF;
+     * int i8bits = i & 0xFF;
      * // only use "i8bits"
      * 

      * OR
@@ -643,7 +644,7 @@ public ByteStringBuilder appendObject(final Object o) {
      *
      * 
      * int i = ...;
-     * int i16bits = i & 0xFFFF;
+     * int i16bits = i & 0xFFFF;
      * // only use "i16bits"
      * 

      * OR
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
index dfca65319d..aa5ee88323 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.ldap;
@@ -45,14 +46,12 @@
  * A connection with a Directory Server over which read and update operations
  * may be performed. See RFC 4511 for the LDAPv3 protocol specification and more
  * information about the types of operations defined in LDAP.
- * 

- * 
Operation processing

+ * 
Operation processing

  * 

  * Operations may be performed synchronously or asynchronously depending on the
  * method chosen. Asynchronous methods can be identified by their {@code Async}
  * suffix.
- * 

- * 
Performing operations synchronously

+ * 
Performing operations synchronously

  * 

  * Synchronous methods block until a response is received from the Directory
  * Server, at which point an appropriate {@link Result} object is returned if
@@ -64,8 +63,7 @@
  * another thread. This will cause the calling thread unblock and throw a
  * {@link CancelledResultException} whose cause is the underlying
  * {@link InterruptedException}.
- * 

- * 
Performing operations asynchronously

+ * 
Performing operations asynchronously

  * 

  * Asynchronous methods, identified by their {@code Async} suffix, are
  * non-blocking, returning a {@link LdapPromise} or sub-type thereof which can
@@ -115,8 +113,7 @@
  * SearchResponseHandler handle = ...;
  * connection.search(request, handler);
  * 

- * 

- * 
Closing connections

+ * 
Closing connections

  * 

  * Applications must ensure that a connection is closed by calling
  * {@link #close()} even if a fatal error occurs on the connection. Once a
@@ -127,8 +124,7 @@
  * connection. In this case all requests subsequent to the failure will fail
  * with an appropriate {@link LdapException} when their result is
  * retrieved.
- * 

- * 
Event notification

+ * 
Event notification

  * 

  * Applications can choose to be notified when a connection is closed by the
  * application, receives an unsolicited notification, or experiences a fatal
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
index 051cbcada8..777e9ee51b 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.ldap;
 
@@ -407,17 +408,17 @@ public static  ConnectionFactory newInternalConnectionFactory(
      * connection factories. A round robin load balancing algorithm distributes connection requests across a list of
      * connection factories one at a time. When the end of the list is reached, the algorithm starts again from the
      * beginning.
-     * 

+     * 

      * This algorithm is typically used for load-balancing within data centers, where load must be distributed
      * equally across multiple data sources. This algorithm contrasts with the
      * {@link #newFailoverLoadBalancer(Collection, Options)} which is used for load-balancing between data
      * centers.
-     * 

+     * 

      * If a problem occurs that temporarily prevents connections from being obtained for one of the connection
      * factories, then this algorithm automatically "fails over" to the next operational connection factory in the list.
      * If none of the connection factories are operational then a {@code ConnectionException} is returned to the
      * client.
-     * 

+     * 

      * The implementation periodically attempts to connect to failed connection factories in order to determine if they
      * have become available again.
      *
@@ -470,22 +471,22 @@ int getInitialConnectionFactoryIndex() {
      * Creates a new "fail-over" load-balancer which will load-balance connections across the provided set of connection
      * factories. A fail-over load balancing algorithm provides fault tolerance across multiple underlying connection
      * factories.
-     * 

+     * 

      * This algorithm is typically used for load-balancing between data centers, where there is preference to
      * always forward connection requests to the closest available data center. This algorithm contrasts with the
      * {@link #newRoundRobinLoadBalancer(Collection, Options)} which is used for load-balancing within a data
      * center.
-     * 

+     * 

      * This algorithm selects connection factories based on the order in which they were provided during construction.
      * More specifically, an attempt to obtain a connection factory will always return the first operational
      * connection factory in the list. Applications should, therefore, organize the connection factories such that the
      * preferred (usually the closest) connection factories appear before those which are less preferred.
-     * 

+     * 

      * If a problem occurs that temporarily prevents connections from being obtained for one of the connection
      * factories, then this algorithm automatically "fails over" to the next operational connection factory in the list.
      * If none of the connection factories are operational then a {@code ConnectionException} is returned to the
      * client.
-     * 

+     * 

      * The implementation periodically attempts to connect to failed connection factories in order to determine if they
      * have become available again.
      *
@@ -521,23 +522,23 @@ int getInitialConnectionFactoryIndex() {
      * by performing a linear probe in order to find the next available replica thus ensuring high-availability when a
      * network partition occurs while sacrificing consistency, since the unavailable replica may still be visible to
      * other clients.
-     * 

+     * 

      * This load-balancer distributes requests based on the hash of their target DN and handles all core operations, as
      * well as any password modify extended requests and SASL bind requests which use authentication IDs having the
      * "dn:" form. Note that subtree operations (searches, subtree deletes, and modify DN) are likely to include entries
      * which are "mastered" on different replicas, so client applications should be more tolerant of inconsistencies.
      * Requests that are either unrecognized or that do not have a parameter that may be considered to be a target DN
      * will be routed randomly.
-     * 

+     * 

      * NOTE: this connection factory returns fake connections, since real connections are obtained for each
      * request. Therefore, the returned fake connections have certain limitations: abandon requests will be ignored
      * since they cannot be routed; connection event listeners can be registered, but will only be notified when the
      * fake connection is closed or when all of the connection factories are unavailable.
-     * 

+     * 

      * NOTE: in deployments where there are multiple client applications, care should be taken to ensure that
      * the factories are configured using the same ordering, otherwise requests will not be routed consistently
      * across the client applications.
-     * 

+     * 

      * The implementation periodically attempts to connect to failed connection factories in order to determine if they
      * have become available again.
      *
@@ -665,7 +666,7 @@ private static DN dnOf(final String dnString) {
      * This load balancer allows client applications to linearly scale their deployment for write throughput as well
      * as total number of entries. For example, if a single replicated topology can support 10000 updates/s and a
      * total of 100M entries, then a 4 way distributed topology could support up to 40000 updates/s and 400M entries.
-     * 

+     * 

      * NOTE: there are a number of assumptions in the design of this load balancer as well as a number of
      * limitations:
      * 

      */
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
index 5e69345364..d619c72a00 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
@@ -104,11 +104,11 @@ public int compare(final AVA o1, final AVA o2) {
      * construct a range whose contents is a sub-tree of entries, excluding the base entry:
      *
      * 
-     * SortedMap entries = ...;
+     * SortedMap<DN, Entry> entries = ...;
      * DN baseDN = ...;
      *
      * // Returns a map containing the baseDN and all of its subordinates.
-     * SortedMap subtree = entries.subMap(
+     * SortedMap<DN,Entry> subtree = entries.subMap(
      *     baseDN.child(RDN.minValue()), baseDN.child(RDN.maxValue()));
      * 

      *
@@ -128,11 +128,11 @@ public static RDN minValue() {
      * construct a range whose contents is a sub-tree of entries:
      *
      * 
-     * SortedMap entries = ...;
+     * SortedMap<DN, Entry> entries = ...;
      * DN baseDN = ...;
      *
      * // Returns a map containing the baseDN and all of its subordinates.
-     * SortedMap subtree = entries.subMap(baseDN, baseDN.child(RDN.maxValue()));
+     * SortedMap<DN,Entry> subtree = entries.subMap(baseDN, baseDN.child(RDN.maxValue()));
      * 

      *
      * @return A constant containing a special RDN which sorts after any
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
index 61a76e010a..6ae65bafa6 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2010 Sun Microsystems, Inc.
  * Portions copyright 2012-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.ldap;
 
@@ -47,8 +48,8 @@
  * Connection connection = ...;
  * SearchRequest request = ...;
  *
- * Comparator<Entry> comparator = SortKey.comparator("cn");
- * Set<SearchResultEntry>; results = new TreeSet<SearchResultEntry>(comparator);
+ * Comparator<Entry> comparator = SortKey.comparator("cn");
+ * Set<SearchResultEntry>; results = new TreeSet<SearchResultEntry>(comparator);
  *
  * connection.search(request, results);
  *
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java index c2c6ea3669..1e372d9478 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.controls; @@ -21,7 +22,7 @@ * The persistent search request control for Active Directory as defined by * Microsoft. This control allows a client to receive notification of changes * that occur in an Active Directory server. - *
+ *
* * 
  * Connection connection = ...;
@@ -39,12 +40,12 @@
  *         SearchResultEntry entry = reader.readEntry(); // Entry that changed
  *
  *         Boolean isDeleted = entry.parseAttribute("isDeleted").asBoolean();
- *         if (isDeleted != null && isDeleted) {
+ *         if (isDeleted != null && isDeleted) {
  *             // Handle entry deletion
  *         }
  *         String whenCreated = entry.parseAttribute("whenCreated").asString();
  *         String whenChanged = entry.parseAttribute("whenChanged").asString();
- *         if (whenCreated != null && whenChanged != null) {
+ *         if (whenCreated != null && whenChanged != null) {
  *             if (whenCreated.equals(whenChanged)) {
  *                 //Handle entry addition
  *             } else {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java
index ae1c613697..ca79e7ac9a 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.ldap.controls;
 
@@ -35,7 +36,7 @@
  *
  * Control control = ...;
  * String OID = control.getOID();
- * if (supported != null && !supported.isEmpty() && supported.contains(OID)) {
+ * if (supported != null && !supported.isEmpty() && supported.contains(OID)) {
  *     // The control is supported. Use it here...
  * }
  *
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java index a19e0b72b4..83d4afba0e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.controls; @@ -45,7 +46,7 @@ * PasswordExpiredResponseControl control = * result.getControl(PasswordExpiredResponseControl.DECODER, * new DecodeOptions()); - * if (!(control == null) && control.hasValue()) { + * if (!(control == null) && control.hasValue()) { * // Password expired * } * } catch (DecodeException de) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java index d46cace1f7..76139034fa 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2013-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.controls; @@ -43,7 +44,7 @@ * PasswordExpiringResponseControl control = * result.getControl(PasswordExpiringResponseControl.DECODER, * new DecodeOptions()); - * if (!(control == null) && control.hasValue()) { + * if (!(control == null) && control.hasValue()) { * // Password expires in control.getSecondsUntilExpiration() seconds * } * } catch (DecodeException de) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java index fa6c3dddf2..a178d45e1c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.controls; @@ -49,7 +50,7 @@ * PasswordPolicyResponseControl control = * result.getControl(PasswordPolicyResponseControl.DECODER, * new DecodeOptions()); - * if (!(control == null) && !(control.getWarningType() == null)) { + * if (!(control == null) && !(control.getWarningType() == null)) { * // Password policy warning, use control.getWarningType(), * // and control.getWarningValue(). * } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java index 9351647cfa..13e3d2fd8f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions Copyright 2012-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.controls; @@ -51,7 +52,7 @@ * PasswordPolicyResponseControl control = * result.getControl(PasswordPolicyResponseControl.DECODER, * new DecodeOptions()); - * if (!(control == null) && !(control.getWarningType() == null)) { + * if (!(control == null) && !(control.getWarningType() == null)) { * // Password policy warning, use control.getWarningType(), * // and control.getWarningValue(). * } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java index 134bc63efc..3efc8335d6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.controls; @@ -66,7 +67,7 @@ * * ServerSideSortResponseControl control = result.getControl( * ServerSideSortResponseControl.DECODER, new DecodeOptions()); - * if (control != null && control.getResult() == ResultCode.SUCCESS) { + * if (control != null && control.getResult() == ResultCode.SUCCESS) { * // Entries are sorted. * } else { * // Entries not sorted. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java index 2b7f41227d..781cfb227a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012-2016 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.controls; @@ -60,7 +61,7 @@ * * ServerSideSortResponseControl control = result.getControl( * ServerSideSortResponseControl.DECODER, new DecodeOptions()); - * if (control != null && control.getResult() == ResultCode.SUCCESS) { + * if (control != null && control.getResult() == ResultCode.SUCCESS) { * // Entries are sorted. * } else { * // Entries not sorted. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java index a3cdeaff11..097989e4b5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.requests; @@ -43,7 +44,7 @@ * * ExtendedRequest extension = ...; * String OID = extension.getOID(); - * if (supported != null && !supported.isEmpty() && supported.contains(OID)) { + * if (supported != null && !supported.isEmpty() && supported.contains(OID)) { * // The extension is supported. Use it here... * } * diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java index d0c6b969db..62bcc274a5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java @@ -13,6 +13,7 @@ * * Copyright 2010 Sun Microsystems, Inc. * Portions copyright 2012-2015 ForgeRock AS. + * Portions Copyright 2026 3A Systems, LLC. */ package org.forgerock.opendj.ldap.requests; @@ -36,7 +37,7 @@ * well as for generating a new password if none was provided. * * 
- * String userIdentity = ...; // For example, u:<uid> or dn:<DN>
+ * String userIdentity = ...; // For example, u:<uid> or dn:<DN>
  * char[] oldPassword = ...;
  * char[] newPassword = ...;
  * Connection connection = ...;
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
index bf95492723..8784312f01 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.ldap.requests;
@@ -35,8 +36,8 @@
  * authorization ID, or {@code authzId}, as defined in RFC 4513 section 5.2.1.8.
  *
  * 
- * String authcid = ...;        // Authentication ID, e.g. dn:<dn>, u:<uid>
- * String authzid = ...;        // Authorization ID, e.g. dn:<dn>, u:<uid>
+ * String authcid = ...;        // Authentication ID, e.g. dn:<dn>, u:<uid>
+ * String authzid = ...;        // Authorization ID, e.g. dn:<dn>, u:<uid>
  * char[] password = ...;
  * Connection connection = ...; // Use StartTLS to protect the request
  *
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java
index 8bb67dba05..bd436be364 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2009 Sun Microsystems, Inc.
  * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.ldap.requests;
@@ -30,7 +31,7 @@
  * authenticate using one of the SASL authentication methods defined in RFC
  * 4513.
  * 

- * finish doc.
+ * TODO: finish doc.
  *
  * @see RFC 4513 -
  *      SASL Authorization Identities (authzId) 
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java
index 5fa6b6c3f6..9b2d3ceb06 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.ldap.spi;
 
@@ -116,7 +117,7 @@ public interface LDAPConnectionImpl extends Closeable {
 
     /**
      * Releases any resources associated with this connection.
-     * 

+     * 

      * Calling {@code close} on a connection that is already closed has no effect.
      * @see org.forgerock.opendj.ldap.Connection#close()
      */
@@ -125,7 +126,7 @@ public interface LDAPConnectionImpl extends Closeable {
 
     /**
      * Releases any resources associated with this connection.
-     * 

+     * 

      * Calling {@code close} on a connection that is already closed has no effect.
      *
      * @param request
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapMessages.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapMessages.java
index 9dfab41277..9f31159cfc 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapMessages.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapMessages.java
@@ -31,7 +31,7 @@ private LdapMessages() {
     }
 
     /**
-     * Creates a new {@link     } containing a partially decoded LDAP message.
+     * Creates a new {@link LdapRequestEnvelope} containing a partially decoded LDAP message.
      *
      * @param messageType
      *            Operation code of the message
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
index d095c89fc4..aba38bf714 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.ldif;
 
@@ -292,7 +293,7 @@ public static Entry makeEntry(List ldifLines) {
      * 

      * Sample usage:
      * 
-     * List smiths = TestCaseUtils.makeEntries(
+     * List<Entry> smiths = TestCaseUtils.makeEntries(
      *   "dn: cn=John Smith,dc=example,dc=com",
      *   "objectclass: inetorgperson",
      *   "cn: John Smith",
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/security/KeyStoreParameters.java b/opendj-core/src/main/java/org/forgerock/opendj/security/KeyStoreParameters.java
index afa0fc9e29..4278e9abe6 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/security/KeyStoreParameters.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/security/KeyStoreParameters.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.security;
 
@@ -42,7 +43,7 @@ public final class KeyStoreParameters implements LoadStoreParameter {
      * protected by a separate password. The default value for this option is a password factory which always
      * returns {@code null}, indicating that there is no global password and that separate passwords should be used
      * instead.
-     * 

+     * 

      * Applications should provide a factory which always returns a new instance of the same password. The LDAP key
      * store will destroy the contents of the returned password after each use. It is the responsibility of the
      * factory to protect the in memory representation of the password between successive calls.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/security/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/security/package-info.java
index 11ed6e74fc..b6f4c63198 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/security/package-info.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/security/package-info.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 /**
@@ -19,7 +20,6 @@
  * java.security.KeyStore KeyStore} service. The key store has the type "LDAP" and alias "OPENDJ" and can be created
  * using a number of approaches. Firstly, by directly calling one of the factory methods in {@link
  * org.forgerock.opendj.security.OpenDJProvider}:
- * 

  * 
  * ConnectionFactory ldapServer = ...;
  * DN keyStoreBaseDN = DN.valueOf("ou=key store,dc=example,dc=com");
@@ -30,7 +30,6 @@
  * 

  * Alternatively, if the OpenDJ security provider is registered with the JVM's JCA framework together with a suitable
  * configuration file, then an LDAP key store can be created like this:
- * 

  * 
  * KeyStore ldapKeyStore = KeyStore.getInstance("LDAP");
  * ldapKeyStore.load(null);
@@ -55,7 +54,6 @@
  * 

  * Interacting with an LDAP/LDIF key store using Java's "keytool" command is a little complicated if the OpenDJ provider
  * is not configured in the JVM due to the need to specify the class-path:
- * 

  * 
  * # Generate an RSA private key entry:
  * keytool -J-cp -J/path/to/opendj/server/lib/bootstrap-client.jar \
diff --git a/opendj-core/src/main/javadoc/overview.html b/opendj-core/src/main/javadoc/overview.html
index 3ff78100af..0358e40cb6 100644
--- a/opendj-core/src/main/javadoc/overview.html
+++ b/opendj-core/src/main/javadoc/overview.html
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
  
   Copyright 2011-2015 ForgeRock AS.
+ Portions Copyright 2026 3A Systems, LLC.
  -->
 
 
@@ -27,7 +28,8 @@ 
Getting Started

     search. The search results are output as LDIF to the standard
     output:
     

-    
+    

+      
Example: connecting to a directory server and performing a search
       
         

          
diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml
index d596d8a1b3..3c4da6efef 100644
--- a/opendj-doc-maven-plugin/pom.xml
+++ b/opendj-doc-maven-plugin/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2015-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
 -->
 
     4.0.0
@@ -31,7 +32,6 @@
 
     
         UTF-8
-        none
     
 
     
diff --git a/opendj-dsml-servlet/pom.xml b/opendj-dsml-servlet/pom.xml
index 25e6e287e5..e130eba8b9 100644
--- a/opendj-dsml-servlet/pom.xml
+++ b/opendj-dsml-servlet/pom.xml
@@ -33,7 +33,6 @@
         ${project.build.directory}/${project.build.finalName}/WEB-INF/legal-notices
         opendj-server-legacy
         opendj-jars
-        none
     
 
     
diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml
index ae61e5f53a..915d3f9a89 100644
--- a/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-ldap-sdk-examples/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2011-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
 -->
 
     4.0.0
@@ -100,6 +101,5 @@
         
     
     
-    	none
     
 
diff --git a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java
index 58ce4a1043..2b076bfa08 100644
--- a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java
+++ b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.examples;
@@ -67,7 +68,7 @@ public final class Proxy {
      * Main method.
      *
      * @param args
-     *            The command line arguments: [--load-balancer ] listen address, listen port,
+     *            The command line arguments: [--load-balancer <mode>] listen address, listen port,
      *            remote address1, remote port1, remote address2, remote port2,
      *            ...
      */
diff --git a/opendj-maven-plugin/pom.xml b/opendj-maven-plugin/pom.xml
index 506014915b..504599dcf0 100644
--- a/opendj-maven-plugin/pom.xml
+++ b/opendj-maven-plugin/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2015-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
 -->
 
   4.0.0
@@ -31,7 +32,6 @@
 
   
     3.0.4
-    none
   
   
     
diff --git a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java
index ad90021f09..dbcc321456 100644
--- a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.maven;
 
@@ -39,7 +40,6 @@
  * also include the X-SCHEMA-FILE extension to indicate the source schema file.
  * 

  * There is a single goal that generates the base schema.
- * 

  */
 @Mojo(name = "concat", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
 public final class ConcatSchemaMojo extends AbstractMojo {
diff --git a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
index d801337a93..ece9fa2658 100644
--- a/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.maven;
 
@@ -61,36 +62,37 @@
  * places depending on whether the plugin is executing for the core config or an
  * extension:
  * 
+ * 
  * 
  * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
  * 
- * 
+ * 
  * 
  * 
diff --git a/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
index d9100c6119..ea8496bb18 100644
--- a/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
+++ b/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
@@ -13,6 +13,7 @@
 
   Copyright 2008-2009 Sun Microsystems, Inc.
   Portions Copyright 2014-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
   ! -->
 
         
         
@@ -312,7 +313,7 @@
                            '         An optional collection in which to place any ',
                            '{@link PropertyException}s that occurred whilst ',
                            'attempting to determine the default values of the ', $ufn,
-                           '. This argument can be <code>null<code>.
',
+                           '. This argument can be <code>null</code>.
',
                            '@return Returns a new ', $ufn,' configuration instance.
')" />
             
             
 
         
 
 
   
-    >
+    
       Specifies the name of the identity mapper used to get the user's entry corresponding to the user-id
       provided in
       the HTTP authentication header.
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPOauth2AuthorizationMechanismConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPOauth2AuthorizationMechanismConfiguration.xml
index efcebd264a..3aaf6cf543 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPOauth2AuthorizationMechanismConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPOauth2AuthorizationMechanismConfiguration.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
   ! -->
 
 
   
-    >
+    
       Specifies the name of the identity mapper to use in conjunction with the authzid-json-pointer
       to get the
       user corresponding to the acccess-token.
diff --git a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
index 3e46b2ced5..2349654c75 100644
--- a/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
+++ b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2011-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
   ! -->
 
     
       
diff --git a/opendj-openidm-account-change-notification-handler/pom.xml b/opendj-openidm-account-change-notification-handler/pom.xml
index de56b4d281..78c6e8b575 100644
--- a/opendj-openidm-account-change-notification-handler/pom.xml
+++ b/opendj-openidm-account-change-notification-handler/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2014-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
 -->
 
   4.0.0
@@ -28,7 +29,6 @@
     
   jar
   
-  	none
   
   
     
diff --git a/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/OpenidmAccountStatusNotificationHandler.java b/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/OpenidmAccountStatusNotificationHandler.java
index 2ad548ed98..975f69ae93 100644
--- a/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/OpenidmAccountStatusNotificationHandler.java
+++ b/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/OpenidmAccountStatusNotificationHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.accountchange;
 
@@ -108,7 +109,7 @@
  *  
  • If interval is set to zero, then the change is sent immediately to OpenIDM using a HTTP POST request
    • 
  *  
  • If interval is strictly superior to zero, then the change is stored locally (currently in a JE database).
  *    At each interval period of time, the changes which are stored locally are read and sent to OpenIDM using
- *    a HTTP POST request>
    • 
+ *    a HTTP POST request>
  * 
  * 
    
  * The communication to OpenIDM can be done in one of three ways:
diff --git a/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/PersistedQueue.java b/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/PersistedQueue.java
index 7d87bf14cb..cedd51b4f6 100644
--- a/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/PersistedQueue.java
+++ b/opendj-openidm-account-change-notification-handler/src/main/java/org/forgerock/openidm/accountchange/PersistedQueue.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.openidm.accountchange;
 
@@ -33,7 +34,6 @@
  * Fast request queue implementation on top of Berkley DB Java Edition.
  * The queue uses the canonalised dn for key and store only
  * the last password change for each dn.
- * 
    
  */
 @ThreadSafe
 public class PersistedQueue {
@@ -114,7 +114,7 @@ public String[] poll() throws IOException {
 
     /**
      * Pushes element to the queue.
-     * 
    
+     * 
    
      * The entries are sorted in natural order and not in order of time when
      * they were added.
      *
diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml
index 8ce6618185..67667cc8fc 100644
--- a/opendj-rest2ldap/pom.xml
+++ b/opendj-rest2ldap/pom.xml
@@ -13,6 +13,7 @@
    information: "Portions Copyright [year] [name of copyright owner]".
 
    Copyright 2012-2016 ForgeRock AS.
+   Portions Copyright 2026 3A Systems, LLC.
 -->
 
     4.0.0
@@ -34,7 +35,6 @@
             org.forgerock.opendj.*;provide:=true,
             org.forgerock.json.*;provide:=true
         
-        none
     
 
 
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DnTemplate.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DnTemplate.java
index 83d561b262..4433bda8f3 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DnTemplate.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/DnTemplate.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.rest2ldap;
 
@@ -34,7 +35,6 @@
  * Two types of DN template are supported: {@link #compile(String) absolute/relative} or {@link #compileRelative(String)
  * relative}. The table below shows how DN templates will be resolved to DNs when the template parameter "subdomain"
  * has the value "www" and the current routing state references the DN "dc=example,dc=com":
- * 
    
  * 
    Resource locations by execution context
    Location
    XSLT stylesheetsXSLT stylesheetsInternal: /config/stylesheets
    XML core definitionsXML core definitionsInternal: /config/xml
    XML extension definitionsXML extension definitions${basedir}/src/main/java
    Generated Java APIsGenerated Java APIs${project.build.directory}/generated-sources/config
    Generated I18N messagesGenerated I18N messages${project.build.outputDirectory}/config/messages
    Generated profilesGenerated profiles${project.build.outputDirectory}/config/profiles/${profile}
    Generated manifestGenerated manifest${project.build.outputDirectory}/META-INF/services/org.forgerock.opendj.
  * config.AbstractManagedObjectDefinition
    
  * 
  * 
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2Ldap.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2Ldap.java
index 114b0dea4f..2a2263260f 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2Ldap.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2Ldap.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2016 ForgeRock AS.
  *
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.rest2ldap;
 
@@ -60,19 +61,19 @@
  * instance by calling {@link #rest2Ldap} passing in a list of {@link Resource resources} which together define
  * the data model being exposed by the gateway. Call {@link #newRequestHandlerFor(String)} in order to obtain
  * a request handler for a specific resource. The methods in this class can be categorized as follows:
- * 
    
+ * 
    
  * Creating Rest2Ldap gateways:
  * 
      
  * 
    • {@link #rest2Ldap} - creates a gateway for a given set of resources
      • 
  * 
    • {@link #newRequestHandlerFor} - obtains a request handler for the specified endpoint resource.
      • 
  * 
    
- * 
    
+ * 
    
  * Defining resource types, e.g. users, groups, devices, etc:
  * 
      
  * 
    • {@link #resource} - creates a resource having a fluent API for defining additional characteristics
  * such as the resource's inheritance, sub-resources, and properties
      • 
  * 
    
- * 
    
+ * 
    
  * Defining a resource's sub-resources. A sub-resource is a resource which is subordinate to another resource. Or, to
  * put it another way, sub-resources define parent child relationships where the life-cycle of a child resource is
  * constrained by the life-cycle of the parent: deleting the parent implies that all children are deleted as well. An
@@ -85,7 +86,7 @@
  * top-level entry points into REST APIs.
  * 
  * 
- * 
    
+ * 
    
  * Defining a resource's properties:
  * 
      
  * 
    • {@link #resourceType} - defines a property whose JSON value will be the name of the resource, e.g. "user"
      • 
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java
index 1a794c7ad1..abf70da203 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LdapJsonConfigurator.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2016 ForgeRock AS.
  * Portions Copyright 2017 Rosie Applications, Inc.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.rest2ldap;
 
@@ -90,7 +91,6 @@ public final class Rest2LdapJsonConfigurator {
 
     /**
      * Parses Rest2Ldap configuration options. The JSON configuration must have the following format:
-     * 
      
      * 
            * {
      *      "readOnUpdatePolicy": "controls",
@@ -129,7 +129,6 @@ public static Options configureOptions(final JsonValue config) {
 
     /**
      * Parses a list of Rest2Ldap resource definitions. The JSON configuration must have the following format:
-     * 
      
      * 
            * "top": {
      *     "isAbstract": true,
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthenticationStrategies.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthenticationStrategies.java
index 32f6eefe5c..35b40e6944 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthenticationStrategies.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/AuthenticationStrategies.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.rest2ldap.authz;
 
@@ -64,7 +65,7 @@ public static AuthenticationStrategy newSimpleBindStrategy(ConnectionFactory con
      * @param searchScope
      *            {@link SearchScope} of the search request performed to find the user's DN.
      * @param filterTemplate
-     *            Filter of the search request (i.e: (&(email=%s)(objectClass=inetOrgPerson)) where the first %s will be
+     *            Filter of the search request (i.e: (&(email=%s)(objectClass=inetOrgPerson)) where the first %s will be
      *            replaced by the user's provided authentication-id.
      * @return a new search then bind {@link AuthenticationStrategy}
      * @throws NullPointerException
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java
index aae8899987..638b32576f 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorization.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.rest2ldap.authz;
 
@@ -130,7 +131,6 @@ public static Filter newProxyAuthorizationFilter(ConnectionFactory connectionFac
 
     /**
      * Creates a new {@link AccessTokenResolver} as defined in the RFC-7662.
-     * 
      
      * @see RFC-7662
      *
      * @param httpClient
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java
index 49a72cb9f0..5115f76798 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.rest2ldap.authz;
 
@@ -46,7 +47,6 @@
 
 /**
  * An {@link AccessTokenResolver} which is RFC 7662 compliant.
- * 
      
  * @see RFC-7662
  */
 final class Rfc7662AccessTokenResolver implements AccessTokenResolver {
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/schema/JsonSchema.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/schema/JsonSchema.java
index e87be405ff..071f2c7eb7 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/schema/JsonSchema.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/schema/JsonSchema.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.rest2ldap.schema;
 
@@ -108,12 +109,13 @@ final ObjectMapper getObjectMapper() {
      * patterns for matching against JSON pointers. Patterns are JSON pointers where "*" represents zero or more
      * characters in a single path element, and "**" represents any number of path elements. For example:
      *
-     * 
    DN Template{@link #compile(String)}{@link #compileRelative(String)}
    dc=wwwdc=wwwdc=www,dc=example,dc=com
    
+     * 
    
+     *     
      *     
-     *     
-     *     
-     *     
-     *     
+     *     
+     *     
+     *     
+     *     
      * 
    JSON pointer pattern matching examples
    PatternMatchesDoesn't match
    /aaa/bbb/ccc/aaa/bbb/ccc/aaa/bbb/ccc/ddd
    /aaa/bbb/cccc
    /aaa/b*/ccc/aaa/bbb/ccc
    /aaa/bxx/ccc    		/aaa/xxx/ccc
    /aaa/bbb
    /aaa/**/ddd/aaa/ddd
    /aaa/xxx/yyy/ddd    		/aaa/bbb/ccc
    /aaa/**/aaa
    /aaa/bbb
    /aaa/bbb/ccc
    		/aa
    /aaa/bbb/ccc/aaa/bbb/ccc/aaa/bbb/ccc/ddd
    /aaa/bbb/cccc
    /aaa/b*/ccc/aaa/bbb/ccc
    /aaa/bxx/ccc    		/aaa/xxx/ccc
    /aaa/bbb
    /aaa/**/ddd/aaa/ddd
    /aaa/xxx/yyy/ddd    		/aaa/bbb/ccc
    /aaa/**/aaa
    /aaa/bbb
    /aaa/bbb/ccc
    		/aa
    
      */
     @SuppressWarnings("unchecked")
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index bff905ec08..efe13c7551 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -66,7 +66,6 @@
 
     2.2.7
 
-    none
     ${basedir}/opendmk
   
 
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java
index 791236d1d7..e64aec11d1 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.forgerock.opendj.server.embedded;
 
@@ -256,7 +257,7 @@ public String getBuildVersion() throws EmbeddedDirectoryServerException
    * Example reading configuration:
    * 
        *   try(ManagementContext config = server.getConfiguration()) {
-   *      List syncProviders = config.getRootConfiguration().listSynchronizationProviders();
+   *      List<String> syncProviders = config.getRootConfiguration().listSynchronizationProviders();
    *      System.out.println("sync providers=" + syncProviders);
    *   }
    * 
    
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index 4661f6388c..7ea6a73c01 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2007-2010 Sun Microsystems, Inc.
  * Portions Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.admin.ads;
 
@@ -448,7 +449,7 @@ private void updateServer(Map serverProperties)
   /**
    * Method called to unregister a server in the ADS. Note that the server's
    * instance key-pair public-key certificate entry (created in
-   * registerServer()) is left untouched.
+   * registerServer()) is left untouched.
    *
    * @param serverProperties
    *          the properties of the server.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
index b42ace836d..24f9dfe21a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/BrowserController.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.guitools.controlpanel.browser;
 
@@ -1529,8 +1530,8 @@ private Icon getNewIcon(BasicNode node, SearchResultEntry entry)
   /**
    * Find a child node matching a given DN.
    *
-   * result >= 0    result is the index of the node matching childDn.
-   * result < 0   -(result + 1) is the index at which the new node must be
+   * result >= 0    result is the index of the node matching childDn.
+   * result < 0   -(result + 1) is the index at which the new node must be
    * inserted.
    * @param parent the parent node of the node that is being searched.
    * @param childDn the DN of the entry that is being searched.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
index 77a25d26ea..fb4815681b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Constants.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.quicksetup;
 
@@ -57,7 +58,7 @@ public class Constants {
   /** DN of the schema object. */
   public static final DN SCHEMA_DN = DN.valueOf("cn=schema", Schema.getCoreSchema());
 
-  /** DN of legacy replication changes base DN for backwards compatibility with OpenDJ <= 2.6.x. */
+  /** DN of legacy replication changes base DN for backwards compatibility with OpenDJ <= 2.6.x. */
   public static final DN REPLICATION_CHANGES_DN = DN.valueOf("dc=replicationChanges", Schema.getCoreSchema());
 
   /** The cli java system property. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
index dcf53ac550..0e94fabfa6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.quicksetup.ui;
 
@@ -61,9 +62,9 @@ public enum FieldName
   LDIF_PATH,
   /** The value associated with this is a String. */
   NUMBER_ENTRIES,
-  /** The value associated with this is a Map. */
+  /** The value associated with this is a Map<String, String>. */
   REMOTE_REPLICATION_PORT,
-  /** The value associated with this is a Map. */
+  /** The value associated with this is a Map<String, Boolean>. */
   REMOTE_REPLICATION_SECURE,
   /** The value associated with this is a String. */
   REMOTE_SERVER_DN,
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
index 19065503be..5f122f50a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.quicksetup.ui;
 
@@ -55,7 +56,6 @@
 
 /**
  * This class is responsible for doing the following:
- * 
    
  * 
      
  * 
    • Check whether we are installing or uninstalling.
      • 
  * 
    • Performs all the checks and validation of the data provided by the user
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
index 8d5d5a471d..6c2189da74 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/ServerController.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.quicksetup.util;
 
@@ -534,7 +535,7 @@ private String getHostName(int i)
   /**
    * This class is used to read the standard error and standard output of the
    * Stop process.
-   * 
      
+   * 
      
    * When a new log message is found notifies the
    * UninstallProgressUpdateListeners of it. If an error occurs it also
    * notifies the listeners.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index a6f8390da0..4117b846dc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.quicksetup.util;
 
@@ -996,7 +997,7 @@ public static boolean isLocalHost(String host)
 
   /**
    * Returns the HTML representation of a plain text string which is obtained
-   * by converting some special characters (like '<') into its equivalent
+   * by converting some special characters (like '<') into its equivalent
    * escaped HTML representation.
    *
    * @param rawString the String from which we want to obtain the HTML
@@ -1033,7 +1034,7 @@ private static StringBuilder escapeChar(StringBuilder buffer, char c)
   /**
    * Returns the HTML representation for a given text. without adding any kind
    * of font or style elements.  Just escapes the problematic characters
-   * (like '<') and transform the break lines into '\n' characters.
+   * (like '<') and transform the break lines into '\n' characters.
    *
    * @param text the source text from which we want to get the HTML
    * representation
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
index fb9bb3c361..6e548e1e12 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2007-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.admin.doc;
 
@@ -97,7 +98,7 @@ public class ConfigGuideGeneration {
    *
    * Properties:
    * GenerationDir - The directory where the doc is generated
-   *              (default is /var/tmp/[CONFIG_GUIDE_DIR>])
+   *              (default is /var/tmp/[CONFIG_GUIDE_DIR>])
    * LdapMapping - Presence means that the LDAP mapping section is to be
    *               generated (default is no)
    * OpenDJWiki - The URL of the OpenDJ Wiki
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
index bd6d6ba94d..b80ef6f5d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.api;
 
@@ -81,7 +82,6 @@ public abstract class Backend
    * This method may not throw any exceptions. If any problems are encountered,
    * then they may be logged but the closure should progress as completely as
    * possible.
-   * 
      
    */
   public abstract void finalizeBackend();
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/LocalBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/api/LocalBackend.java
index 4985a2e810..b5a74c6695 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/LocalBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/LocalBackend.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.api;
 
@@ -115,7 +116,6 @@ public final void finalizeBackend()
    * 
      
    * It will be called as final step of finalizeBackend(),
    * so subclasses might override it.
-   * 
      
    */
   public void closeBackend()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
index e0c096ba6f..05329b55fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/EnumEvalResult.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.opends.server.authorization.dseecompat;
@@ -75,7 +76,7 @@ public EnumEvalResult getRet(EnumBindRuleType type, boolean undefined) {
      * This method is used to possibly negate the result of a simple bind rule
      * evaluation. If the boolean is true than the result is negated.
      * @param v The enumeration result of the simple bind rule evaluation.
-     * @param negate If true the result should be negated (TRUE->FALSE, FALSE->TRUE).
+     * @param negate If true the result should be negated (TRUE->FALSE, FALSE->TRUE).
      * @return  A possibly negated enumeration result.
      */
     public  static EnumEvalResult negateIfNeeded(EnumEvalResult v, boolean negate) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
index 24e154e71b..60c2f374f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.backends;
 
@@ -127,7 +128,7 @@
  * changeNumber attribute value is set from the content of
  * ChangeNumberIndexDB.
      • 
  * 
    
- * 
    Searches flow
    
+ * 
    Searches flow
    
  * 
    
  * Here is the flow of searches within the changelog backend APIs:
  * 
      
@@ -142,7 +143,7 @@
  * (once, single threaded),
  * 
    • 
  * {@link ChangelogBackend#search(SearchOperation)} (once, single threaded)
      • 
- * 
    • {@link ChangelogBackend#notify*EntryAdded()} (multiple times, multi
+ * 
    • {@code notify*EntryAdded()} (multiple times, multi
  * threaded)
      • 
  * 
  * 
@@ -151,7 +152,7 @@
  * 
    • {@link ChangelogBackend#registerPersistentSearch(PersistentSearch)}
  * (once, single threaded)
      • 
  * 
    • 
- * {@link ChangelogBackend#notify*EntryAdded()} (multiple times, multi
+ * {@code notify*EntryAdded()} (multiple times, multi
  * threaded)
      • 
  * 
  * 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/package-info.java
index ffb26e6fd4..438d0eec4a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/package-info.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/package-info.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 
@@ -21,7 +22,7 @@
  * Java Edition as the repository for storing entry and index information.
  * 

      
  *
- * 
      On-disk Representation
      
+ * 
      On-disk Representation
      
  * 
      
  * First it is important to understand JE (Java Edition) terminology.  A JE
  * database environment has similarities to a database in the relational
@@ -72,14 +73,13 @@
  * dc_example_dc_com_telephoneNumber.substring
  * dc_example_dc_com_uid.equality
  * 
- * 
      Database Relocation
      
+ * 
      Database Relocation
      
  * 
      
  * The data is stored in a format which is independent of system architecture,
  * and is also independent of file system location because it contains no
  * pathnames.  The backend, and its backups, can be copied, moved and restored
  * to a different location, within the same system or a different system.
- * 
      
- * 
      The Entry ID
      
+ * 
      The Entry ID
      
  * 
      
  * Each entry to be stored in the backend is assigned a 64-bit integer
  * identifier called the entry ID.  The first entry to be created is entry ID 1,
@@ -97,9 +97,7 @@
  * 
      
  * Currently, IDs of deleted entries are not reused.  The use of a 64-bit
  * integer means it is implausible that the entry ID space will be exhausted.
- * 
      
- * 
      
- * 
      The entry database (id2entry)
      
+ * 
      The entry database (id2entry)
      
  * 
      
  * Entries are stored in the id2entry database.  The key to the database is
  * the entry ID, and the value is an ASN.1 encoding of the entry contents.
@@ -109,7 +107,6 @@
  * assigned entry ID by reading the last key value in the entry database.
  * 
      
  * The format of the entry on disk is described by the following ASN.1.
- * 
      
  * 
        * DatabaseEntry ::= [APPLICATION 0] IMPLICIT SEQUENCE {
  *  uncompressedSize        INTEGER,      -- A zero value means not compressed.
@@ -138,8 +135,7 @@
  * The ASN1 types have application tags to allow for future extensions.
  * The types may be extended with additional fields where this makes sense,
  * or additional types may be defined.
- * 
      
- * 
      The entry count record
      
+ * 
      The entry count record
      
  * 
      
  * Previous versions of Directory Server provide the current number of entries
  * stored in the backend.  JE does not maintain database record counts,
@@ -149,9 +145,7 @@
  * For this reason the backend maintains its own count of the number of
  * entries in the entry database, storing this count in the special record
  * whose key is entry ID zero.
- * 
      
- * 
      
- * 
      The DN database (dn2id)
      
+ * 
      The DN database (dn2id)
      
  * 
      
  * Although each entry's DN is stored in the entry database, we need to be
  * able to retrieve entries by DN.  The dn2id database key is the normalized
@@ -186,25 +180,20 @@
  * At first, it may seem strange that user.1100 comes after user.1000 but it
  * becomes clear when considering the values in reverse byte order, since
  * 0011.resu is indeed greater than 0001.resu.
- * 
      
- * 
      Index Databases
      
+ * 
      Index Databases
      
  * 
      
  * Index databases are used to efficiently process search requests.  The system
  * indexes, id2children and id2subtree, are dedicated to processing one-level
  * and subtree search scope respectively.  Then there are configurable
  * attribute indexes to process components of a search filter.  Each index
  * record maps a key to an Entry ID List.
- * 
      
- * 
      
- * 
      Entry ID List
      
+ * 
      Entry ID List
      
  * 
      
  * An entry ID list is a set of entry IDs, arranged in order of ID.  On disk,
  * the list is a concatenation of the 8-byte entry ID values, where the first
  * ID is the lowest.  The number of IDs in the list can be obtained by dividing
  * the total number of bytes by eight.
- * 
      
- * 
      
- * 
      Index Entry Limit
      
+ * 
      Index Entry Limit
      
  * 
      
  * In some cases, the number of entries indexed by a given key is so large
  * that the cost of maintaining the list during entry updates outweighs the
@@ -212,39 +201,29 @@
  * a configurable entry limit.  Whenever a list reaches the entry limit, it is
  * replaced with a zero length value to indicate that the list is no longer
  * maintained.
- * 
      
- * 
      
- * 
      Children Index (id2children)
      
+ * 
      Children Index (id2children)
      
  * 
      
  * The children index is a system index which maps the ID of any non-leaf entry
  * to entry IDs of the immediate children of the entry. This index is used to
  * get the set of entries within the scope of a one-level search.
- * 
      
- * 
      
- * 
      Subtree Index (id2subtree)
      
+ * 
      Subtree Index (id2subtree)
      
  * 
      
  * The subtree index is a system index which maps the ID of any non-leaf entry
  * to entry IDs of all descendants of the entry. This index is used to get the
  * set of entries within the scope of a subtree search.
- * 
      
- * 
      
- * 
      Attribute Equality Index
      
+ * 
      Attribute Equality Index
      
  * 
      
  * An attribute equality index maps the value of an attribute to entry IDs of
  * all entries containing that attribute value. The database key is the
  * attribute value after it has been normalized by the equality matching rule
  * for that attribute.  This index is used to get the set of entries matching
  * an equality filter.
- * 
      
- * 
      
- * 
      Attribute Presence Index
      
+ * 
      Attribute Presence Index
      
  * 
      
  * An attribute presence index contains a single record which has entry IDs
  * of all entries containing a value of the attribute. This index is used to get
  * the set of entries matching an attribute presence filter.
- * 
      
- * 
      
- * 
      Attribute Substring Index
      
+ * 
      Attribute Substring Index
      
  * 
      
  * An attribute substring index maps a substring of an attribute value to entry
  * IDs of all entries containing that substring in one or more of its values of
@@ -257,9 +236,7 @@
  * indexed by the keys ABC BCD CDE DE E.  To find entries containing a short
  * substring such as DE, iterate through all keys with prefix DE.  To find
  * entries containing a longer substring such as BCDE, read keys BCD and CDE.
- * 
      
- * 
      
- * 
      Attribute Ordering Index
      
+ * 
      Attribute Ordering Index
      
  * 
      
  * An attribute ordering index is similar to an equality index in that it maps
  * the value of an attribute to entry IDs of all entries containing that
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryID.java
index 13ffd11a2c..e76326ce1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryID.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryID.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
  * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.backends.pluggable;
 
@@ -76,7 +77,6 @@ ByteString toByteString()
    * Compares this object with the specified object for order.  Returns a
    * negative integer, zero, or a positive integer as this object is less
    * than, equal to, or greater than the specified object.
      
-   * 
      
    *
    * @param that the Object to be compared.
    * @return a negative integer, zero, or a positive integer as this object
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/EmptyCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/EmptyCursor.java
index d22f3ff89b..4ed54596bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/EmptyCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/spi/EmptyCursor.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.opends.server.backends.pluggable.spi;
@@ -29,7 +30,6 @@
  * 
    • Reading the key or value will return {@code null}.
      • 
  * 
    • Deleting the current element is not supported, {@link UnsupportedOperationException} will be thrown.
      • 
  * 
    
- * 
    
  *
  * @param  Type of the simulated record's key
  * @param  Type of the simulated record's value
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java
index de6d275833..faaab665ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/ConfigurationHandler.java
@@ -1770,7 +1770,6 @@ private DN getMatchedDN(final DN dn)
 
   /**
    * Examines the provided result and logs a message if appropriate.
-   * 
    
    * 
      
    * 
    • If the result code is anything other than {@code SUCCESS}, then it will log an error message.
      • 
    * 
    • If the operation was successful but admin action is required, then it will log a warning message.
      • 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
index d3c7d553d0..edacbbad75 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchChangeType.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
  * Portions Copyright 2013-2015 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.controls;
 
@@ -31,7 +32,7 @@
  * conjunction with the persistent search control, as defined in
  * draft-ietf-ldapext-psearch.
  * 
      
- * It is a different type from {@link ChangeOperationType} to enforce type
+ * It is a different type from {@link org.opends.server.util.ChangeOperationType} to enforce type
  * safety, despite mirroring it completely.
  */
 public enum PersistentSearchChangeType
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
index 392bdb064f..3be00b1ab3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BackendConfigManager.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.core;
 
@@ -1215,7 +1216,6 @@ public void shutdownLocalBackends()
    * 
      
    * Implementation note: a separate map is kept for local backends in order to avoid filtering the backends map
    * each time local backends are requested.
-   * 
      
    */
   private static class Registry
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
index 1d88533fdf..e5424519b7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LoggerConfigManager.java
@@ -63,7 +63,6 @@ public class LoggerConfigManager implements ConfigurationAddListener
    * @ThreadSafe
    */
   private static class JulToSlf4jLogManager
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
index 250bc6ff02..4998dabb2c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.core;
 
@@ -139,7 +140,6 @@ public final class PasswordPolicyState extends AuthenticationPolicyState
    * Note that this version of the constructor should only be used for testing purposes when the tests should be
    * evaluated with a fixed time rather than the actual current time. For all other purposes, the other constructor
    * should be used.
-   * 
      
    *
    * @param policy      The password policy associated with the state.
    * @param userEntry   The entry with the user account.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/discovery/Partition.java b/opendj-server-legacy/src/main/java/org/opends/server/discovery/Partition.java
index 733be792a8..095fd759fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/discovery/Partition.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/discovery/Partition.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.discovery;
 
@@ -34,8 +35,7 @@
  * 
      dc=example,dc=com
  * 
      unsharded parent naming context replicated across all servers.
      
  * Contains data common to all partitions, such as ACIs, groups, etc.
- * 
      ou=people,dc=example,dc=com<
- * 
      sharded naming context whose content (the users) is split up according to some function, e.g.
+ * 
      ou=people,dc=example,dc=com * 
      sharded naming context whose content (the users) is split up according to some function, e.g.
  * consistent hashing.
  * 
  *
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BCrypt.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BCrypt.java
index 15e202af5e..110e7b901d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BCrypt.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BCrypt.java
@@ -24,6 +24,7 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.opends.server.extensions;
@@ -46,25 +47,25 @@
  * call the hashpw method with a random salt, like this:
  * 
      
  * 
- * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); 
      
+ * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt()); 
      
  *       
  * 
      
  * To check whether a plaintext password matches one that has been
  * hashed previously, use the checkpw method:
  * 
      
  * 
- * if (BCrypt.checkpw(candidate_password, stored_hash))
      
- *     System.out.println("It matches");
      
- * else
      
- *     System.out.println("It does not match");
      
+ * if (BCrypt.checkpw(candidate_password, stored_hash))
      
+ *     System.out.println("It matches");
      
+ * else
      
+ *     System.out.println("It does not match");
      
  *       
  * 
      
  * The gensalt() method takes an optional parameter (log_rounds)
  * that determines the computational complexity of the hashing:
  * 
      
  * 
- * String strong_salt = BCrypt.gensalt(10)
      
- * String stronger_salt = BCrypt.gensalt(12)
      
+ * String strong_salt = BCrypt.gensalt(10)
      
+ * String stronger_salt = BCrypt.gensalt(12)
      
  *       
  * 
      
  * The amount of work increases exponentially (2**log_rounds), so
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
index 813f0fa02c..9bd20cf16a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Sha2Crypt.java
@@ -27,6 +27,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.extensions;
 
@@ -48,13 +49,11 @@
  * into the Public Domain.
  * 
      
  * This class is immutable and thread-safe.
- * 
      
  *
  * 
      
  * Note this class was originally in the
  * org.apache.commons.codec.digest package, but was moved into
  * org.opends.server.extensions for convenience.
- * 
      
  *
  * @version $Id$
  * @since 1.7
@@ -70,7 +69,6 @@ final class Sha2Crypt {
    * Note this class was originally in the
    * org.apache.commons.codec.digest package, but was moved into an
    * inner class here for convenience. It is not compatible with Base64.
-   * 
      
    *
    * @version $Id$
    * @since 1.7
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
index a78180cc13..4d76b9dfb0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -112,7 +112,6 @@ public class TraditionalWorkQueue extends WorkQueue
    * 
      
    * This is hard-coded to true for now because a reject on full policy does not
    * seem to have a valid use case.
-   * 
      
    */
   private final boolean isBlocking = true;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
index f9da0c23be..1a87f455b8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/HTTPAccessLogPublisher.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Portions Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.loggers;
 
@@ -54,9 +55,7 @@ public boolean isConfigurationAcceptable(T configuration,
    *          The request info to log
    * @see W3C's Extended Log File
    *      Format
-   * @see 
+   * @see 
    *      Microsoft's W3C Extended Log File Format (IIS 6.0)
    */
   public void logRequestInfo(HTTPRequestInfo requestInfo)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatistics.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatistics.java
index b9ae86b63c..87d6d21118 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatistics.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatistics.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.protocols.http;
 
@@ -37,7 +38,6 @@ public class HTTPStatistics extends LDAPStatistics
    * Map containing the total number of requests per HTTP methods.
    * 
      
    * key: HTTP method => value: number of requests for that method.
-   * 
      
    * Not using a ConcurrentMap implementation here because the keys are static.
    * The keys are static because they need to be listed in the schema which is
    * static.
@@ -48,7 +48,6 @@ public class HTTPStatistics extends LDAPStatistics
    * 
      
    * key: HTTP method => value: total execution time for requests using that
    * method.
-   * 
      
    * Not using a ConcurrentMap implementation here because the keys are static.
    * The keys are static because they need to be listed in the schema which is
    * static.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatsProbe.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatsProbe.java
index fb8e34b27f..ceab2a8aae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatsProbe.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPStatsProbe.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.protocols.http;
 
@@ -30,7 +31,6 @@
  * Use
  * curl "http://localhost:8080/users?_queryFilter=true&_prettyPrint=true"
  * --trace-ascii output.txt to trace the client-server communication.
- * 
      
  */
 @SuppressWarnings("rawtypes")
 final class HTTPStatsProbe extends HttpProbe.Adapter
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LocalizedHttpApplicationException.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LocalizedHttpApplicationException.java
index e10ee63cdd..fc8b00e652 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LocalizedHttpApplicationException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/LocalizedHttpApplicationException.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.protocols.http;
 
@@ -20,7 +21,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 
 /**
- * Thrown to indicate that an {@link HttpApplication} was unable to start. A {@code LocalizedHttpApplicationException}
+ * Thrown to indicate that an {@link org.forgerock.http.HttpApplication} was unable to start. A {@code LocalizedHttpApplicationException}
  * contains a localized error message which may be used to provide the user with detailed diagnosis information. The
  * localized message can be retrieved using the {@link #getMessageObject} method.
  */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpAuthorizationMechanismFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpAuthorizationMechanismFactory.java
index a82650166d..b2d7fe93d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpAuthorizationMechanismFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpAuthorizationMechanismFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.protocols.http.authz;
 
@@ -26,7 +27,7 @@
 import org.opends.server.types.InitializationException;
 
 /**
- * Creates {@link HttpAuthorizationMechanism} performing the authentication/authorization of incoming {@link Request}.
+ * Creates {@link HttpAuthorizationMechanism} performing the authentication/authorization of incoming {@link org.forgerock.http.protocol.Request}.
  */
 public final class HttpAuthorizationMechanismFactory
 {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
index f4af01929f..8c6d086c8e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.protocols.jmx;
 
@@ -34,7 +35,6 @@
  * 
      
  * This class implements RMIServerSocketFactory over the Secure
  * Sockets Layer (SSL) or Transport Layer Security (TLS) protocols.
- * 
      
  */
 public class DirectoryRMIServerSocketFactory implements
     RMIServerSocketFactory
@@ -72,7 +72,6 @@ public DirectoryRMIServerSocketFactory(SSLSocketFactory sslSocketFactory,
    * 
      
    * Returns true if client authentication is required on SSL
    * connections accepted by server sockets created by this factory.
-   * 
      
    *
    * @return true if client authentication is required
    *
@@ -125,17 +124,14 @@ public Socket accept() throws IOException
   /**
    * 
      
    * Indicates whether some other object is "equal to" this one.
-   * 
      
    *
    * 
      
    * Two CacaoRMIServerSocketFactory objects are equal if they
    * have been constructed with the same SSL socket configuration parameters.
-   * 
      
    *
    * 
      
    * A subclass should override this method (as well as {@link #hashCode()})
    * if it adds instance state that affects equality.
-   * 
      
    *
    * @param obj the reference object with which to compare.
    *
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
index aeaf3463d2..82ba7baddb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.replication.common;
 
@@ -283,9 +284,9 @@ public CSN getCSN(int serverId)
   }
 
   /**
-   * Returns a copy of this ServerState's content as a Map of serverId => CSN.
+   * Returns a copy of this ServerState's content as a Map of serverId => CSN.
    *
-   * @return a copy of this ServerState's content as a Map of serverId => CSN.
+   * @return a copy of this ServerState's content as a Map of serverId => CSN.
    */
   public Map getServerIdToCSNMap()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
index 2168f139c0..7e1113445c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/EntryHistorical.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.replication.plugin;
 
@@ -163,7 +164,6 @@ public boolean replayOperation(PreOperationModifyOperation modifyOperation, Entr
    * preOperation plugin, that is called just before committing into the DB.
    * 
    * 
    
-   * 
    
    *
    * @param modifyOperation
    *          the modification.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartSessionMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartSessionMsg.java
index e891a01697..5833fdf487 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartSessionMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/StartSessionMsg.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
  * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.replication.protocol;
 
@@ -33,10 +34,10 @@
  * This message is used by DS to confirm a RS he wants to connect to him (open
  * a session):
  * Handshake sequence between DS and RS is like this:
- * DS --- ServerStartMsg ---> RS
- * DS <--- ReplServerStartMsg --- RS
- * DS --- StartSessionMsg ---> RS
- * DS <--- TopologyMsg --- RS
+ * DS --- ServerStartMsg ---> RS
+ * DS <--- ReplServerStartMsg --- RS
+ * DS --- StartSessionMsg ---> RS
+ * DS <--- TopologyMsg --- RS
  *
  * This message contains:
  * - status: the status we are entering the topology with
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogState.java
index fef8056f87..ec130f9fd9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ChangelogState.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.replication.server;
 
@@ -113,9 +114,9 @@ public void removeOfflineReplica(DN baseDN, int serverId)
   }
 
   /**
-   * Returns the Map of domainBaseDN => generationId.
+   * Returns the Map of domainBaseDN => generationId.
    *
-   * @return a Map of domainBaseDN => generationId
+   * @return a Map of domainBaseDN => generationId
    */
   public Map getDomainToGenerationId()
   {
@@ -123,9 +124,9 @@ public Map getDomainToGenerationId()
   }
 
   /**
-   * Returns the Map of domainBaseDN => List<serverId>.
+   * Returns the Map of domainBaseDN => List<serverId>.
    *
-   * @return a Map of domainBaseDN => List<serverId>.
+   * @return a Map of domainBaseDN => List<serverId>.
    */
   public Map> getDomainToServerIds()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
index 464d206f1c..2564dcc486 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MsgQueue.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.replication.server;
 
@@ -88,9 +89,9 @@ public int bytesCount()
   }
 
   /**
-   * Returns true if this MsgQueue contains no UpdateMsg.
+   * Returns true if this MsgQueue contains no UpdateMsg.
    *
-   * @return true if this MsgQueue contains no UpdateMsg.
+   * @return true if this MsgQueue contains no UpdateMsg.
    */
   public boolean isEmpty()
   {
@@ -161,12 +162,12 @@ public UpdateMsg removeFirst()
   }
 
   /**
-   * Returns true if this map contains an UpdateMsg
+   * Returns true if this map contains an UpdateMsg
    * with the same CSN as the given UpdateMsg.
    *
    * @param msg UpdateMsg whose presence in this queue is to be tested.
    *
-   * @return true if this map contains an UpdateMsg
+   * @return true if this map contains an UpdateMsg
    *         with the same CSN as the given UpdateMsg.
    */
   public boolean contains(UpdateMsg msg)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
index 7a5cb4c0af..6d348dd96b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
@@ -714,7 +714,7 @@ public void lockDomainNoTimeout() throws DirectoryException,
    * RS2 and wants to acquire the lock on the domain (here) but cannot as RS1
    * connect thread already has it
    * 
-   * => Deadlock: 4 threads are locked.
+   * => Deadlock: 4 threads are locked.
    * 
    
    * To prevent threads locking in such situation, the listen threads here will
    * both timeout trying to acquire the lock. The random time for the timeout
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
index 375e6ea321..4948f4a81d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/ReplicationDomainDB.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.replication.server.changelog.api;
 
@@ -48,7 +49,7 @@ public interface ReplicationDomainDB
    *
    * @param baseDN
    *          the replication domain baseDN
-   * @return a new ServerState object holding the {serverId => oldest CSN}
+   * @return a new ServerState object holding the {serverId => oldest CSN}
    *         mapping. If a replica DB is empty or closed, the oldest CSN will be
    *         null for that replica. The caller owns the generated ServerState.
    */
@@ -60,7 +61,7 @@ public interface ReplicationDomainDB
    *
    * @param baseDN
    *          the replication domain baseDN
-   * @return a new ServerState object holding the {serverId => newest CSN} Map.
+   * @return a new ServerState object holding the {serverId => newest CSN} Map.
    *         If a replica DB is empty or closed, the newest CSN will be null for
    *         that replica. The caller owns the generated ServerState.
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java
index c38c682ca6..b052526553 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/ECLEnabledDomainPredicate.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.replication.server.changelog.file;
 
@@ -21,7 +22,6 @@
 /**
  * Returns whether a domain is enabled for the external changelog.
  *
- * @FunctionalInterface
  */
 public class ECLEnabledDomainPredicate
 {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
index a63f74a2cc..8cc140a54d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
@@ -2199,7 +2199,6 @@ void exportLDIFEntry(byte[] lDIFEntry, int pos, int length)
    * 
    
    * When this method is called, a request for initialization is sent to the
    * remote source server requesting initialization.
-   * 
    
    *
    * @param source   The server-id of the source from which to initialize.
    *                 The source can be discovered using the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/package-info.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/package-info.java
index bc8e72f065..d73f2a59be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/package-info.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/package-info.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 
@@ -21,7 +22,7 @@
  * replication code that works on the Directory Server side.
  * 
    
  * Developers planning to use the Replication Service should
- * subClass the  HREF="ReplicationDomain.html">ReplicationDomain
+ * subClass the ReplicationDomain
  * class
  */
 @org.opends.server.types.PublicAPI(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java
index f2ebeb83e1..c76dbdeff6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java
@@ -14,6 +14,7 @@
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions copyright 2011-2016 ForgeRock AS.
  * Portions copyright 2013-2014 Manuel Gaupp
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.schema;
 
@@ -34,7 +35,6 @@
  * 
    SMR
  * 
    Syntax Matching Rule
  * 
- * 
    
  */
 public class SchemaConstants
 {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
index 8146514225..90ac069571 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.schema;
 
@@ -126,7 +127,6 @@ public final class SchemaHandler
 
   /**
    * The schema.
-   * 
    
    * @GuardedBy("exclusiveLock")
    */
   private volatile Schema schema;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
index a176a5ae54..4af6a3569d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPConnection.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
  * Portions Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.tools;
 
@@ -425,7 +426,6 @@ private  T decode(Control c, ControlDecoder decoder) throw
    * 
    
    * This method can never return null because it will receive
    * UnknownHostException before and then throw LDAPConnectionException.
-   * 
    
    *
    * @return a new {@link Socket}.
    * @throws LDAPConnectionException
@@ -484,7 +484,6 @@ private Socket createSocket() throws LDAPConnectionException
    * 
    
    * This method can never return null because it will receive
    * UnknownHostException before and then throw LDAPConnectionException.
-   * 
    
    *
    * @return a new {@link Socket}.
    * @throws LDAPConnectionException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
index ae48aff517..fc4f60d945 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SubtreeSpecification.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.types;
 
@@ -1200,7 +1201,7 @@ public int getMaximumDepth()
   /**
    * Get the minimum depth of the subtree specification.
    *
-   * @return Returns the minimum depth (<=0 indicates unlimited
+   * @return Returns the minimum depth (<=0 indicates unlimited
    *         depth).
    */
   public int getMinimumDepth()
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java b/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
index 42f8e43441..ff7f3f13bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2006-2010 Sun Microsystems, Inc.
  * Portions Copyright 2010-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.util;
 
@@ -1950,7 +1951,7 @@ public final class ServerConstants
   /**
    * The maximum depth to which nested search filters will be processed.  This
    * can prevent stack overflow errors from filters that look like
-   * "(&(&(&(&(&(&(&(&(&....".
+   * "(&(&(&(&(&(&(&(&(&....".
    */
   public static final int MAX_NESTED_FILTER_DEPTH = 100;
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index 2147926c1c..0d36598145 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -2462,7 +2462,6 @@ public static boolean hasDescriptor(LocalizableMessage msg,
    * }
    * 
    *
-   * 
    
    *
    * @param 
    *          the generic type of the passed in Iterator and for the returned
diff --git a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java
index eceb80320c..204aaacdc8 100644
--- a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java
+++ b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/DsMIBImpl.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
  * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.snmp;
 
@@ -89,7 +90,7 @@ public class DsMIBImpl extends DsMIB implements NotificationListener {
   private MBeanServer server;
 
   /**
-   * cn=monitor Mapping Class SNMP->MBean.
+   * cn=monitor Mapping Class SNMP->MBean.
    */
   private SNMPMonitor monitor;
 
diff --git a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java
index bf75ee532b..38d3abf272 100644
--- a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java
+++ b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPInetAddressAcl.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.
  * Portions copyright 2013-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.snmp;
 
@@ -158,7 +159,6 @@ public Enumeration getTrapDestinations() {
 
     /**
      * {@inheritDoc}
-     * @param address
      * @return the list of communities
      */
     public Enumeration getTrapCommunities(InetAddress address) {
@@ -178,7 +178,6 @@ public Enumeration getInformDestinations() {
 
     /**
      * {@inheritDoc}
-     * @param address
      * @return an empty enumeration
      */
     public Enumeration getInformCommunities(InetAddress address) {
diff --git a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java
index cf9df8c59d..d200860f0e 100644
--- a/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java
+++ b/opendj-server-legacy/src/snmp/src/org/opends/server/snmp/SNMPUserAcl.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.
  * Portions Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 package org.opends.server.snmp;
 
@@ -83,9 +84,6 @@ public boolean checkReadPermission(String user) {
 
     /**
      * {@inheritDoc}
-     * @param user
-     * @param contextName
-     * @param securityLevel
      */
     public boolean checkReadPermission(String user, String contextName,
             int securityLevel) {
@@ -129,7 +127,6 @@ public boolean checkWritePermission(String user, String contextName,
 
     /**
      * Check the incoming security level of the request.
-     * @param securityLevel
      * @return true if the securityLevel is appropriated, else return false
      */
     private boolean checkSecurityLevel(int securityLevel) {
diff --git a/opendj-server/pom.xml b/opendj-server/pom.xml
index aa8553888b..ca305ad01f 100644
--- a/opendj-server/pom.xml
+++ b/opendj-server/pom.xml
@@ -13,6 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2013-2016 ForgeRock AS.
+  Portions Copyright 2026 3A Systems, LLC.
 -->
 
   4.0.0
@@ -31,7 +32,6 @@
     
     
     false
-    none
   
   
     
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/Attachment.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/Attachment.java
index 07ce00b043..f6fb9561ab 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/Attachment.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/Attachment.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2010 Sun Microsystems, Inc.
  * Portions copyright 2013 ForgeRock AS.
+ * Portions Copyright 2026 3A Systems, LLC.
  */
 
 package org.forgerock.opendj.server.core;
@@ -20,7 +21,7 @@
 /**
  * Class used to define dynamic typed attachments on {@link AttachmentHolder}
  * instances. Storing attachment values in {@link AttachmentHolder} has the
- * advantage of the Attachment value being typed when compared to Map
+ * advantage of the Attachment value being typed when compared to Map
  * storage:
  *
  * @param 
diff --git a/pom.xml b/pom.xml
index 16be739fb1..0d9458db98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         ca_ES,es,de,fr,ja,ko,pl,zh_CN,zh_TW
         UTF-8
         i18n
-        3.1.1
+        3.1.2-SNAPSHOT
         2.3.34
         4.2.30
         2.1.2
@@ -67,6 +67,11 @@
         https://doc.openidentityplatform.org/opendj/man-pages/
         https://doc.openidentityplatform.org/opendj/admin-guide/
 
+        
+        all,-missing
+
       
 
     2011
@@ -322,8 +327,9 @@
 			    
 			  
 			  
-			  	none
+			  	${doclint}
                 true
+                true
 			  
 			
 			
@@ -423,7 +429,7 @@
                 
                     org.apache.maven.plugins
                     maven-javadoc-plugin
-                    3.11.2
+                    3.12.0
                 
                 
                     org.apache.maven.plugins
@@ -485,6 +491,7 @@
                 
                     org.openidentityplatform.commons.i18n-framework
                     maven-plugin
+                    ${commons.version}
                 
 
                 

From 30b40e61b545f18258beccd65e5b9fafa0ad6f7a Mon Sep 17 00:00:00 2001
From: Valera V Harseko 
Date: Sun, 12 Jul 2026 15:51:20 +0300
Subject: [PATCH 2/2] Fix Javadoc doclint failures surfaced by CI on
 Windows/JDK26 and JDK17-21

- .gitattributes: force *.html to LF so JDK 25/26 doclint on Windows does
  not treat the CR of a CRLF as part of a multi-line  start tag
  (opendj-core overview.html: "unknown tag: a").
- MessageHandler#isLastMessageFromLateQueue: {@link #getNextMessage()} ->
  {@code getNextMessage()}; the enclosing class is package-private, so
  JDK 17-21 doclint reports "reference not accessible".
---
 .gitattributes                                                | 3 +++
 .../org/opends/server/replication/server/MessageHandler.java  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..e195b512dd
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+# Keep HTML checked out with LF on all platforms so javadoc doclint
+# (JDK 25/26) does not treat CR (from CRLF) as part of a multi-line tag name.
+*.html text eol=lf
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
index b6e1b2a904..d2cf7419ee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MessageHandler.java
@@ -234,11 +234,11 @@ boolean isFollowing()
 
   /**
    * Indicates whether the last update message returned by
-   * {@link #getNextMessage()} was re-read from the changelog DB (catch-up
+   * {@code getNextMessage()} was re-read from the changelog DB (catch-up
    * path) rather than taken from the in-memory queue.
    * 
    
    * Must only be called from the consumer thread calling
-   * {@link #getNextMessage()}.
+   * {@code getNextMessage()}.
    *
    * @return true if the last returned update message came from the late queue
    */