diff --git a/bloomfilter/core/src/main/java/org/forgerock/bloomfilter/BloomFilters.java b/bloomfilter/core/src/main/java/org/forgerock/bloomfilter/BloomFilters.java
index decac0a2b8..a2478d1fc4 100644
--- a/bloomfilter/core/src/main/java/org/forgerock/bloomfilter/BloomFilters.java
+++ b/bloomfilter/core/src/main/java/org/forgerock/bloomfilter/BloomFilters.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.bloomfilter;
@@ -297,6 +298,7 @@ public RollingBloomFilterBuilder(final BloomFilterBuilder<T> toCopy) {
         }
 
         @VisibleForTesting
+        @Override
         RollingBloomFilterBuilder<T> withClock(final TimeService clock) {
             Reject.ifNull(clock);
             this.clock = clock;
diff --git a/build-tools/src/main/java/org/forgerock/testng/ForgeRockTestListener.java b/build-tools/src/main/java/org/forgerock/testng/ForgeRockTestListener.java
index d1151ba7f6..23618579eb 100755
--- a/build-tools/src/main/java/org/forgerock/testng/ForgeRockTestListener.java
+++ b/build-tools/src/main/java/org/forgerock/testng/ForgeRockTestListener.java
@@ -13,6 +13,7 @@
  *
  *      Copyright 2008 Sun Microsystems, Inc.
  *      Portions copyright 2011-2012 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.testng;
 
@@ -302,6 +303,7 @@ public ForgeRockTestListener() {
         initializeProgressVars();
     }
 
+    @Override
     public void generateReport(final List<XmlSuite> xmlSuites, final List<ISuite> suites,
             final String outputDirectory) {
         final File reportFile = new File(outputDirectory, REPORT_FILE_NAME);
@@ -310,6 +312,7 @@ public void generateReport(final List<XmlSuite> xmlSuites, final List<ISuite> su
         writeAntTestsFailedMarker(outputDirectory);
     }
 
+    @Override
     public void onConfigurationFailure(final ITestResult tr) {
         super.onConfigurationFailure(tr);
 
@@ -331,6 +334,7 @@ public void onConfigurationFailure(final ITestResult tr) {
         _bufferedTestFailures.append(failureInfo);
     }
 
+    @Override
     public void onStart(final ITestContext testContext) {
         super.onStart(testContext);
 
@@ -338,11 +342,13 @@ public void onStart(final ITestContext testContext) {
         new File(testContext.getOutputDirectory(), REPORT_FILE_NAME).delete();
     }
 
+    @Override
     public void onTestFailedButWithinSuccessPercentage(final ITestResult tr) {
         super.onTestFailedButWithinSuccessPercentage(tr);
         onTestFinished(tr);
     }
 
+    @Override
     public void onTestFailure(final ITestResult tr) {
         super.onTestFailure(tr);
 
@@ -378,11 +384,13 @@ public void onTestFailure(final ITestResult tr) {
         onTestFinished(tr);
     }
 
+    @Override
     public void onTestSkipped(final ITestResult tr) {
         super.onTestSkipped(tr);
         onTestFinished(tr);
     }
 
+    @Override
     public void onTestStart(final ITestResult tr) {
         super.onTestStart(tr);
         enforceTestClassTypeAndAnnotations(tr);
@@ -390,6 +398,7 @@ public void onTestStart(final ITestResult tr) {
         enforceMethodHasAnnotation(tr);
     }
 
+    @Override
     public void onTestSuccess(final ITestResult tr) {
         super.onTestSuccess(tr);
         onTestFinished(tr);
@@ -584,6 +593,7 @@ private List<TestClassResults> getClassesDescendingSortedByDuration() {
         final List<TestClassResults> allClasses = new ArrayList<TestClassResults>(
                 _classResults.values());
         Collections.sort(allClasses, new Comparator<TestClassResults>() {
+            @Override
             public int compare(final TestClassResults o1, final TestClassResults o2) {
                 if (o1._totalDurationMs > o2._totalDurationMs) {
                     return -1;
@@ -607,6 +617,7 @@ private String getFqMethod(final ITestResult result) {
     private List<TestMethodResults> getMethodsDescendingSortedByDuration() {
         final List<TestMethodResults> allMethods = getAllMethodResults();
         Collections.sort(allMethods, new Comparator<TestMethodResults>() {
+            @Override
             public int compare(final TestMethodResults o1, final TestMethodResults o2) {
                 if (o1._totalDurationMs > o2._totalDurationMs) {
                     return -1;
diff --git a/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java b/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java
index 69ee78275a..ce42cf9bca 100644
--- a/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java
+++ b/cassandra-embedded/src/main/java/org/openidentityplatform/commons/cassandra/EmbeddedServer.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2019 Open Identity Platform Community.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.openidentityplatform.commons.cassandra;
@@ -46,6 +47,7 @@ public class EmbeddedServer implements Runnable, AutoCloseable {
 	final private ExecutorService executor = Executors.newSingleThreadExecutor();
 	private CassandraDaemon cassandraDaemon;
 	    
+	@Override
 	public void run() {
 		try {
 			//check for external cassandra settings
@@ -138,6 +140,7 @@ public void run() {
 		}
 	}
 
+	@Override
 	public void close() {
 		if (cassandraDaemon!=null) {
 			cassandraDaemon.stop();
diff --git a/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvWriter.java b/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvWriter.java
index 350b322f7f..ce8d9079d7 100644
--- a/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvWriter.java
+++ b/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/CsvWriter.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.audit.handlers.csv;
 
@@ -47,5 +48,6 @@ interface CsvWriter extends AutoCloseable {
      */
     void flush() throws IOException;
 
+    @Override
     void close() throws IOException;
 }
diff --git a/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/StandardCsvWriter.java b/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/StandardCsvWriter.java
index 235fbd1deb..1939a01d01 100644
--- a/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/StandardCsvWriter.java
+++ b/commons/audit/handler-csv/src/main/java/org/forgerock/audit/handlers/csv/StandardCsvWriter.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.audit.handlers.csv;
 
@@ -134,6 +135,7 @@ public void writeEvent(Map<String, String> values) throws IOException {
      * Flush the data into the CSV file.
      * @throws IOException
      */
+    @Override
     public void flush() throws IOException {
         csvWriter.flush();
     }
diff --git a/commons/audit/handler-jdbc/src/main/java/org/forgerock/audit/handlers/jdbc/BufferedJdbcAuditEventExecutor.java b/commons/audit/handler-jdbc/src/main/java/org/forgerock/audit/handlers/jdbc/BufferedJdbcAuditEventExecutor.java
index 132ace778e..2c6fed64a5 100644
--- a/commons/audit/handler-jdbc/src/main/java/org/forgerock/audit/handlers/jdbc/BufferedJdbcAuditEventExecutor.java
+++ b/commons/audit/handler-jdbc/src/main/java/org/forgerock/audit/handlers/jdbc/BufferedJdbcAuditEventExecutor.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2015-2016 ForgeRock AS.
  * Portions Copyright 2016 Nomura Research Institute, Ltd.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.audit.handlers.jdbc;
 
@@ -87,6 +88,7 @@ public BufferedJdbcAuditEventExecutor(int capacity, boolean autoFlush, JdbcAudit
         this.maxBatchedEvents = maxBatchedEvents;
     }
 
+    @Override
     public void flush() {
         try {
             while (!queue.isEmpty()) {
diff --git a/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JmsAuditEventHandler.java b/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JmsAuditEventHandler.java
index 2effd05a94..f0caa3c51f 100644
--- a/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JmsAuditEventHandler.java
+++ b/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JmsAuditEventHandler.java
@@ -119,6 +119,7 @@ public void shutdown() throws ResourceException {
      * @param auditEvent The event to convert to a JMS TextMessage and publish on the JMS Topic.
      * @return a promise with either a response or an exception
      */
+    @Override
     public Promise<ResourceResponse, ResourceException> publishEvent(Context context, String auditTopic,
             JsonValue auditEvent) {
         try {
diff --git a/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JndiJmsContextManager.java b/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JndiJmsContextManager.java
index a111105592..9355621d6f 100644
--- a/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JndiJmsContextManager.java
+++ b/commons/audit/handler-jms/src/main/java/org/forgerock/audit/handlers/jms/JndiJmsContextManager.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
- * Portions copyright 2024 3A Systems LLC.
+ * Portions copyright 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.audit.handlers.jms;
@@ -67,6 +67,7 @@ class JndiJmsContextManager implements JmsContextManager {
      * @return The {@link Topic JMS topic} to use for JMS publish/subscribe functionality.
      * @throws InternalServerErrorException If unable to retrieve the {@link Topic JMS topic}.
      */
+    @Override
     public Topic getTopic() throws InternalServerErrorException {
         try {
             if (topic == null) {
@@ -83,6 +84,7 @@ public Topic getTopic() throws InternalServerErrorException {
      * @return the {@link ConnectionFactory JMS connection factory} to use to connect to JMS services.
      * @throws InternalServerErrorException If unable to retrieve the {@link ConnectionFactory JMS connection factory}.
      */
+    @Override
     public ConnectionFactory getConnectionFactory() throws InternalServerErrorException {
         try {
             if (connectionFactory == null) {
diff --git a/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogConnection.java b/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogConnection.java
index ed9607731f..2efe44c514 100644
--- a/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogConnection.java
+++ b/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogConnection.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2013 Cybernetica AS
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.audit.handlers.syslog;
 
@@ -29,5 +30,6 @@ interface SyslogConnection extends AutoCloseable {
 
     void flush() throws IOException;
 
+    @Override
     void close();
 }
diff --git a/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogPublisher.java b/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogPublisher.java
index 821c213d58..cc3bf1d9bb 100644
--- a/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogPublisher.java
+++ b/commons/audit/handler-syslog/src/main/java/org/forgerock/audit/handlers/syslog/SyslogPublisher.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2013 Cybernetica AS
  * Portions copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.audit.handlers.syslog;
 
@@ -35,5 +36,6 @@ interface SyslogPublisher extends AutoCloseable {
     /**
      * Closes the underlying connection.
      */
+    @Override
     void close();
 }
diff --git a/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/IWAModule.java b/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/IWAModule.java
index 0707f71412..376bb37d5c 100644
--- a/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/IWAModule.java
+++ b/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/IWAModule.java
@@ -117,6 +117,7 @@ public Promise<AuthStatus, AuthenticationException> validateRequest(MessageInfoC
                     LOG.debug("IWAModule: IWA successful with username, {}", username);
 
                     clientSubject.getPrincipals().add(new Principal() {
+                        @Override
                         public String getName() {
                             return username;
                         }
diff --git a/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WDSSO.java b/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WDSSO.java
index 13dd1e46ee..8a43a3a450 100644
--- a/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WDSSO.java
+++ b/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WDSSO.java
@@ -26,6 +26,7 @@
  * $Id: WindowsDesktopSSO.java,v 1.7 2009/07/28 19:40:45 beomsuk Exp $
  *
  * Portions Copyrighted 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.jaspi.modules.iwa.wdsso;
@@ -173,6 +174,7 @@ public String process(Map<String, String> options, Context context, Request requ
 
     private void authenticateToken(final byte[] kerberosToken) throws Exception {
         Subject.doAs(serviceSubject, new PrivilegedExceptionAction() {
+            @Override
             public Object run() throws Exception {
                 GSSContext context = GSSManager.getInstance().createContext((GSSCredential) null);
                 LOG.debug("IWA WDSSO: GSSContext created");
diff --git a/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WindowsDesktopSSOConfig.java b/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WindowsDesktopSSOConfig.java
index e75aa7fb64..f70c38ad25 100644
--- a/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WindowsDesktopSSOConfig.java
+++ b/commons/auth-filters/authn-filter/jaspi-modules/iwa-module/src/main/java/org/forgerock/jaspi/modules/iwa/wdsso/WindowsDesktopSSOConfig.java
@@ -26,6 +26,7 @@
  * $Id: WindowsDesktopSSOConfig.java,v 1.3 2009/04/07 22:55:13 beomsuk Exp $
  *
  * Portions Copyrighted 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 
@@ -96,6 +97,7 @@ public void setRefreshConfig(String refresh) {
      * @param appName The app name.
      * @return Array of AppConfigurationEntry
      */
+    @Override
     public AppConfigurationEntry[] getAppConfigurationEntry(String appName) {
         if (appName.equals(DEFAULT_APP_NAME)) {
             Map<String, String> hashmap = new HashMap<>();
@@ -125,6 +127,7 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String appName) {
     /**
      * Do a config refresh.
      */
+    @Override
     public void refresh() {
         config.refresh();
     }
diff --git a/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/src/main/java/org/forgerock/jaspi/modules/session/jwt/ServletJwtSessionModule.java b/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/src/main/java/org/forgerock/jaspi/modules/session/jwt/ServletJwtSessionModule.java
index 0f0ab0b144..25addc1eb1 100644
--- a/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/src/main/java/org/forgerock/jaspi/modules/session/jwt/ServletJwtSessionModule.java
+++ b/commons/auth-filters/authn-filter/jaspi-modules/jwt-session-module/src/main/java/org/forgerock/jaspi/modules/session/jwt/ServletJwtSessionModule.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
- * Portions copyright 2024 3A Systems LLC.
+ * Portions copyright 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.jaspi.modules.session.jwt;
@@ -92,6 +92,7 @@ public Jwt validateJwtSessionCookie(MessageInfo messageInfo) {
      * @param messageInfo The message info.
      * @return The cookie, or null.
      */
+    @Override
     public Cookie findJwtSessionCookie(MessageInfo messageInfo) {
         HttpServletRequest request = (HttpServletRequest) messageInfo.getRequestMessage();
         Set<Cookie> cookies = getCookies(request);
diff --git a/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceConfiguratorImpl.java b/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceConfiguratorImpl.java
index d484686af1..885bf5caa5 100644
--- a/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceConfiguratorImpl.java
+++ b/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceConfiguratorImpl.java
@@ -12,6 +12,7 @@
 * information: "Portions copyright [year] [name of copyright owner]".
 *
 * Copyright 2014-2015 ForgeRock AS.
+* Portions Copyrighted 2026 3A Systems, LLC
 */
 
 package org.forgerock.jaspi.modules.openid.resolvers.service;
@@ -46,6 +47,7 @@ public class OpenIdResolverServiceConfiguratorImpl implements OpenIdResolverServ
      * @param resolvers the configuration
      * @return false if any resolver configuration fails true otherwise
      */
+    @Override
     public boolean configureService(final OpenIdResolverService service, final List<Map<String, String>> resolvers) {
 
         if (resolvers == null || resolvers.size() < 1) {
diff --git a/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceImpl.java b/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceImpl.java
index 4f6b4c3b9b..42acd3da6a 100644
--- a/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceImpl.java
+++ b/commons/auth-filters/authn-filter/jaspi-modules/openid-connect-module/src/main/java/org/forgerock/jaspi/modules/openid/resolvers/service/OpenIdResolverServiceImpl.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.jaspi.modules.openid.resolvers.service;
@@ -85,6 +86,7 @@ public OpenIdResolverServiceImpl(final int readTimeout, final int connTimeout) {
      * @param issuer The name of the issuer of the Open Id Connect token to check
      * @return A resolver which can handle verification of the Open Id Connect token
      */
+    @Override
     public OpenIdResolver getResolverForIssuer(final String issuer) {
         return openIdResolvers.get(issuer);
     }
@@ -100,6 +102,7 @@ public OpenIdResolver getResolverForIssuer(final String issuer) {
      * @param keystorePassword password to enter the keystore
      * @return true if the resolver was configured successfully, false otherwise
      */
+    @Override
     public boolean configureResolverWithKey(final String issuer,
                                             final String keyAlias, final String keystoreLocation,
                                             final String keystoreType, final String keystorePassword) {
@@ -138,6 +141,7 @@ public boolean configureResolverWithKey(final String issuer,
      * @param sharedSecret The known-to-both-parties secret String
      * @return true if the resolver was configured successfully, false otherwise
      */
+    @Override
     public boolean configureResolverWithSecret(final String issuer, final String sharedSecret) {
 
         try {
@@ -158,6 +162,7 @@ public boolean configureResolverWithSecret(final String issuer, final String sha
      * @param jwkUrl location from which to determine which public key to use
      * @return true if the resolver was configured successfully, false otherwise
      */
+    @Override
     public boolean configureResolverWithJWK(final String issuer,
                                             final URL jwkUrl) {
 
@@ -180,6 +185,7 @@ public boolean configureResolverWithJWK(final String issuer,
      * @param configUrl location from which to determine which public key to use
      * @return true if the resolver was configured successfully, false otherwise
      */
+    @Override
     public boolean configureResolverWithWellKnownOpenIdConfiguration(final URL configUrl) {
 
         try {
diff --git a/commons/auth-filters/authn-filter/jaspi-runtime/src/main/java/org/forgerock/caf/authentication/framework/ResponseHandler.java b/commons/auth-filters/authn-filter/jaspi-runtime/src/main/java/org/forgerock/caf/authentication/framework/ResponseHandler.java
index 746fb88a56..fbc72e1b4a 100644
--- a/commons/auth-filters/authn-filter/jaspi-runtime/src/main/java/org/forgerock/caf/authentication/framework/ResponseHandler.java
+++ b/commons/auth-filters/authn-filter/jaspi-runtime/src/main/java/org/forgerock/caf/authentication/framework/ResponseHandler.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.caf.authentication.framework;
@@ -53,6 +54,7 @@ class ResponseHandler {
     private static final String QUALITY_PARAMETER = "q";
 
     private static final Comparator<MediaType> ACCEPT_QUALITY_COMPARATOR = new Comparator<MediaType>() {
+        @Override
         public int compare(MediaType o1, MediaType o2) {
             int comparison = getQuality(o2).compareTo(getQuality(o1));
             if (comparison == 0) {
@@ -155,6 +157,7 @@ static final class JsonResponseWriter implements ResponseWriter {
                 MediaType.JSON_UTF_8,
                 MediaType.JSON_UTF_8.withoutParameters());
 
+        @Override
         public List<MediaType> handles() {
             return MEDIA_TYPES;
         }
diff --git a/commons/auth-filters/authz-filter/framework-api/src/main/java/org/forgerock/authz/filter/api/AuthorizationAttribute.java b/commons/auth-filters/authz-filter/framework-api/src/main/java/org/forgerock/authz/filter/api/AuthorizationAttribute.java
index d58189d224..e65de4d84d 100644
--- a/commons/auth-filters/authz-filter/framework-api/src/main/java/org/forgerock/authz/filter/api/AuthorizationAttribute.java
+++ b/commons/auth-filters/authz-filter/framework-api/src/main/java/org/forgerock/authz/filter/api/AuthorizationAttribute.java
@@ -107,6 +107,7 @@ public int hashCode() {
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toString() {
         return "AuthorizationAttribute{key='" + key + "'}";
     }
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/ManpagePost.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/ManpagePost.java
index 0f2e8ef754..9a17492177 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/ManpagePost.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/ManpagePost.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.doc.maven.post;
@@ -60,6 +61,7 @@ public ManpagePost(final AbstractDocbkxMojo mojo) {
      *
      * @throws MojoExecutionException   Failed to copy files.
      */
+    @Override
     public void execute() throws MojoExecutionException {
         File manPageOutputDir = new File(m.getDocbkxOutputDirectory(), "manpages");
         File generatedManPageDir = new File(manPageOutputDir.getAbsolutePath().replace(' ', '_'));
diff --git a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/NoOp.java b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/NoOp.java
index 89bb34896e..dbd8be80bb 100644
--- a/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/NoOp.java
+++ b/commons/doc-maven-plugin/src/main/java/org/forgerock/doc/maven/post/NoOp.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.doc.maven.post;
@@ -40,6 +41,7 @@ public NoOp(final AbstractDocbkxMojo mojo) {
     /**
      * Does no post-processing.
      */
+    @Override
     public void execute() {
         // Nothing to do.
     }
diff --git a/commons/geo/src/main/java/ru/org/openam/geo/servlets/Flag.java b/commons/geo/src/main/java/ru/org/openam/geo/servlets/Flag.java
index 6c3a9210e8..f12da64e9c 100644
--- a/commons/geo/src/main/java/ru/org/openam/geo/servlets/Flag.java
+++ b/commons/geo/src/main/java/ru/org/openam/geo/servlets/Flag.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2020-2024 3A Systems LLC.
+ * Copyright 2020-2026 3A Systems LLC.
  */
 
 package ru.org.openam.geo.servlets;
@@ -34,6 +34,7 @@ public Flag() {
 		super();
 	}
 
+	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		if (request.getPathInfo()==null||!request.getPathInfo().matches("/[a-z]{2}\\.png"))
 			response.sendError(404);
@@ -53,6 +54,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 		}
 	}
 
+	@Override
 	protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		doGet(request, response);
 	}
diff --git a/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingInputStream.java b/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingInputStream.java
index f8db379298..3b1d9c032d 100644
--- a/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingInputStream.java
+++ b/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingInputStream.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2010–2011 ApexIdentity Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.http.io;
@@ -62,6 +63,7 @@ protected BranchingInputStream(BranchingInputStream parent) {
      * @throws IOException
      *             if an I/O exception occurs.
      */
+    @Override
     public abstract void close() throws IOException;
 
     /**
diff --git a/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java b/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java
index f80f4d44c4..05e54eb9df 100644
--- a/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java
+++ b/commons/http-framework/core/src/main/java/org/forgerock/http/io/BranchingStreamWrapper.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2010–2011 ApexIdentity Inc.
  * Portions Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.http.io;
@@ -73,6 +74,7 @@ public BranchingStreamWrapper branch() throws IOException {
         return new BranchingStreamWrapper(this, null);
     }
 
+    @Override
     public BranchingStreamWrapper copy() throws IOException {
         notClosed();
         return new BranchingStreamWrapper(this);
diff --git a/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java b/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java
index 3964310a43..178b1f96f9 100644
--- a/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java
+++ b/commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2010–2011 ApexIdentity Inc.
  * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.http.protocol;
@@ -97,6 +98,7 @@ public static SameSite parse(String value) {
         }
       }
 
+      @Override
       public String toString() {
         return name().toLowerCase();
       }
diff --git a/commons/http-framework/examples/descriptor-example/src/main/java/org/forgerock/http/example/DescribedOauth2Endpoint.java b/commons/http-framework/examples/descriptor-example/src/main/java/org/forgerock/http/example/DescribedOauth2Endpoint.java
index 959c61982e..b5eaf4d008 100644
--- a/commons/http-framework/examples/descriptor-example/src/main/java/org/forgerock/http/example/DescribedOauth2Endpoint.java
+++ b/commons/http-framework/examples/descriptor-example/src/main/java/org/forgerock/http/example/DescribedOauth2Endpoint.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.http.example;
@@ -82,6 +83,7 @@ public class DescribedOauth2Endpoint implements DescribableHandler {
     public DescribedOauth2Endpoint() {
         this.router = new Router();
         router.addRoute(requestUriMatcher(EQUALS, "authorize"), new Handler() {
+            @Override
             public Promise<Response, NeverThrowsException> handle(Context context, Request request) {
                 if (!"GET".equals(request.getMethod())) {
                     return newResultPromise(new Response(METHOD_NOT_ALLOWED));
@@ -127,6 +129,7 @@ private Promise<Response, NeverThrowsException> redirect(String redirectUri, Str
             }
         });
         router.addRoute(requestUriMatcher(EQUALS, "login"), new Handler() {
+            @Override
             public Promise<Response, NeverThrowsException> handle(Context context, Request request) {
                 String authValue = getAuthorizationHeader(request);
                 if (authValue != null && authValue.startsWith("Basic ")) {
@@ -144,6 +147,7 @@ public Promise<Response, NeverThrowsException> handle(Context context, Request r
             }
         });
         router.addRoute(requestUriMatcher(EQUALS, "token"), new Handler() {
+            @Override
             public Promise<Response, NeverThrowsException> handle(Context context, Request request) {
                 if (!"POST".equals(request.getMethod())) {
                     return newResultPromise(new Response(METHOD_NOT_ALLOWED));
@@ -179,6 +183,7 @@ private Promise<Response, NeverThrowsException> error(String error) {
             }
         });
         router.addRoute(requestUriMatcher(EQUALS, "api"), new Handler() {
+            @Override
             public Promise<Response, NeverThrowsException> handle(Context context, Request request) {
                 if (!"GET".equals(request.getMethod())) {
                     return newResultPromise(new Response(METHOD_NOT_ALLOWED));
diff --git a/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java b/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java
index e0464dce5b..8bbbdacf65 100644
--- a/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java
+++ b/commons/httpdump/src/main/java/ru/org/openam/httpdump/BufferedRequestWrapper.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2020-2025 3A Systems LLC.
+ * Copyright 2020-2026 3A Systems LLC.
  */
 
 package ru.org.openam.httpdump;
@@ -81,10 +81,12 @@ public ServletInputStreamImpl(ByteArrayInputStream is) {
             this.is = is;
         }
 
+        @Override
         public int read() throws IOException {
             return is.read();
         }
 
+        @Override
         public synchronized void mark(int i) {
             throw new RuntimeException(new IOException("mark/reset not supported"));
         }
diff --git a/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonDecryptFunction.java b/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonDecryptFunction.java
index 14216ea2f8..eb345528e6 100644
--- a/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonDecryptFunction.java
+++ b/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonDecryptFunction.java
@@ -1,3 +1,20 @@
+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]".
+ *
+ * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
+ */
+
 package org.forgerock.json.crypto;
 
 import org.forgerock.json.JsonValue;
@@ -17,6 +34,7 @@ public JsonDecryptFunction(JsonDecryptor decryptor)
     this.decryptor = ((JsonDecryptor)Reject.checkNotNull(decryptor));
   }
   
+  @Override
   protected Object traverseMap(JsonValue value)
   {
     if (JsonCrypto.isJsonCrypto(value))
diff --git a/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonEncryptFunction.java b/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonEncryptFunction.java
index bcc0627ef3..10a7e0e099 100644
--- a/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonEncryptFunction.java
+++ b/commons/json-crypto/core/src/main/java/org/forgerock/json/crypto/JsonEncryptFunction.java
@@ -1,3 +1,20 @@
+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]".
+ *
+ * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
+ */
+
 package org.forgerock.json.crypto;
 
 import org.forgerock.json.JsonValue;
@@ -14,6 +31,7 @@ public JsonEncryptFunction(JsonEncryptor encryptor)
     this.encryptor = ((JsonEncryptor)Reject.checkNotNull(encryptor));
   }
   
+  @Override
   public JsonValue apply(JsonValue value)
     throws JsonCryptoException
   {
diff --git a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonPointer.java b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonPointer.java
index 8068a56ea7..05a842355d 100644
--- a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonPointer.java
+++ b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonPointer.java
@@ -311,18 +311,22 @@ public boolean isEmpty() {
     /**
      * Returns an iterator over the pointer's reference tokens.
      */
+    @Override
     public Iterator<String> iterator() {
         return new Iterator<String>() {
             int cursor = 0;
+            @Override
             public boolean hasNext() {
                 return cursor < tokens.length;
             }
+            @Override
             public String next() {
                 if (cursor >= tokens.length) {
                     throw new NoSuchElementException();
                 }
                 return tokens[cursor++];
             }
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
diff --git a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValue.java b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValue.java
index 0c9ce853ca..7323ec1524 100644
--- a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValue.java
+++ b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValue.java
@@ -872,15 +872,19 @@ public Set<String> keys() {
                     }
                     return result;
                 }
+                @Override
                 public Iterator<String> iterator() {
                     return new Iterator<String>() {
                         Iterator<Integer> i = range.iterator();
+                        @Override
                         public boolean hasNext() {
                             return i.hasNext();
                         }
+                        @Override
                         public String next() {
                             return i.next().toString();
                         }
+                        @Override
                         public void remove() {
                             throw new UnsupportedOperationException();
                         }
@@ -902,18 +906,22 @@ public void remove() {
      * Note: calls to the {@code next()} method may throw the runtime {@link JsonException}
      * if any transformers fail to execute.
      */
+    @Override
     public Iterator<JsonValue> iterator() {
         if (isList()) { // optimize for list
             return new Iterator<JsonValue>() {
                 int cursor = 0;
                 Iterator<Object> i = asList().iterator();
+                @Override
                 public boolean hasNext() {
                     return i.hasNext();
                 }
+                @Override
                 public JsonValue next() {
                     Object element = i.next();
                     return new JsonValue(element, pointer.child(cursor++), transformers);
                 }
+                @Override
                 public void remove() {
                     throw new UnsupportedOperationException();
                 }
@@ -921,12 +929,15 @@ public void remove() {
         } else {
             return new Iterator<JsonValue>() {
                 Iterator<String> i = keys().iterator();
+                @Override
                 public boolean hasNext() {
                     return i.hasNext();
                 }
+                @Override
                 public JsonValue next() {
                     return get(i.next());
                 }
+                @Override
                 public void remove() {
                     throw new UnsupportedOperationException();
                 }
diff --git a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueList.java b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueList.java
index f2912825d2..7b75820508 100644
--- a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueList.java
+++ b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueList.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.fluent;
@@ -43,6 +44,7 @@ public JsonValueList(JsonValue jsonValue) {
         this.jsonValue = jsonValue.expect(List.class);
     }
 
+    @Override
     public JsonValue unwrap() {
         return jsonValue;
     }
diff --git a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueMap.java b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueMap.java
index fec134bbca..3584d80bb4 100644
--- a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueMap.java
+++ b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/JsonValueMap.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.fluent;
@@ -44,6 +45,7 @@ public JsonValueMap(JsonValue jsonValue) {
         this.jsonValue = jsonValue.expect(Map.class);
     }
 
+    @Override
     public JsonValue unwrap() {
         return jsonValue;
     }
@@ -51,6 +53,7 @@ public JsonValue unwrap() {
     /**
      * Returns the number of key-value mappings in this map.
      */
+    @Override
     public int size() {
         return jsonValue.size();
     }
@@ -58,6 +61,7 @@ public int size() {
     /**
      * Returns {@code true} if this map contains no key-value mappings.
      */
+    @Override
     public boolean isEmpty() {
         return (jsonValue.size() == 0);
     }
@@ -68,6 +72,7 @@ public boolean isEmpty() {
      * @param key key whose presence in this map is to be tested.
      * @return {@code true} if this map contains a mapping for the specified key.
      */
+    @Override
     public boolean containsKey(Object key) {
         return (key != null && key instanceof String && jsonValue.isDefined((String)key));
     }
@@ -78,6 +83,7 @@ public boolean containsKey(Object key) {
      * @param value value whose presence in this map is to be tested.
      * @return {@code true} if this map maps one or more keys to the specified value.
      */
+    @Override
     public boolean containsValue(Object value) {
         return jsonValue.contains(value);
     }
@@ -89,6 +95,7 @@ public boolean containsValue(Object value) {
      * @param key the key whose associated value is to be returned.
      * @return the value to which the specified key is mapped, or {@code null}.
      */
+    @Override
     public Object get(Object key) {
         Object result = null;
         if (key != null && key instanceof String) {
@@ -104,6 +111,7 @@ public Object get(Object key) {
      * @param value value to be associated with the specified key.
      * @return the previous value associated with key, or {@code null} if there was no mapping for key.
      */
+    @Override
     public Object put(String key, Object value) {
         Object result = get(key);
         jsonValue.put(key, value);
@@ -116,6 +124,7 @@ public Object put(String key, Object value) {
      * @param key key whose mapping is to be removed from the map.
      * @return the previous value associated with key, or {@code null} if there was no mapping for key.
      */
+    @Override
     public Object remove(Object key) {
         Object result = get(key);
         if (key instanceof String) {
@@ -129,6 +138,7 @@ public Object remove(Object key) {
      *
      * @param m mappings to be stored in this map.
      */
+    @Override
     public void putAll(Map<? extends String, ? extends Object> m) {
         for (Map.Entry<? extends String, ? extends Object> entry : m.entrySet()) {
             jsonValue.put(entry.getKey(), entry.getValue());
@@ -138,6 +148,7 @@ public void putAll(Map<? extends String, ? extends Object> m) {
     /**
      * Removes all of the mappings from this map.
      */
+    @Override
     public void clear() {
         jsonValue.clear();
     }
@@ -145,6 +156,7 @@ public void clear() {
     /**
      * Returns a {@code Set} view of the keys contained in this map.
      */
+    @Override
     public Set<String> keySet() {
         return jsonValue.keys();
     }
@@ -152,6 +164,7 @@ public Set<String> keySet() {
     /**
      * Returns a Collection view of the values contained in this map.
      */
+    @Override
     public Collection<Object> values() {
         ArrayList<Object> result = new ArrayList<Object>(size());
         for (JsonValue jv : jsonValue) {
@@ -163,6 +176,7 @@ public Collection<Object> values() {
     /**
      * Returns a {@code Set} view of the mappings contained in this map.
      */
+    @Override
     public Set<Map.Entry<String, Object>> entrySet() {
         HashSet<Map.Entry<String, Object>> result = new HashSet<Map.Entry<String, Object>>(size());
         for (String key : jsonValue.keys()) {
diff --git a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/RangeSet.java b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/RangeSet.java
index 26bb0fbf1c..bd2383e73c 100644
--- a/commons/json-fluent/src/main/java/org/forgerock/json/fluent/RangeSet.java
+++ b/commons/json-fluent/src/main/java/org/forgerock/json/fluent/RangeSet.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright © 2011 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.fluent;
@@ -61,15 +62,18 @@ public RangeSet(int start, int end) {
     public Iterator<String> iterator() {
         return new Iterator<String>() {
             int cursor = start;
+            @Override
             public boolean hasNext() {
                 return cursor <= end;
             }
+            @Override
             public String next() {
                 if (cursor > end) {
                     throw new NoSuchElementException();
                 }
                 return Integer.toString(cursor++);
             }
+            @Override
             public void remove() {
                 throw new UnsupportedOperationException();
             }
diff --git a/commons/json-schema/cli/src/main/java/org/forgerock/json/schema/Main.java b/commons/json-schema/cli/src/main/java/org/forgerock/json/schema/Main.java
index 301056615f..3180c8d890 100644
--- a/commons/json-schema/cli/src/main/java/org/forgerock/json/schema/Main.java
+++ b/commons/json-schema/cli/src/main/java/org/forgerock/json/schema/Main.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.schema;
@@ -164,6 +165,7 @@ private void init(URI base) throws IOException {
             validateDirectory(schemaFile);
             FileFilter filter = new FileFilter() {
 
+                @Override
                 public boolean accept(File f) {
                     return (f.isDirectory()) || (f.getName().endsWith(".json"));
                 }
diff --git a/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/BooleanTypeValidator.java b/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/BooleanTypeValidator.java
index a6af6bea85..f9e5429e02 100644
--- a/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/BooleanTypeValidator.java
+++ b/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/BooleanTypeValidator.java
@@ -54,6 +54,7 @@ public BooleanTypeValidator(Map<String, Object> schema, List<String> jsonPointer
     /**
      * {@inheritDoc}
      */
+    @Override
     public void validate(Object node, JsonPointer at, ErrorHandler handler) throws SchemaException {
         if (node instanceof Boolean) {
             return;
diff --git a/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/IntegerTypeValidator.java b/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/IntegerTypeValidator.java
index a3a9a175a4..813b26d748 100644
--- a/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/IntegerTypeValidator.java
+++ b/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/IntegerTypeValidator.java
@@ -130,6 +130,7 @@ public IntegerTypeValidator(Map<String, Object> schema, List<String> jsonPointer
     /**
      * {@inheritDoc}
      */
+    @Override
     public void validate(Object node, JsonPointer at, ErrorHandler handler) throws SchemaException {
         if (node instanceof Number) {
             Number number = (Long) node;
diff --git a/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/NumberTypeValidator.java b/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/NumberTypeValidator.java
index d7d8108c97..dfbc87cb8b 100644
--- a/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/NumberTypeValidator.java
+++ b/commons/json-schema/core/src/main/java/org/forgerock/json/schema/validator/validators/NumberTypeValidator.java
@@ -131,6 +131,7 @@ public NumberTypeValidator(Map<String, Object> schema, List<String> jsonPointer)
     /**
      * {@inheritDoc}
      */
+    @Override
     public void validate(Object node, JsonPointer at, ErrorHandler handler) throws SchemaException {
         if (node instanceof Number) {
             Number nodeValue = (Number) node;
diff --git a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/EcJWK.java b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/EcJWK.java
index 5ca97498b2..3318659c72 100644
--- a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/EcJWK.java
+++ b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/EcJWK.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.jose.jwk;
@@ -191,6 +192,7 @@ public static EcJWK parse(JsonValue json) {
      * Prints the JWK as a String json object.
      * @return a json string object
      */
+    @Override
     public String toJsonString() {
         return super.toString();
     }
diff --git a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/OctJWK.java b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/OctJWK.java
index 2e6dd18e30..f94f27d990 100644
--- a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/OctJWK.java
+++ b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/OctJWK.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.jose.jwk;
@@ -105,6 +106,7 @@ public static OctJWK parse(JsonValue json) {
      * Prints the JWK as a json string.
      * @return json string
      */
+    @Override
     public String toJsonString() {
         return super.toString();
     }
diff --git a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/RsaJWK.java b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/RsaJWK.java
index 2fa0a8129f..2956ab9323 100644
--- a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/RsaJWK.java
+++ b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwk/RsaJWK.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.jose.jwk;
@@ -555,6 +556,7 @@ public static RsaJWK parse(JsonValue json) {
      * Prints the RsaJWK object as a json string.
      * @return json string
      */
+    @Override
     public String toJsonString() {
         return super.toString();
     }
diff --git a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwt/JwtClaimsSet.java b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwt/JwtClaimsSet.java
index ec1f9b1994..158f65e903 100644
--- a/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwt/JwtClaimsSet.java
+++ b/commons/json-web-token/src/main/java/org/forgerock/json/jose/jwt/JwtClaimsSet.java
@@ -495,6 +495,7 @@ public <T> T getClaim(String key, Class<T> clazz) {
      *
      * @return A JSON string.
      */
+    @Override
     public String build() {
         return toString();
     }
diff --git a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/AbstractOSGiFrameworkService.java b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/AbstractOSGiFrameworkService.java
index 742416a466..9225e8f8bc 100644
--- a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/AbstractOSGiFrameworkService.java
+++ b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/AbstractOSGiFrameworkService.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.commons.launcher;
@@ -78,6 +79,7 @@ protected abstract List<BundleHandler> listBundleHandlers(BundleContext context)
 
     protected abstract void registerServices(BundleContext bundleContext) throws Exception;
 
+    @Override
     public void start() throws Exception {
         // Create an instance of the framework.
         FrameworkFactory factory = ServiceLoader.load(FrameworkFactory.class).iterator().next();
@@ -95,6 +97,7 @@ public void start() throws Exception {
             registerServices(framework.get().getBundleContext());
 
             Callable<Void> container = new Callable<Void>() {
+                @Override
                 public Void call() throws Exception {
                     FrameworkEvent event = null;
                     do {
@@ -127,6 +130,7 @@ public Void call() throws Exception {
         }
     }
     
+    @Override
     public void stop() throws Exception {
         Framework fw = framework.getAndSet(null);
         if (null != fw) {
diff --git a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/BundleHandler.java b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/BundleHandler.java
index ff2026f0ce..5ab56cbfbb 100644
--- a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/BundleHandler.java
+++ b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/BundleHandler.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.commons.launcher;
@@ -88,6 +89,7 @@ public EnumSet<Action> getActions() {
         return actions;
     }
 
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("BundleHandler[");
         sb.append("url: ").append(bundleUrl);
diff --git a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/ConfigurationUtil.java b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/ConfigurationUtil.java
index b67903c645..ad10b4f0fd 100644
--- a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/ConfigurationUtil.java
+++ b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/ConfigurationUtil.java
@@ -125,6 +125,7 @@ public static Vector<URL> getJarFileListing(URL location, List<String> includes,
 
     static { 
     	URL.setURLStreamHandlerFactory(protocol -> "jar".equals(protocol) ? new URLStreamHandler() {
+    	    @Override
     	    protected URLConnection openConnection(URL url) throws IOException {
     	        return new JarURLConnection(url) {
     	        	
diff --git a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java
index c107e5d658..b2a175e300 100644
--- a/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java
+++ b/commons/launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java
@@ -145,6 +145,7 @@ public class OSGiFrameworkService extends AbstractOSGiFrameworkService {
     public OSGiFrameworkService() {
 
         propertyAccessor = new PropertyAccessor() {
+            @Override
             public <T> T get(String name) {
                 Object value = null;
                 if (null != bootParameters) {
@@ -174,6 +175,7 @@ public <T> T get(String name) {
         };
 
         transformer = new JsonTransformer() {
+            @Override
             public void transform(JsonValue value) throws JsonException {
                 if (null != value && value.isString()) {
                     value.setObject(ConfigurationUtil.substVars(value.asString(), propertyAccessor));
@@ -222,6 +224,7 @@ public void setConfigFile(String configFile) {
         this.configFile = configFile;
     }
 
+    @Override
     protected boolean isVerbose() {
         return verbose;
     }
@@ -249,6 +252,7 @@ public void setBootParameters(Map bootParameters) {
         this.bootParameters = bootParameters;
     }
 
+    @Override
     public boolean isNewThread() {
         return newThread;
     }
@@ -258,11 +262,13 @@ public void setNewThread(boolean value) {
         newThread = value;
     }
 
+    @Override
     protected long getStopTimeout() {
         return 0;
     }
 
     @SuppressWarnings({ "unchecked" })
+    @Override
     public void init(String[] arguments) throws Exception {
         CmdLineParser parser = new CmdLineParser(this);
 
@@ -292,14 +298,17 @@ public void init(String[] arguments) throws Exception {
         init();
     }
 
+    @Override
     public void destroy() {
 
     }
 
+    @Override
     public Bundle getSystemBundle() {
         return getFramework();
     }
 
+    @Override
     public void init() throws Exception {
         if (null == bootParameters) {
             bootParameters = new HashMap<String, Object>();
@@ -388,6 +397,7 @@ public void init() throws Exception {
                 || ((enableHook instanceof String) && !((String) enableHook)
                         .equalsIgnoreCase("false"))) {
             Runtime.getRuntime().addShutdownHook(new Thread("Felix Shutdown Hook") {
+                @Override
                 public void run() {
                     try {
                         OSGiFrameworkService.this.stop();
@@ -402,6 +412,7 @@ public void run() {
 
     }
 
+    @Override
     protected void registerServices(BundleContext bundleContext) throws Exception {
         Dictionary<String, String> properties = new Hashtable<String, String>(4);
         properties.put(Constants.SERVICE_VENDOR, "Open Identity Platform Community");
@@ -412,6 +423,7 @@ protected void registerServices(BundleContext bundleContext) throws Exception {
                 properties);
     }
 
+    @Override
     protected Map<String, String> getConfigurationProperties() {
         if (null == configurationProperties) {
             configurationProperties = new HashMap<String, String>();
@@ -435,6 +447,7 @@ public void setLauncherConfiguration(JsonValue launcherConfiguration) {
         this.launcherConfiguration = launcherConfiguration;
     }
 
+    @Override
     protected List<BundleHandler> listBundleHandlers(BundleContext context)
             throws MalformedURLException {
         JsonValue bundle = getLauncherConfiguration().get("bundle");
diff --git a/commons/rest/api-descriptor/src/main/java/org/forgerock/api/transform/LocalizableByteArrayProperty.java b/commons/rest/api-descriptor/src/main/java/org/forgerock/api/transform/LocalizableByteArrayProperty.java
index b0afca9a43..933f7c9a72 100644
--- a/commons/rest/api-descriptor/src/main/java/org/forgerock/api/transform/LocalizableByteArrayProperty.java
+++ b/commons/rest/api-descriptor/src/main/java/org/forgerock/api/transform/LocalizableByteArrayProperty.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.api.transform;
@@ -92,6 +93,7 @@ public void setDefault(String defaultValue) {
      *
      * @return Default value or {@code null}
      */
+    @Override
     public String getDefault() {
         return defaultValue;
     }
diff --git a/commons/rest/json-resource-http/src/main/java/org/forgerock/json/resource/http/HttpUtils.java b/commons/rest/json-resource-http/src/main/java/org/forgerock/json/resource/http/HttpUtils.java
index a58b099971..822a0a8430 100644
--- a/commons/rest/json-resource-http/src/main/java/org/forgerock/json/resource/http/HttpUtils.java
+++ b/commons/rest/json-resource-http/src/main/java/org/forgerock/json/resource/http/HttpUtils.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
- * Portions copyright 2024 3A Systems LLC.
+ * Portions copyright 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.json.resource.http;
@@ -926,18 +926,22 @@ private static class HttpServletRequestDataSource implements DataSource {
             this.request = request;
         }
 
+        @Override
         public InputStream getInputStream() throws IOException {
             return request.getEntity().getRawContentInputStream();
         }
 
+        @Override
         public OutputStream getOutputStream() throws IOException {
             return null;
         }
 
+        @Override
         public String getContentType() {
             return request.getHeaders().getFirst(ContentTypeHeader.class);
         }
 
+        @Override
         public String getName() {
             return "HttpServletRequestDataSource";
         }
diff --git a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/AbstractConnectionWrapper.java b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/AbstractConnectionWrapper.java
index 4c12fd7675..2fec989409 100644
--- a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/AbstractConnectionWrapper.java
+++ b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/AbstractConnectionWrapper.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.resource;
@@ -69,6 +70,7 @@ protected Context transform(Context context) {
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public ActionResponse action(Context context, ActionRequest request) throws ResourceException {
         return connection.action(transform(context), request);
     }
@@ -78,6 +80,7 @@ public ActionResponse action(Context context, ActionRequest request) throws Reso
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public Promise<ActionResponse, ResourceException> actionAsync(Context context, ActionRequest request) {
         return connection.actionAsync(transform(context), request);
     }
@@ -87,6 +90,7 @@ public Promise<ActionResponse, ResourceException> actionAsync(Context context, A
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public void close() {
         connection.close();
     }
@@ -96,6 +100,7 @@ public void close() {
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public ResourceResponse create(Context context, CreateRequest request) throws ResourceException {
         return connection.create(transform(context), request);
     }
@@ -105,6 +110,7 @@ public ResourceResponse create(Context context, CreateRequest request) throws Re
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public Promise<ResourceResponse, ResourceException> createAsync(Context context, CreateRequest request) {
         return connection.createAsync(transform(context), request);
     }
@@ -114,6 +120,7 @@ public Promise<ResourceResponse, ResourceException> createAsync(Context context,
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public ResourceResponse delete(Context context, DeleteRequest request) throws ResourceException {
         return connection.delete(transform(context), request);
     }
@@ -123,6 +130,7 @@ public ResourceResponse delete(Context context, DeleteRequest request) throws Re
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public Promise<ResourceResponse, ResourceException> deleteAsync(Context context, DeleteRequest request) {
         return connection.deleteAsync(transform(context), request);
     }
@@ -132,6 +140,7 @@ public Promise<ResourceResponse, ResourceException> deleteAsync(Context context,
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public boolean isClosed() {
         return connection.isClosed();
     }
@@ -141,6 +150,7 @@ public boolean isClosed() {
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public boolean isValid() {
         return connection.isValid();
     }
@@ -150,6 +160,7 @@ public boolean isValid() {
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public ResourceResponse patch(Context context, PatchRequest request) throws ResourceException {
         return connection.patch(transform(context), request);
     }
@@ -159,6 +170,7 @@ public ResourceResponse patch(Context context, PatchRequest request) throws Reso
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public Promise<ResourceResponse, ResourceException> patchAsync(Context context, PatchRequest request) {
         return connection.patchAsync(transform(context), request);
     }
@@ -168,6 +180,7 @@ public Promise<ResourceResponse, ResourceException> patchAsync(Context context,
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public QueryResponse query(Context context, QueryRequest request, QueryResourceHandler handler)
             throws ResourceException {
         return connection.query(transform(context), request, handler);
@@ -178,6 +191,7 @@ public QueryResponse query(Context context, QueryRequest request, QueryResourceH
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public QueryResponse query(Context context, QueryRequest request,
             Collection<? super ResourceResponse> results) throws ResourceException {
         return connection.query(transform(context), request, results);
@@ -188,6 +202,7 @@ public QueryResponse query(Context context, QueryRequest request,
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public Promise<QueryResponse, ResourceException> queryAsync(Context context,
             QueryRequest request, QueryResourceHandler handler) {
         return connection.queryAsync(transform(context), request, handler);
@@ -198,6 +213,7 @@ public Promise<QueryResponse, ResourceException> queryAsync(Context context,
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public ResourceResponse read(Context context, ReadRequest request) throws ResourceException {
         return connection.read(transform(context), request);
     }
@@ -207,6 +223,7 @@ public ResourceResponse read(Context context, ReadRequest request) throws Resour
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public Promise<ResourceResponse, ResourceException> readAsync(Context context, ReadRequest request) {
         return connection.readAsync(transform(context), request);
     }
@@ -216,6 +233,7 @@ public Promise<ResourceResponse, ResourceException> readAsync(Context context, R
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public ResourceResponse update(Context context, UpdateRequest request) throws ResourceException {
         return connection.update(transform(context), request);
     }
@@ -225,6 +243,7 @@ public ResourceResponse update(Context context, UpdateRequest request) throws Re
      * <p>
      * The default implementation is to delegate.
      */
+    @Override
     public Promise<ResourceResponse, ResourceException> updateAsync(Context context, UpdateRequest request) {
         return connection.updateAsync(transform(context), request);
     }
diff --git a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Connection.java b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Connection.java
index 524d649a02..5f4e2bbd8e 100644
--- a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Connection.java
+++ b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Connection.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.resource;
@@ -76,6 +77,7 @@ public interface Connection extends Closeable {
      * Calling {@code close} on a connection that is already closed has no
      * effect.
      */
+    @Override
     void close();
 
     /**
diff --git a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Resources.java b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Resources.java
index f79ee40656..7f7bc0af91 100644
--- a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Resources.java
+++ b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Resources.java
@@ -72,6 +72,7 @@ public Connection getConnection() {
             return newInternalConnection(handler);
         }
 
+        @Override
         public Promise<Connection, ResourceException> getConnectionAsync() {
             return newSuccessfulPromise(getConnection());
         }
diff --git a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Responses.java b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Responses.java
index ac84141bc1..0534ae7143 100644
--- a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Responses.java
+++ b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/Responses.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.resource;
@@ -240,6 +241,7 @@ public void addField(JsonPointer... fields) {
             }
         }
 
+        @Override
         public Promise<ResourceResponse, ResourceException> asPromise() {
             return Promises.<ResourceResponse, ResourceException>newResultPromise(this);
         }
diff --git a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/SortKey.java b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/SortKey.java
index cca0397f05..02f38a1873 100644
--- a/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/SortKey.java
+++ b/commons/rest/json-resource/src/main/java/org/forgerock/json/resource/SortKey.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2012-2015 ForgeRock AS. All rights reserved.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json.resource;
@@ -156,6 +157,7 @@ public static SortKey valueOf(String s) {
      *
      * @return The string representation of this sort key.
      */
+    @Override
     public String toString() {
         final StringBuilder builder = new StringBuilder();
         builder.append(isAscendingOrder ? '+' : '-');
diff --git a/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleEmailService.java b/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleEmailService.java
index ad26becb24..2d0ce738f5 100644
--- a/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleEmailService.java
+++ b/commons/selfservice/example/src/main/java/org/forgerock/selfservice/example/ExampleEmailService.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
- * Portions copyright 2024 3A Systems LLC.
+ * Portions copyright 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.selfservice.example;
@@ -120,6 +120,7 @@ private JsonValue sendEmail(JsonValue document) throws ResourceException {
 
         Session session = Session.getInstance(props, new Authenticator() {
 
+            @Override
             protected PasswordAuthentication getPasswordAuthentication() {
                 return new PasswordAuthentication(username, password);
             }
diff --git a/commons/selfservice/stages/src/main/java/org/forgerock/selfservice/stages/tokenhandlers/JwtTokenHandlerConfig.java b/commons/selfservice/stages/src/main/java/org/forgerock/selfservice/stages/tokenhandlers/JwtTokenHandlerConfig.java
index d46a6198ad..1b87a38f71 100644
--- a/commons/selfservice/stages/src/main/java/org/forgerock/selfservice/stages/tokenhandlers/JwtTokenHandlerConfig.java
+++ b/commons/selfservice/stages/src/main/java/org/forgerock/selfservice/stages/tokenhandlers/JwtTokenHandlerConfig.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.selfservice.stages.tokenhandlers;
@@ -56,6 +57,7 @@ public final class JwtTokenHandlerConfig implements SnapshotTokenConfig {
      *
      * @return the type
      */
+    @Override
     public String getType() {
         return TYPE;
     }
diff --git a/commons/util/util/src/main/java/org/forgerock/json/JsonPatch.java b/commons/util/util/src/main/java/org/forgerock/json/JsonPatch.java
index 29d75e9e05..5e8ac7e9ef 100644
--- a/commons/util/util/src/main/java/org/forgerock/json/JsonPatch.java
+++ b/commons/util/util/src/main/java/org/forgerock/json/JsonPatch.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.json;
@@ -64,6 +65,7 @@ public final class JsonPatch {
      */
     private static final JsonPatchValueTransformer DEFAULT_TRANSFORM =
         new JsonPatchValueTransformer() {
+            @Override
             public Object getTransformedValue(JsonValue target, JsonValue op) {
                 if (op.get(JsonPatch.VALUE_PTR) != null) {
                     return op.get(JsonPatch.VALUE_PTR).getObject();
diff --git a/commons/util/util/src/main/java/org/forgerock/util/i18n/LocalizableString.java b/commons/util/util/src/main/java/org/forgerock/util/i18n/LocalizableString.java
index 87a85c113a..89b4705481 100644
--- a/commons/util/util/src/main/java/org/forgerock/util/i18n/LocalizableString.java
+++ b/commons/util/util/src/main/java/org/forgerock/util/i18n/LocalizableString.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.util.i18n;
 
@@ -125,6 +126,7 @@ public String toTranslatedString(PreferredLocales locales) {
      * The default toString method. No translation is applied.
      * @return the untranslated string value
      */
+    @Override
     public String toString() {
         return defaultValue == null ? value : "[" + value + "], default [" + defaultValue + "]";
     }
diff --git a/commons/util/util/src/main/java/org/forgerock/util/query/QueryFilter.java b/commons/util/util/src/main/java/org/forgerock/util/query/QueryFilter.java
index 250b75918a..7221b497c1 100644
--- a/commons/util/util/src/main/java/org/forgerock/util/query/QueryFilter.java
+++ b/commons/util/util/src/main/java/org/forgerock/util/query/QueryFilter.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.util.query;
@@ -218,6 +219,7 @@ protected <R, P> R accept(final QueryFilterVisitor<R, P, FF> v, final P p) {
             return v.visitExtendedMatchFilter(p, field, operator, valueAssertion);
         }
 
+        @Override
         public int hashCode() {
             return (field.hashCode() * 31 + operator.hashCode()) * 31
                     + valueAssertion.hashCode();
diff --git a/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java b/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java
index ba9b98c69a..0f42416b92 100644
--- a/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java
+++ b/commons/util/util/src/main/java/org/forgerock/util/thread/ExecutorServiceFactory.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.util.thread;
 
@@ -186,6 +187,7 @@ public ExecutorService createThreadPool(int coreSize, int maxSize, long idleTime
     private void registerShutdown(final ExecutorService service) {
         shutdownManager.addShutdownListener(
                 new ShutdownListener() {
+                    @Override
                     public void shutdown() {
                         service.shutdownNow();
                     }
@@ -206,6 +208,7 @@ public NamedThreadFactory(String name) {
             this.name = name;
         }
 
+        @Override
         public Thread newThread(Runnable r) {
             return new Thread(r, name + "-" +  count.getAndIncrement());
         }
diff --git a/commons/xcite-maven-plugin/src/main/java/org/forgerock/maven/plugins/xcite/Citation.java b/commons/xcite-maven-plugin/src/main/java/org/forgerock/maven/plugins/xcite/Citation.java
index cd023631b1..1b34649088 100644
--- a/commons/xcite-maven-plugin/src/main/java/org/forgerock/maven/plugins/xcite/Citation.java
+++ b/commons/xcite-maven-plugin/src/main/java/org/forgerock/maven/plugins/xcite/Citation.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.maven.plugins.xcite;
@@ -317,6 +318,7 @@ private static boolean isNullOrEmpty(final String string) {
      *
      * @return The string representation of this citation.
      */
+    @Override
     public String toString() {
         String start =
                 (isNullOrEmpty(getStart()) ? "" : getDelimiter() + getStart());
diff --git a/guice/core/src/main/java/org/forgerock/guice/core/ServiceLoaderWrapper.java b/guice/core/src/main/java/org/forgerock/guice/core/ServiceLoaderWrapper.java
index 9180ee01e9..77d2849207 100644
--- a/guice/core/src/main/java/org/forgerock/guice/core/ServiceLoaderWrapper.java
+++ b/guice/core/src/main/java/org/forgerock/guice/core/ServiceLoaderWrapper.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.guice.core;
@@ -64,6 +65,7 @@ private ServiceSet(java.util.ServiceLoader<T> serviceLoader) {
          *
          * @return {@inheritDoc}
          */
+        @Override
         public Iterator<T> iterator() {
             return serviceLoader.iterator();
         }
diff --git a/guice/servlet/src/main/java/org/forgerock/guice/core/GuiceInitialisationFilter.java b/guice/servlet/src/main/java/org/forgerock/guice/core/GuiceInitialisationFilter.java
index a33df56125..2f0c191f90 100644
--- a/guice/servlet/src/main/java/org/forgerock/guice/core/GuiceInitialisationFilter.java
+++ b/guice/servlet/src/main/java/org/forgerock/guice/core/GuiceInitialisationFilter.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2015 ForgeRock AS.
- * Portions copyright 2024 3A Systems LLC.
+ * Portions copyright 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.guice.core;
@@ -39,6 +39,7 @@ public final class GuiceInitialisationFilter implements ServletContextListener {
      *
      * @param servletContextEvent {@inheritDoc}
      */
+    @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
     		try {
 	        ServletContext servletContext = servletContextEvent.getServletContext();
@@ -58,6 +59,7 @@ public void contextInitialized(ServletContextEvent servletContextEvent) {
      *
      * @param servletContextEvent {@inheritDoc}
      */
+    @Override
     public void contextDestroyed(ServletContextEvent servletContextEvent) {
     }
 }
diff --git a/guice/test/src/main/java/org/forgerock/guice/core/GuiceTestCase.java b/guice/test/src/main/java/org/forgerock/guice/core/GuiceTestCase.java
index 770ffd60e5..2c0a65a83f 100644
--- a/guice/test/src/main/java/org/forgerock/guice/core/GuiceTestCase.java
+++ b/guice/test/src/main/java/org/forgerock/guice/core/GuiceTestCase.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.guice.core;
@@ -56,6 +57,7 @@ public void setupGuiceModules() throws Exception {
 
         final GuiceTestCase testCase = this;
         Module overrideModule = new Module() {
+            @Override
             public void configure(Binder binder) {
                 testCase.configureOverrideBindings(binder);
             }
@@ -79,6 +81,7 @@ public void teardownGuiceModules() throws Exception {
      * A default, empty implementation is provided as the test may not have any of its own objects to bind.
      * @param binder The Guice binder.
      */
+    @Override
     public void configure(Binder binder) {
     }
 
diff --git a/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessage.java b/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessage.java
index ab084e05dc..f976af5c84 100755
--- a/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessage.java
+++ b/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessage.java
@@ -13,6 +13,7 @@
  *
  *      Copyright 2009 Sun Microsystems, Inc.
  *      Portions copyright 2011-2012 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.i18n;
@@ -193,6 +194,7 @@ private static boolean isAIXPost5() {
      *             If the {@code index} argument is negative or not less than
      *             {@code length()}.
      */
+    @Override
     public char charAt(final int index) {
         return charAt(Locale.getDefault(), index);
     }
@@ -226,6 +228,7 @@ public char charAt(final Locale locale, final int index) {
      * @return A negative integer, zero, or a positive integer as this object is
      *         less than, equal to, or greater than the specified object.
      */
+    @Override
     public int compareTo(final LocalizableMessage message) {
         return toString().compareTo(message.toString());
     }
@@ -287,6 +290,7 @@ public boolean equals(final Object o) {
      *             href="../util/Formatter.html#detail">Details</a> section of
      *             the formatter class specification.
      */
+    @Override
     public void formatTo(final Formatter formatter, final int flags,
             final int width, final int precision) {
         // Ignores flags, width and precision for now.
@@ -314,6 +318,7 @@ public int hashCode() {
      * @return The length of the {@code String} representation of this message
      *         in the default locale.
      */
+    @Override
     public int length() {
         return length(Locale.getDefault());
     }
@@ -390,6 +395,7 @@ public String resourceName() {
      *             is greater than {@code length()}, or if {@code start} is
      *             greater than {@code end}.
      */
+    @Override
     public CharSequence subSequence(final int start, final int end) {
         return subSequence(Locale.getDefault(), start, end);
     }
diff --git a/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessageBuilder.java b/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessageBuilder.java
index 52c04b29b5..a0a382bf80 100755
--- a/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessageBuilder.java
+++ b/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizableMessageBuilder.java
@@ -13,6 +13,7 @@
  *
  *      Copyright 2007-2009 Sun Microsystems, Inc.
  *      Portions copyright 2011 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.i18n;
@@ -103,6 +104,7 @@ public LocalizableMessageBuilder(final Object object) {
      *            The character to be appended.
      * @return A reference to this message builder.
      */
+    @Override
     public LocalizableMessageBuilder append(final char c) {
         return append(LocalizableMessage.valueOf(c));
     }
@@ -116,6 +118,7 @@ public LocalizableMessageBuilder append(final char c) {
      * @throws NullPointerException
      *             If {@code cs} was {@code null}.
      */
+    @Override
     public LocalizableMessageBuilder append(final CharSequence cs) {
         if (cs == null) {
             throw new NullPointerException("cs was null");
@@ -150,6 +153,7 @@ public LocalizableMessageBuilder append(final CharSequence cs) {
      * @throws NullPointerException
      *             If {@code cs} was {@code null}.
      */
+    @Override
     public LocalizableMessageBuilder append(final CharSequence cs,
             final int start, final int end) {
         return append(cs.subSequence(start, end));
@@ -208,6 +212,7 @@ public LocalizableMessageBuilder append(final Object object) {
      *             If the {@code index} argument is negative or not less than
      *             {@code length()}.
      */
+    @Override
     public char charAt(final int index) {
         return charAt(Locale.getDefault(), index);
     }
@@ -239,6 +244,7 @@ public char charAt(final Locale locale, final int index) {
      * @return The length of the {@code String} representation of this message
      *         builder in the default locale.
      */
+    @Override
     public int length() {
         return length(Locale.getDefault());
     }
@@ -277,6 +283,7 @@ public int length(final Locale locale) {
      *             is greater than {@code length()}, or if {@code start} is
      *             greater than {@code end}.
      */
+    @Override
     public CharSequence subSequence(final int start, final int end) {
         return subSequence(Locale.getDefault(), start, end);
     }
diff --git a/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizedIllegalArgumentException.java b/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizedIllegalArgumentException.java
index cf3c5d7f95..23ea0addd7 100644
--- a/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizedIllegalArgumentException.java
+++ b/i18n-framework/core/src/main/java/org/forgerock/i18n/LocalizedIllegalArgumentException.java
@@ -13,6 +13,7 @@
  *
  *      Copyright 2009 Sun Microsystems, Inc.
  *      Portions copyright 2011 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.i18n;
@@ -69,6 +70,7 @@ public LocalizedIllegalArgumentException(final LocalizableMessage message,
     /**
      * {@inheritDoc}
      */
+    @Override
     public final LocalizableMessage getMessageObject() {
         return this.message;
     }
diff --git a/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/AbstractGenerateMessagesMojo.java b/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/AbstractGenerateMessagesMojo.java
index 1e3e97eed4..5d943e9b96 100644
--- a/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/AbstractGenerateMessagesMojo.java
+++ b/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/AbstractGenerateMessagesMojo.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyrighted [year] [name of copyright owner]".
  *
  *      Copyright 2011-2013 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 package org.forgerock.i18n.maven;
 
@@ -543,6 +544,7 @@ private boolean useGenericMessageTypeClass() {
     /**
      * {@inheritDoc}
      */
+    @Override
     public final void execute() throws MojoExecutionException {
         final File resourceDirectory = getResourceDirectory();
 
diff --git a/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/CleanMessagesMojo.java b/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/CleanMessagesMojo.java
index 19860891b3..74838214fc 100644
--- a/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/CleanMessagesMojo.java
+++ b/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/CleanMessagesMojo.java
@@ -61,6 +61,7 @@ private SourceFileTask(final File sourceFile) {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void run() {
             // Cache the keys that we want to check so that we avoid excessive
             // contention on the CHM.
@@ -138,6 +139,7 @@ public void run() {
      * {@inheritDoc}
      */
     // @Checkstyle:ignore
+    @Override
     public void execute() throws MojoExecutionException {
         if (!sourceDirectory.exists()) {
             throw new MojoExecutionException("Source directory "
diff --git a/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/MessagePropertyKey.java b/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/MessagePropertyKey.java
index acd6c12875..6963f3a669 100644
--- a/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/MessagePropertyKey.java
+++ b/i18n-framework/maven-plugin/src/main/java/org/forgerock/i18n/maven/MessagePropertyKey.java
@@ -13,6 +13,7 @@
  *
  *      Copyright 2008 Sun Microsystems, Inc.
  *      Portions copyright 2011 ForgeRock AS
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.i18n.maven;
@@ -106,6 +107,7 @@ private MessagePropertyKey(final String name, final int ordinal) {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int compareTo(final MessagePropertyKey k) {
         if (ordinal == k.ordinal) {
             return name.compareTo(k.name);
diff --git a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java
index 434fcf5ecd..4ecca0aba9 100644
--- a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java
+++ b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ArtifactItem.java
@@ -335,6 +335,7 @@ public final void setClassifier(final String classifier)
      * 
      * @return result string
      */
+    @Override
     public final String toString()
     {
         if (this.classifier == null)
diff --git a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/CleanExternalDependencyMojo.java b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/CleanExternalDependencyMojo.java
index c72a846558..dc8ef42714 100644
--- a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/CleanExternalDependencyMojo.java
+++ b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/CleanExternalDependencyMojo.java
@@ -29,6 +29,7 @@
  */
 public class CleanExternalDependencyMojo extends AbstractExternalDependencyMojo
 {
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         try
diff --git a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/DeployExternalDependencyMojo.java b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/DeployExternalDependencyMojo.java
index 0620f46f32..10f89ee769 100644
--- a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/DeployExternalDependencyMojo.java
+++ b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/DeployExternalDependencyMojo.java
@@ -68,6 +68,7 @@ public class DeployExternalDependencyMojo extends
      */
     private boolean offline;
 
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         // update base configuration parameters
diff --git a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/InstallExternalDependencyMojo.java b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/InstallExternalDependencyMojo.java
index 98436650ba..ba481c5c63 100644
--- a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/InstallExternalDependencyMojo.java
+++ b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/InstallExternalDependencyMojo.java
@@ -70,6 +70,7 @@ public class InstallExternalDependencyMojo extends
      */
     protected boolean createChecksum = true;
 
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         try
diff --git a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ResolveExternalDependencyMojo.java b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ResolveExternalDependencyMojo.java
index 054702c714..09e04481ea 100644
--- a/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ResolveExternalDependencyMojo.java
+++ b/maven-external-dependency-plugin/maven-external-dependency-plugin/src/main/java/com/savage7/maven/plugin/dependency/ResolveExternalDependencyMojo.java
@@ -122,6 +122,7 @@ public class ResolveExternalDependencyMojo extends
      */
     private Integer downloadRetryDelay;
     
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         try
diff --git a/persistit/examples/FindFile/FindFile.java b/persistit/examples/FindFile/FindFile.java
index b288264cb5..427539c593 100644
--- a/persistit/examples/FindFile/FindFile.java
+++ b/persistit/examples/FindFile/FindFile.java
@@ -12,6 +12,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 Copyrighted 2026 3A Systems, LLC
  */
 
 import java.awt.BorderLayout;
@@ -114,18 +115,21 @@ public FindFile(String defaultFileName, Persistit persistit) {
         this.persistit = persistit;
 
         searchButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent ae) {
                 doSearch();
             }
         });
 
         loadButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent ae) {
                 doLoad();
             }
         });
 
         clearButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent ae) {
                 doClear();
             }
@@ -216,6 +220,7 @@ private void doSearch() {
         // performed in a separate thread.
         //
         Thread workerThread = new Thread() {
+            @Override
             public void run() {
                 if (suffix.length() > prefix.length()) {
                     //
@@ -248,6 +253,7 @@ private void doLoad() {
         loadButton.setEnabled(false);
 
         Thread workerThread = new Thread(new Runnable() {
+            @Override
             public void run() {
                 loadFileNames(fileName);
             }
@@ -262,6 +268,7 @@ public void run() {
      */
     private void doClear() {
         Thread workerThread = new Thread(new Runnable() {
+            @Override
             public void run() {
                 resetFileNames();
             }
@@ -327,6 +334,7 @@ private void traverseFileNames(String fixed, Pattern pattern, boolean forward) {
             setEnabled(searchField, true);
 
             SwingUtilities.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                     int size = selectedFileNames.size();
                     for (int index = 0; index < size; index++) {
@@ -511,6 +519,7 @@ private void loadOneLine(String line, StringBuilder sb) {
      */
     private void adjustProgressBar(final int value, final int maximum) {
         SwingUtilities.invokeLater(new Runnable() {
+            @Override
             public void run() {
                 progressBar.setMaximum(maximum);
                 progressBar.setValue(value);
@@ -532,6 +541,7 @@ public void run() {
      */
     private void setEnabled(final JComponent component, final boolean enabled) {
         SwingUtilities.invokeLater(new Runnable() {
+            @Override
             public void run() {
                 component.setEnabled(enabled);
             }
@@ -564,12 +574,14 @@ public static void main(String[] args) {
         // the containing JFrame.
         //
         frame.addWindowListener(new WindowAdapter() {
+            @Override
             public void windowClosed(WindowEvent we) {
                 //
                 // Persistit.close may take several seconds to complete. Best
                 // not to do it on the Swing event dispatch thread.
                 //
                 Thread workerThread = new Thread(new Runnable() {
+                    @Override
                     public void run() {
                         try {
                             System.out.println("Closing Persistit");
diff --git a/persistit/examples/SimpleTransaction/SimpleTransaction.java b/persistit/examples/SimpleTransaction/SimpleTransaction.java
index becd7cd77f..c2d08e99f5 100644
--- a/persistit/examples/SimpleTransaction/SimpleTransaction.java
+++ b/persistit/examples/SimpleTransaction/SimpleTransaction.java
@@ -12,6 +12,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 Copyrighted 2026 3A Systems, LLC
  */
 
 import java.io.PrintStream;
@@ -142,10 +143,12 @@ static void usage() {
         }
     }
 
+    @Override
     public String toString() {
         return "SimpleTransaction #" + _threadIndex;
     }
 
+    @Override
     public void run() {
         try {
             Exchange accountEx = new Exchange(persistit, "txndemo", "account", true);
@@ -252,6 +255,7 @@ static class Balancer implements TransactionRunnable {
             _ex = ex;
         }
 
+        @Override
         public void runTransaction() throws PersistitException {
             _ex.clear().append(Key.BEFORE);
             //
diff --git a/script/common/src/main/java/org/forgerock/script/ScriptName.java b/script/common/src/main/java/org/forgerock/script/ScriptName.java
index f0284c81b7..aaa281dbf5 100644
--- a/script/common/src/main/java/org/forgerock/script/ScriptName.java
+++ b/script/common/src/main/java/org/forgerock/script/ScriptName.java
@@ -100,6 +100,7 @@ public int hashCode() {
         return result;
     }
 
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder(name).append(':').append(type);
         if (null != revision) {
diff --git a/script/common/src/main/java/org/forgerock/script/engine/AbstractScriptEngine.java b/script/common/src/main/java/org/forgerock/script/engine/AbstractScriptEngine.java
index 71029ad26f..8a84b6aa81 100644
--- a/script/common/src/main/java/org/forgerock/script/engine/AbstractScriptEngine.java
+++ b/script/common/src/main/java/org/forgerock/script/engine/AbstractScriptEngine.java
@@ -164,6 +164,7 @@ public void setErrorWriter(Writer writer) {
     // }
 
     /** {@inheritDoc} */
+    @Override
     public Object compileObject(final Context context, Object value) {
         // JsonValue temp = new JsonValue(value);
         // temp.getTransformers().add(getOperationParameter(context));
diff --git a/script/common/src/main/java/org/forgerock/script/registry/ScriptRegistryImpl.java b/script/common/src/main/java/org/forgerock/script/registry/ScriptRegistryImpl.java
index c2112884f8..32b2689f6a 100644
--- a/script/common/src/main/java/org/forgerock/script/registry/ScriptRegistryImpl.java
+++ b/script/common/src/main/java/org/forgerock/script/registry/ScriptRegistryImpl.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.registry;
@@ -185,6 +186,7 @@ public Bindings createBindings() {
 
     // ScriptRegistry Methods
 
+    @Override
     public Set<ScriptName> listScripts() {
         return Collections.unmodifiableSet(cache.keySet());
     }
@@ -193,10 +195,12 @@ public ScriptEntry takeScript(String name) throws ScriptException {
         return takeScript(new ScriptName(name, SourceUnit.AUTO_DETECT));
     }
 
+    @Override
     public ScriptEngine getEngineByName(String shortName) {
         return findScriptEngine(shortName);
     }
 
+    @Override
     public ScriptEntry takeScript(JsonValue script) throws ScriptException {
         if (null == script || script.expect(Map.class).isNull()) {
             throw new NullPointerException("Null scriptValue");
@@ -248,6 +252,7 @@ public ScriptEntry takeScript(JsonValue script) throws ScriptException {
         return scriptEntry;
     }
 
+    @Override
     public synchronized ScriptEntry takeScript(ScriptName name) throws ScriptException {
         LibraryRecord rec = cache.get(name);
         if (null != rec) {
@@ -427,14 +432,17 @@ private void notifyListeners(int type) {
 
         // START CompilationHandler
 
+        @Override
         public ScriptSource getScriptSource() {
             return source;
         }
 
+        @Override
         public ClassLoader getParentClassLoader() {
             return ScriptRegistryImpl.this.getRegistryLevelScriptClassLoader();
         }
 
+        @Override
         public void setCompiledScript(CompiledScript script) {
             int type = null != target ? ScriptEvent.MODIFIED : ScriptEvent.REGISTERED;
             target = script;
@@ -442,6 +450,7 @@ public void setCompiledScript(CompiledScript script) {
             notifyListeners(type);
         }
 
+        @Override
         public void handleException(Exception exception) {
             try {
                 if (null != target) {
@@ -455,6 +464,7 @@ public void handleException(Exception exception) {
             logger.error("Script compilation exception: {}", source.getName().getName(), exception);
         }
 
+        @Override
         public void setClassLoader(ClassLoader classLoader) {
             this.scriptClassLoader = classLoader;
         }
@@ -493,6 +503,7 @@ private ClassLoader getRuntimeClassLoader() {
             return Thread.currentThread().getContextClassLoader();
         }
 
+        @Override
         public Object invoke(Object proxy, Method method, Object[] arguments) throws Throwable {
             // do not proxy equals, hashCode, toString
             if (method.getDeclaringClass() == Object.class) {
@@ -521,14 +532,17 @@ private ServiceScript(final CompiledScript target) {
                 this.targetProxy = target;
             }
 
+            @Override
             public void addScriptListener(ScriptListener o) {
                 LibraryRecord.this.addScriptListener(o);
             }
 
+            @Override
             public void deleteScriptListener(ScriptListener o) {
                 LibraryRecord.this.deleteScriptListener(o);
             }
 
+            @Override
             public Bindings getScriptBindings(Context context, Bindings request) {
                 if (null == context) {
                     throw new NullPointerException();
@@ -541,6 +555,7 @@ public Bindings getScriptBindings(Context context, Bindings request) {
                         ScriptRegistryImpl.this.globalScope.get());
             }
 
+            @Override
             public Script getScript(final Context context) {
                 if (null == context) {
                     throw new NullPointerException();
@@ -560,30 +575,36 @@ public Script getScript(final Context context) {
                     // return engine;
                     // }
 
+                    @Override
                     protected Bindings getGlobalBindings() {
                         return ScriptRegistryImpl.this.globalScope.get();
                     }
 
+                    @Override
                     protected Bindings getServiceBindings() {
                         return ServiceScript.this.getBindings();
                     }
                 };
             }
 
+            @Override
             public ScriptName getName() {
                 return scriptName;
             }
 
+            @Override
             public Visibility getVisibility() {
                 return null != source ? source.getVisibility() : Visibility.DEFAULT;
             }
 
+            @Override
             public boolean isActive() {
                 return target != null;
             }
         }
     }
 
+    @Override
     public void addScriptListener(ScriptName name, ScriptListener hook) {
         if (null != hook && null != name) {
             LibraryRecord record = cache.get(name);
@@ -598,6 +619,7 @@ record = newRecord;
         }
     }
 
+    @Override
     public void deleteScriptListener(ScriptName name, ScriptListener hook) {
         if (null != hook && null != name) {
             LibraryRecord record = cache.get(name);
@@ -627,6 +649,7 @@ private ScriptSource findScriptSource(ScriptName name) {
     }
 
     // ScriptEngineFactoryObserver
+    @Override
     public void addingEntries(ScriptEngineFactory factory) throws ScriptException {
         engineFactories.add(factory);
         for (LibraryRecord cacheRecord : cache.values()) {
@@ -639,6 +662,7 @@ public void addingEntries(ScriptEngineFactory factory) throws ScriptException {
         }
     }
 
+    @Override
     public void removingEntries(ScriptEngineFactory factory) throws ScriptException {
         engineFactories.remove(factory);
         engines.remove(factory);
@@ -653,6 +677,7 @@ public void removingEntries(ScriptEngineFactory factory) throws ScriptException
     }
 
     // SourceUnitObserver
+    @Override
     public void addSourceUnit(SourceUnit unit) throws ScriptException {
         try {
             if (unit instanceof ScriptSource) {
@@ -694,6 +719,7 @@ public void addSourceUnit(SourceUnit unit) throws ScriptException {
         }
     }
 
+    @Override
     public void removeSourceUnit(SourceUnit unit) throws ScriptException {
         if (unit instanceof ScriptSource) {
             LibraryRecord cacheRecord = cache.get(unit.getName());
@@ -729,6 +755,7 @@ abstract static class ScriptImpl extends ScopeHolder implements Script {
             this.context = new ScriptContext(context, scriptName.getName(), scriptName.getType(), scriptName.getRevision());
         }
 
+        @Override
         public void putSafe(String key, Object value) {
             if (null == safeBinding) {
                 safeBinding = new SimpleBindings();
@@ -736,6 +763,7 @@ public void putSafe(String key, Object value) {
             safeBinding.put(key, value);
         }
 
+        @Override
         public Object eval(final Bindings bindings) throws ScriptException {
             try {
                 return target.eval(context, bindings, safeBinding, getServiceBindings(),
@@ -748,6 +776,7 @@ public Object eval(final Bindings bindings) throws ScriptException {
             }
         }
 
+        @Override
         public Object eval() throws ScriptException {
             return eval(getBindings());
         }
@@ -762,6 +791,7 @@ abstract static class ScopeHolder implements Scope {
 
         private Bindings bindings = null;
 
+        @Override
         public void put(String key, Object value) {
             if (null == bindings) {
                 bindings = createBindings();
@@ -769,6 +799,7 @@ public void put(String key, Object value) {
             bindings.put(key, value);
         }
 
+        @Override
         public Object get(String key) {
             if (getBindings() != null) {
                 return getBindings().get(key);
@@ -776,18 +807,22 @@ public Object get(String key) {
             return null;
         }
 
+        @Override
         public Bindings getBindings() {
             return bindings;
         }
 
+        @Override
         public void setBindings(Bindings bindings) {
             this.bindings = bindings;
         }
 
+        @Override
         public Bindings createBindings() {
             return new SimpleBindings();
         }
 
+        @Override
         public void flush() {
             setBindings(null);
         }
diff --git a/script/common/src/main/java/org/forgerock/script/registry/ThreadClassLoaderManager.java b/script/common/src/main/java/org/forgerock/script/registry/ThreadClassLoaderManager.java
index e58059b41e..4709a12aef 100644
--- a/script/common/src/main/java/org/forgerock/script/registry/ThreadClassLoaderManager.java
+++ b/script/common/src/main/java/org/forgerock/script/registry/ThreadClassLoaderManager.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.registry;
@@ -36,6 +37,7 @@ public final class ThreadClassLoaderManager {
 
     private static ThreadLocal<ThreadClassLoaderManager> instance =
             new ThreadLocal<ThreadClassLoaderManager>() {
+                @Override
                 public ThreadClassLoaderManager initialValue() {
                     return new ThreadClassLoaderManager();
                 }
diff --git a/script/common/src/main/java/org/forgerock/script/scope/OperationParameter.java b/script/common/src/main/java/org/forgerock/script/scope/OperationParameter.java
index 909ab724b8..8b7ee4c212 100644
--- a/script/common/src/main/java/org/forgerock/script/scope/OperationParameter.java
+++ b/script/common/src/main/java/org/forgerock/script/scope/OperationParameter.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.scope;
@@ -49,6 +50,7 @@ public OperationParameter(final Context context) {
      *             If the connection could not be obtained for some other reason
      *             (e.g. due to a configuration or initialization problem).
      */
+    @Override
     public Context getContext(Context savedContext) throws ResourceException {
 
         if (null != savedContext) {
diff --git a/script/common/src/main/java/org/forgerock/script/source/BundleContainer.java b/script/common/src/main/java/org/forgerock/script/source/BundleContainer.java
index 60d5e164e8..6084484e37 100644
--- a/script/common/src/main/java/org/forgerock/script/source/BundleContainer.java
+++ b/script/common/src/main/java/org/forgerock/script/source/BundleContainer.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.source;
@@ -52,6 +53,7 @@ public BundleContainer(String unitName, Bundle bundle) throws URISyntaxException
         this.sourceURI = source.toURI();
     }
 
+    @Override
     public ScriptSource findScriptSource(ScriptName name) {
         URL source = bundle.getResource(name.getName());
         if (source != null) {
@@ -67,22 +69,27 @@ public ScriptSource findScriptSource(ScriptName name) {
         return null;
     }
 
+    @Override
     public ScriptName getName() {
         return unitName;
     }
 
+    @Override
     public URL getSource() {
         return source;
     }
 
+    @Override
     public URI getSourceURI() {
         return sourceURI;
     }
 
+    @Override
     public ScriptEntry.Visibility getVisibility() {
         return visibility;
     }
 
+    @Override
     public SourceContainer getParentContainer() {
         return null;
     }
diff --git a/script/common/src/main/java/org/forgerock/script/source/DirectoryContainer.java b/script/common/src/main/java/org/forgerock/script/source/DirectoryContainer.java
index 35bb496102..6e954168c9 100644
--- a/script/common/src/main/java/org/forgerock/script/source/DirectoryContainer.java
+++ b/script/common/src/main/java/org/forgerock/script/source/DirectoryContainer.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.source;
@@ -65,6 +66,7 @@ public DirectoryContainer(String name, URL context) throws URISyntaxException {
         this.contextURI = context.toURI();
     }
 
+    @Override
     public ScriptSource findScriptSource(ScriptName name) {
         URL sourceURL = getSourceFile(name.getName(), null);
         if (null == sourceURL) {
@@ -88,16 +90,19 @@ public ScriptSource findScriptSource(ScriptName name) {
         return null;
     }
 
+    @Override
     public ScriptName getName() {
         return unitName;
     }
 
+    @Override
     public ScriptEntry.Visibility getVisibility() {
         return visibility;
     }
 
     private URL getSourceFile(final String name, final String extension) {
         return AccessController.doPrivileged(new PrivilegedAction<URL>() {
+            @Override
             public URL run() {
                 try {
                     String filename =
@@ -184,6 +189,7 @@ private String decodeFileName(String fileName) {
         return decodedFile;
     }
 
+    @Override
     public void setScriptEngineFactory(final Iterable<ScriptEngineFactory> factory) {
         this.factories = factory;
     }
@@ -203,14 +209,17 @@ private static URL[] createRoots(String[] urls) throws MalformedURLException {
         return roots;
     }
 
+    @Override
     public URL getSource() {
         return context;
     }
 
+    @Override
     public URI getSourceURI() {
         return contextURI;
     }
 
+    @Override
     public SourceContainer getParentContainer() {
         return null;
     }
diff --git a/script/common/src/main/java/org/forgerock/script/source/EmbeddedScriptSource.java b/script/common/src/main/java/org/forgerock/script/source/EmbeddedScriptSource.java
index c7d0ed9c62..a7c829c68e 100644
--- a/script/common/src/main/java/org/forgerock/script/source/EmbeddedScriptSource.java
+++ b/script/common/src/main/java/org/forgerock/script/source/EmbeddedScriptSource.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.source;
@@ -57,36 +58,44 @@ public EmbeddedScriptSource(ScriptEntry.Visibility visibility, String source,
                 scriptName.getName(), scriptName.getType(), scriptName.getRevision(), scriptName.getRequestBinding());
     }
 
+    @Override
     public String guessType() {
         return scriptName.getType();
     }
 
+    @Override
     public URL getSource() {
         // TODO Cache the source and get that URL. The cache should be centralised.
         return null;
     }
 
+    @Override
     public URI getSourceURI() {
         // TODO Cache the source and get that URL. The cache should be centralised.
         return null;
     }
 
+    @Override
     public Reader getReader() throws IOException {
         return new StringReader(source);
     }
 
+    @Override
     public ScriptName getName() {
         return scriptName;
     }
 
+    @Override
     public ScriptEntry.Visibility getVisibility() {
         return visibility;
     }
 
+    @Override
     public ScriptName[] getDependencies() {
         return new ScriptName[0];
     }
 
+    @Override
     public SourceContainer getParentContainer() {
         return null;
     }
diff --git a/script/common/src/main/java/org/forgerock/script/source/URLScriptSource.java b/script/common/src/main/java/org/forgerock/script/source/URLScriptSource.java
index 83e1e764a2..f438ad1f8a 100644
--- a/script/common/src/main/java/org/forgerock/script/source/URLScriptSource.java
+++ b/script/common/src/main/java/org/forgerock/script/source/URLScriptSource.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.source;
@@ -80,26 +81,32 @@ public URLScriptSource(ScriptEntry.Visibility visibility, URL source, ScriptName
         this.parent = parent;
     }
 
+    @Override
     public String guessType() {
         return getName().getType();
     }
 
+    @Override
     public ScriptName getName() {
         return scriptName;
     }
 
+    @Override
     public URL getSource() {
         return source;
     }
 
+    @Override
     public URI getSourceURI() {
         return sourceURI;
     }
 
+    @Override
     public Reader getReader() throws IOException {
         // TODO Do we need the doPrivileged read?
         try {
             return AccessController.doPrivileged(new PrivilegedExceptionAction<Reader>() {
+                @Override
                 public Reader run() throws Exception {
                     return new BufferedReader(new InputStreamReader(getSource().openStream()));
                 }
@@ -109,14 +116,17 @@ public Reader run() throws Exception {
         }
     }
 
+    @Override
     public ScriptEntry.Visibility getVisibility() {
         return null != parent ? parent.getVisibility() : visibility;
     }
 
+    @Override
     public ScriptName[] getDependencies() {
         return null != parent ? new ScriptName[] { parent.getName() } : new ScriptName[0];
     }
 
+    @Override
     public SourceContainer getParentContainer() {
         return parent;
     }
diff --git a/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScript.java b/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScript.java
index a90b136ab6..628e1623cd 100644
--- a/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScript.java
+++ b/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScript.java
@@ -36,6 +36,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 Copyrighted 2026 3A Systems, LLC
  */
 
 /**
@@ -105,12 +106,14 @@ public GroovyScript(String scriptName, final GroovyScriptEngineImpl groovyEngine
         engine.createScript(scriptName, new Binding());
     }
 
+    @Override
     public Bindings prepareBindings(final Context context, final Bindings request,
             final Bindings... scopes) {
         final Map<String, Object> b = mergeBindings(context, request, scopes);
         return b instanceof Bindings ? (Bindings) b : new SimpleBindings(b);
     }
 
+    @Override
     public Object eval(final Context context, final Bindings request, final Bindings... scopes)
             throws ScriptException {
 
@@ -308,18 +311,22 @@ public InnerMapFactory(final Map<String, Object> source, final Parameter paramet
             this.parameter = parameter;
         }
 
+        @Override
         protected Factory<List<Object>> newListFactory(final List<Object> source) {
             return new InnerListFactory(source, parameter);
         }
 
+        @Override
         protected Factory<Map<String, Object>> newMapFactory(final Map<String, Object> source) {
             return new InnerMapFactory(source, parameter);
         }
 
+        @Override
         protected Object convertFunction(final Function<?> source) {
             return new FunctionClosure(null, parameter, source);
         }
 
+        @Override
         public Parameter getParameter() {
             return parameter;
         }
@@ -334,18 +341,22 @@ public InnerListFactory(final List<Object> source, final Parameter parameter) {
             this.parameter = parameter;
         }
 
+        @Override
         protected Factory<List<Object>> newListFactory(final List<Object> source) {
             return new InnerListFactory(source, parameter);
         }
 
+        @Override
         protected Factory<Map<String, Object>> newMapFactory(final Map<String, Object> source) {
             return new InnerMapFactory(source, parameter);
         }
 
+        @Override
         protected Object convertFunction(final Function<?> source) {
             return new FunctionClosure(null, parameter, source);
         }
 
+        @Override
         public Parameter getParameter() {
             return parameter;
         }
diff --git a/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineFactory.java b/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineFactory.java
index 3b885afc96..5603a89a99 100644
--- a/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineFactory.java
+++ b/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineFactory.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.groovy;
@@ -65,34 +66,42 @@ public class GroovyScriptEngineFactory implements ScriptEngineFactory {
         extensions = Collections.unmodifiableList(extensions);
     }
 
+    @Override
     public String getEngineName() {
         return "Groovy Scripting Engine";
     }
 
+    @Override
     public String getEngineVersion() {
         return "2.0";
     }
 
+    @Override
     public List<String> getExtensions() {
         return extensions;
     }
 
+    @Override
     public List<String> getMimeTypes() {
         return mimeTypes;
     }
 
+    @Override
     public List<String> getNames() {
         return names;
     }
 
+    @Override
     public String getLanguageName() {
         return LANGUAGE_NAME;
     }
 
+    @Override
     public String getLanguageVersion() {
         return GroovySystem.getVersion();
     }
 
+    @Override
     public ScriptEngine getScriptEngine(Map<String, Object> configuration, Collection<SourceContainer> sourceContainers,
             ClassLoader registryLevelClassLoader) {
         if (null == engine) {
diff --git a/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineImpl.java b/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineImpl.java
index cb6f93705d..58ea79800c 100644
--- a/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineImpl.java
+++ b/script/groovy/src/main/java/org/forgerock/script/groovy/GroovyScriptEngineImpl.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.groovy;
@@ -175,6 +176,7 @@ static ImportCustomizer getImportCustomizer(ImportCustomizer parent) {
         return ic;
     }
 
+    @Override
     public void compileScript(CompilationHandler handler) throws ScriptException {
         try {
             handler.setClassLoader(groovyScriptEngine.getGroovyClassLoader());
@@ -212,6 +214,7 @@ public void compileScript(CompilationHandler handler) throws ScriptException {
         }
     }
 
+    @Override
     public ScriptEngineFactory getFactory() {
         return factory;
     }
@@ -233,6 +236,7 @@ private ClassLoader getParentLoader() {
         return Script.class.getClassLoader();
     }
 
+    @Override
     public Bindings compileBindings(Context context, Bindings request, Bindings... value) {
         return null;
     }
diff --git a/script/groovy/src/main/java/org/forgerock/script/groovy/internal/Activator.java b/script/groovy/src/main/java/org/forgerock/script/groovy/internal/Activator.java
index db948f8e97..a7a9aaf6af 100644
--- a/script/groovy/src/main/java/org/forgerock/script/groovy/internal/Activator.java
+++ b/script/groovy/src/main/java/org/forgerock/script/groovy/internal/Activator.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.groovy.internal;
@@ -53,6 +54,7 @@ public class Activator implements BundleActivator, ServiceFactory<ScriptEngineFa
     private static final ConcurrentMap<Bundle, ScriptEngineFactory> REGISTRY =
             new ConcurrentHashMap<Bundle, ScriptEngineFactory>();
 
+    @Override
     public void start(BundleContext context) throws Exception {
         Dictionary<String, Object> properties = new Hashtable<String, Object>(2);
 
@@ -65,6 +67,7 @@ public void start(BundleContext context) throws Exception {
 
     }
 
+    @Override
     public void stop(BundleContext context) throws Exception {
         if (null != serviceRegistration) {
             serviceRegistration.unregister();
@@ -72,6 +75,7 @@ public void stop(BundleContext context) throws Exception {
         }
     }
 
+    @Override
     public ScriptEngineFactory getService(Bundle bundle,
             ServiceRegistration<ScriptEngineFactory> registration) {
         ScriptEngineFactory factory = new GroovyScriptEngineFactory();
@@ -82,6 +86,7 @@ public ScriptEngineFactory getService(Bundle bundle,
         return result;
     }
 
+    @Override
     public void ungetService(Bundle bundle, ServiceRegistration<ScriptEngineFactory> registration,
             ScriptEngineFactory service) {
         REGISTRY.remove(bundle);
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/AbstractScriptableRequest.java b/script/javascript/src/main/java/org/forgerock/script/javascript/AbstractScriptableRequest.java
index b547cb59a1..7e9fe2a25d 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/AbstractScriptableRequest.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/AbstractScriptableRequest.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.javascript;
@@ -146,6 +147,7 @@ public Object unwrap() {
         return request;
     }
 
+    @Override
     public String toString() {
         if (request == null) {
             return "null";
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/Converter.java b/script/javascript/src/main/java/org/forgerock/script/javascript/Converter.java
index 85b3677bd1..1d44780cde 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/Converter.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/Converter.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.javascript;
@@ -301,18 +302,22 @@ public CopyListFactory(final Parameter parameter, final List<Object> source) {
             this.parameter = parameter;
         }
 
+        @Override
         public Parameter getParameter() {
             return parameter;
         }
 
+        @Override
         protected Factory<List<Object>> newListFactory(final List<Object> source) {
             return Converter.getList(parameter, source);
         }
 
+        @Override
         protected Factory<Map<String, Object>> newMapFactory(final Map<String, Object> source) {
             return Converter.getMap(parameter, source);
         }
 
+        @Override
         protected Object convertFunction(final Function<?> source) {
             return source;
         }
@@ -327,18 +332,22 @@ public CopyMapFactory(final Parameter parameter, final Map<String, Object> sourc
             this.parameter = parameter;
         }
 
+        @Override
         public Parameter getParameter() {
             return parameter;
         }
 
+        @Override
         protected Factory<List<Object>> newListFactory(final List<Object> source) {
             return Converter.getList(parameter, source);
         }
 
+        @Override
         protected Factory<Map<String, Object>> newMapFactory(final Map<String, Object> source) {
             return Converter.getMap(parameter, source);
         }
 
+        @Override
         protected Object convertFunction(final Function<?> source) {
             return source;
         }
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScript.java b/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScript.java
index 3411a1f68a..f14a531c82 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScript.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScript.java
@@ -18,6 +18,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Copyright 2012-2016 ForgeRock AS.
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.javascript;
@@ -108,6 +109,7 @@ public class RhinoScript implements CompiledScript {
      * Proxy class to avoid proliferation of anonymous classes.
      */
     private static class IProxy implements QuitAction {
+        @Override
         public void quit(Context cx, int exitCode) {
             /* no quit :) */
         }
@@ -224,6 +226,7 @@ private String trimPath(String name) {
         return name.indexOf("/") != -1 ? name.substring(name.lastIndexOf("/") + 1) : name;
     }
 
+    @Override
     public Bindings prepareBindings(org.forgerock.services.context.Context context, Bindings request, Bindings... scopes) {
         // TODO Fix it later
         return new SimpleBindings();
@@ -337,6 +340,7 @@ public InnerClassLoader(ClassLoader parent) {
             super(parent);
         }
 
+        @Override
         public Class<?> loadClass(String name) throws ClassNotFoundException {
             // First check whether it's already been loaded, if so use it
             Class loadedClass = Kit.classOrNull(getParent(), name);
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngine.java b/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngine.java
index c4a0cd1ab6..b678ab99ed 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngine.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngine.java
@@ -18,7 +18,7 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * Copyright 2012-2016 ForgeRock AS.
- * Portions Copyrighted 2018-2025 3A Systems, LLC
+ * Portions Copyrighted 2018-2026 3A Systems, LLC
  */
 
 package org.forgerock.script.javascript;
@@ -204,6 +204,7 @@ Script createScript(String scriptName) throws ScriptException {
         throw new ScriptException("Script is not found:" + scriptName);
     }
 
+    @Override
     public void compileScript(CompilationHandler handler) throws ScriptException {
         try {
             boolean sharedScope = true;// config.get("sharedScope").defaultTo(true).asBoolean();
@@ -257,6 +258,7 @@ private Script compileScript(String name, Reader scriptReader) throws ScriptComp
         }
     }
 
+    @Override
     public ScriptEngineFactory getFactory() {
         return factory;
     }
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngineFactory.java b/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngineFactory.java
index 31bdf92e1b..1e32a6cd8d 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngineFactory.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/RhinoScriptEngineFactory.java
@@ -21,6 +21,7 @@
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 * or visit www.oracle.com if you need additional information or have any
 * questions.
+* Portions Copyrighted 2026 3A Systems, LLC
 */
 
 /*
@@ -78,34 +79,42 @@ public class RhinoScriptEngineFactory implements ScriptEngineFactory {
         extensions = Collections.unmodifiableList(extensions);
     }
 
+    @Override
     public String getEngineName() {
         return "javascript";
     }
 
+    @Override
     public String getEngineVersion() {
         return VERSION;
     }
 
+    @Override
     public List<String> getExtensions() {
         return extensions;
     }
 
+    @Override
     public List<String> getMimeTypes() {
         return mimeTypes;
     }
 
+    @Override
     public List<String> getNames() {
         return names;
     }
 
+    @Override
     public String getLanguageName() {
         return LANGUAGE_NAME;
     }
 
+    @Override
     public String getLanguageVersion() {
         return "1.8";
     }
 
+    @Override
     public ScriptEngine getScriptEngine(
             final Map<String, Object> configuration,
             final Collection<SourceContainer> sourceContainers,
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/SLF4JErrorReporter.java b/script/javascript/src/main/java/org/forgerock/script/javascript/SLF4JErrorReporter.java
index 9091a6e5c1..c6e3bba4f7 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/SLF4JErrorReporter.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/SLF4JErrorReporter.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.javascript;
@@ -47,6 +48,7 @@ public SLF4JErrorReporter(ErrorReporter chainedReporter) {
         this.chainedReporter = chainedReporter;
     }
 
+    @Override
     public void warning(String message, String sourceName, int line, String lineSource,
             int lineOffset) {
         logger.warn("", new Object[] { message, sourceName, line, lineSource, lineOffset });
@@ -55,6 +57,7 @@ public void warning(String message, String sourceName, int line, String lineSour
         }
     }
 
+    @Override
     public void error(String message, String sourceName, int line, String lineSource, int lineOffset) {
         logger.error("", new Object[] { message, sourceName, line, lineSource, lineOffset });
         if (chainedReporter != null) {
@@ -64,6 +67,7 @@ public void error(String message, String sourceName, int line, String lineSource
         }
     }
 
+    @Override
     public EvaluatorException runtimeError(String message, String sourceName, int line,
             String lineSource, int lineOffset) {
         if (chainedReporter != null) {
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableContext.java b/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableContext.java
index eadbd71cbd..5fea08931f 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableContext.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableContext.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.javascript;
@@ -216,6 +217,7 @@ public Object unwrap() {
         return getWrappedContext();
     }
 
+    @Override
     public String toString() {
         final JsonValue allContexts = new JsonValue(new HashMap<String,Object>(contexts.size()));
         for (final Map.Entry<String,Context> entry : contexts.entrySet()) {
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableMap.java b/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableMap.java
index 2f87cf5144..1c5e28d70b 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableMap.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/ScriptableMap.java
@@ -20,6 +20,7 @@
  * with the fields enclosed by brackets [] replaced by
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
+ * Portions Copyrighted 2026 3A Systems, LLC
  */
 
 package org.forgerock.script.javascript;
@@ -162,6 +163,7 @@ public Object unwrap() {
         return map;
     }
 
+    @Override
     public String toString() {
         return map == null ? "null" : new JsonValue(map).toString();
     }
diff --git a/script/javascript/src/main/java/org/forgerock/script/javascript/internal/Activator.java b/script/javascript/src/main/java/org/forgerock/script/javascript/internal/Activator.java
index 03c98fb9c9..3b713abd67 100644
--- a/script/javascript/src/main/java/org/forgerock/script/javascript/internal/Activator.java
+++ b/script/javascript/src/main/java/org/forgerock/script/javascript/internal/Activator.java
@@ -1,3 +1,29 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2013 ForgeRock AS. All Rights Reserved
+ *
+ * The contents of this file are subject to the terms
+ * of the Common Development and Distribution License
+ * (the License). You may not use this file except in
+ * compliance with the License.
+ *
+ * You can obtain a copy of the License at
+ * http://forgerock.org/license/CDDLv1.0.html
+ * See the License for the specific language governing
+ * permission and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL
+ * Header Notice in each file and include the License file
+ * at http://forgerock.org/license/CDDLv1.0.html
+ * If applicable, add the following below the CDDL Header,
+ * with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Portions Copyrighted 2026 3A Systems, LLC
+ */
+
 package org.forgerock.script.javascript.internal;
 
 import java.util.Dictionary;
@@ -29,6 +55,7 @@ public class Activator implements BundleActivator, ServiceFactory<ScriptEngineFa
     private static final ConcurrentMap<Bundle, ScriptEngineFactory> REGISTRY =
             new ConcurrentHashMap<Bundle, ScriptEngineFactory>();
 
+    @Override
     public void start(BundleContext context) throws Exception {
         Dictionary<String, Object> properties = new Hashtable<String, Object>();
 
@@ -41,6 +68,7 @@ public void start(BundleContext context) throws Exception {
 
     }
 
+    @Override
     public void stop(BundleContext context) throws Exception {
         if (null != serviceRegistration) {
             serviceRegistration.unregister();
@@ -48,6 +76,7 @@ public void stop(BundleContext context) throws Exception {
         }
     }
 
+    @Override
     public ScriptEngineFactory getService(Bundle bundle,
             ServiceRegistration<ScriptEngineFactory> registration) {
         ScriptEngineFactory factory = new RhinoScriptEngineFactory();
@@ -58,6 +87,7 @@ public ScriptEngineFactory getService(Bundle bundle,
         return result;
     }
 
+    @Override
     public void ungetService(Bundle bundle, ServiceRegistration<ScriptEngineFactory> registration,
             ScriptEngineFactory service) {
         REGISTRY.remove(bundle);