diff --git a/legal/THIRDPARTYREADME.txt b/legal/THIRDPARTYREADME.txt index 881ac3901e..fb43aae5b1 100644 --- a/legal/THIRDPARTYREADME.txt +++ b/legal/THIRDPARTYREADME.txt @@ -71,10 +71,7 @@ Copyright: Copyright 2002-2014 The Apache Software Foundation Version: commons-io-2.3.jar Copyright: Copyright 2002-2012 The Apache Software Foundation -Version: commons-lang-2.6.jar -Copyright: Copyright 2001-2008 The Apache Software Foundation - -Version: commons-lang3-3.4.jar +Version: commons-lang3-3.18.jar Copyright: Copyright 2001-2015 The Apache Software Foundation Version: commons-logging-1.1.3.jar diff --git a/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAP.java b/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAP.java index 0c08e64fa2..58efa152ba 100644 --- a/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAP.java +++ b/openam-authentication/openam-auth-ldap/src/main/java/com/sun/identity/authentication/modules/ldap/LDAP.java @@ -26,7 +26,7 @@ * * Portions Copyrighted 2010-2016 ForgeRock AS. * Portions Copyrighted 2019 Open Source Solution Technology Corporation - * Portions Copyrighted 2024 3A Systems LLC + * Portions Copyrighted 2024-2025 3A Systems LLC */ package com.sun.identity.authentication.modules.ldap; @@ -57,7 +57,7 @@ import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.ldap.LDAPAuthUtils; import org.forgerock.openam.ldap.LDAPUtilException; import org.forgerock.openam.ldap.ModuleState; diff --git a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth.java b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth.java index e7b9dea14e..0eaeb24dd3 100644 --- a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth.java +++ b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/OAuth.java @@ -23,6 +23,7 @@  * "Portions Copyrighted [year] [name of copyright owner]" * * Portions Copyrighted 2015 Nomura Research Institute, Ltd. + * Portions Copyrighted 2018-2025 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.oauth2; @@ -51,8 +52,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.guice.core.InjectorHolder; import org.forgerock.json.jose.jwt.JwtClaimsSet; import org.forgerock.openam.authentication.modules.common.mapping.AccountProvider; diff --git a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ESIAProfileProvider.java b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ESIAProfileProvider.java index 9639ec3c73..55e9ab6e4c 100644 --- a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ESIAProfileProvider.java +++ b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ESIAProfileProvider.java @@ -7,7 +7,7 @@ import javax.security.auth.login.LoginException; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.authentication.modules.oauth2.HttpRequestContent; import org.forgerock.openam.authentication.modules.oauth2.OAuthConf; import org.forgerock.openam.authentication.modules.oauth2.OAuthUtil; diff --git a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ProfileProviderFactory.java b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ProfileProviderFactory.java index 671d9a3c4c..c8267998d2 100644 --- a/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ProfileProviderFactory.java +++ b/openam-authentication/openam-auth-oauth2/src/main/java/org/forgerock/openam/authentication/modules/oauth2/profile/ProfileProviderFactory.java @@ -11,12 +11,12 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2018-2024 3A Systems LLC. + * Copyright 2018-2025 3A Systems LLC. */ package org.forgerock.openam.authentication.modules.oauth2.profile; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.authentication.modules.oauth2.OAuthConf; public class ProfileProviderFactory { diff --git a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java index 1b7a3565b1..de6ceacb75 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java +++ b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModule.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2018-2025 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.persistentcookie; @@ -30,7 +31,7 @@ import javax.security.auth.login.LoginException; import javax.security.auth.message.MessageInfo; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.caf.authentication.framework.AuthenticationFramework; import org.forgerock.jaspi.modules.session.jwt.JwtSessionModule; import org.forgerock.json.jose.jwt.Jwt; diff --git a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java index 111e18d311..95f1228bdb 100644 --- a/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java +++ b/openam-authentication/openam-auth-persistentcookie/src/main/java/org/forgerock/openam/authentication/modules/persistentcookie/PersistentCookieAuthModulePostAuthenticationPlugin.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2018-2025 3A Systems, LLC. */ package org.forgerock.openam.authentication.modules.persistentcookie; @@ -31,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.jaspi.modules.session.jwt.JwtSessionModule; import org.forgerock.openam.authentication.modules.common.JaspiAuthLoginModulePostAuthenticationPlugin; import org.forgerock.openam.utils.ClientUtils; diff --git a/openam-authentication/openam-auth-recaptcha/src/main/java/org/openidentityplatform/openam/authentication/modules/recaptcha/ReCaptcha.java b/openam-authentication/openam-auth-recaptcha/src/main/java/org/openidentityplatform/openam/authentication/modules/recaptcha/ReCaptcha.java index eaf1252c51..40960af016 100644 --- a/openam-authentication/openam-auth-recaptcha/src/main/java/org/openidentityplatform/openam/authentication/modules/recaptcha/ReCaptcha.java +++ b/openam-authentication/openam-auth-recaptcha/src/main/java/org/openidentityplatform/openam/authentication/modules/recaptcha/ReCaptcha.java @@ -1,3 +1,19 @@ +/* + * 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 copyright [year] [name of copyright owner]". + * + * Copyright 2018-2025 3A Systems LLC. + */ + package org.openidentityplatform.openam.authentication.modules.recaptcha; import java.lang.reflect.Field; @@ -13,7 +29,7 @@ import javax.security.auth.callback.TextOutputCallback; import javax.security.auth.login.LoginException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.net.util.SubnetUtils; import org.apache.http.NameValuePair; import org.apache.http.client.config.RequestConfig; diff --git a/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthentication.java b/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthentication.java index 99f98f31bd..291ee13d6a 100644 --- a/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthentication.java +++ b/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthentication.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyrighted [year] [name of copyright owner]". * - * Copyright 2024 3A-Systems LLC. All rights reserved. + * Copyright 2019-2025 3A-Systems LLC. All rights reserved. */ package org.openidentityplatform.openam.authentication.modules.webauthn; @@ -36,7 +36,7 @@ import com.webauthn4j.authenticator.Authenticator; import com.webauthn4j.data.PublicKeyCredentialRequestOptions; import com.webauthn4j.data.attestation.authenticator.AuthenticatorData; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; diff --git a/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationProcessor.java b/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationProcessor.java index 76c389a334..b26b9cc213 100644 --- a/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationProcessor.java +++ b/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnAuthenticationProcessor.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyrighted [year] [name of copyright owner]". * - * Copyright 2024 3A-Systems LLC. All rights reserved. + * Copyright 2019-2025 3A-Systems LLC. All rights reserved. */ package org.openidentityplatform.openam.authentication.modules.webauthn; @@ -32,7 +32,7 @@ import com.webauthn4j.data.client.challenge.DefaultChallenge; import com.webauthn4j.server.ServerProperty; import com.webauthn4j.validator.exception.ValidationException; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistration.java b/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistration.java index de4611b378..7850e5ee56 100644 --- a/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistration.java +++ b/openam-authentication/openam-auth-webauthn/src/main/java/org/openidentityplatform/openam/authentication/modules/webauthn/WebAuthnRegistration.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyrighted [year] [name of copyright owner]". * - * Copyright 2024 3A-Systems LLC. All rights reserved. + * Copyright 2019-2025 3A-Systems LLC. All rights reserved. */ package org.openidentityplatform.openam.authentication.modules.webauthn; @@ -39,8 +39,8 @@ import com.webauthn4j.data.AttestationConveyancePreference; import com.webauthn4j.data.AuthenticatorAttachment; import com.webauthn4j.data.PublicKeyCredentialCreationOptions; -import org.apache.commons.lang.SerializationUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.SerializationUtils; +import org.apache.commons.lang3.StringUtils; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; diff --git a/openam-authentication/openam-auth-windowsdesktopsso/src/test/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOTest.java b/openam-authentication/openam-auth-windowsdesktopsso/src/test/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOTest.java index bf72c40e15..8e148c53af 100644 --- a/openam-authentication/openam-auth-windowsdesktopsso/src/test/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOTest.java +++ b/openam-authentication/openam-auth-windowsdesktopsso/src/test/java/com/sun/identity/authentication/modules/windowsdesktopsso/WindowsDesktopSSOTest.java @@ -1,9 +1,25 @@ +/* + * 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 copyright [year] [name of copyright owner]". + * + * Copyright 2022-2025 3A Systems LLC. + */ + package com.sun.identity.authentication.modules.windowsdesktopsso; import com.iplanet.am.util.SystemProperties; import com.sun.identity.authentication.service.AuthD; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.reflect.FieldUtils; +import org.apache.commons.lang3.reflect.FieldUtils; import org.forgerock.guice.core.InjectorHolder; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PowerMockIgnore; diff --git a/openam-cassandra/openam-cassandra-cts/src/main/java/org/openidentityplatform/openam/cassandra/QueryBuilder.java b/openam-cassandra/openam-cassandra-cts/src/main/java/org/openidentityplatform/openam/cassandra/QueryBuilder.java index 5a2a4f4d64..8a1680d795 100644 --- a/openam-cassandra/openam-cassandra-cts/src/main/java/org/openidentityplatform/openam/cassandra/QueryBuilder.java +++ b/openam-cassandra/openam-cassandra-cts/src/main/java/org/openidentityplatform/openam/cassandra/QueryBuilder.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Copyright 2019 Open Identity Platform Community. + * Copyright 2019-2025 3A Systems, LLC. */ package org.openidentityplatform.openam.cassandra; @@ -32,7 +32,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.continuous.ContinuousQuery; import org.forgerock.openam.cts.continuous.ContinuousQueryListener; import org.forgerock.openam.sm.datalayer.api.DataLayerConstants; diff --git a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java index bfe26d5300..5fbade5521 100644 --- a/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java +++ b/openam-certs/src/main/java/com/sun/identity/security/cert/AMCRLStore.java @@ -25,6 +25,7 @@ * $Id: AMCRLStore.java,v 1.7 2009/01/28 05:35:12 ww203982 Exp $ * * Portions Copyrighted 2013-2016 ForgeRock AS. + * Portions Copyrighted 2023-2025 3A Systems, LLC. */ package com.sun.identity.security.cert; @@ -60,7 +61,7 @@ import java.util.StringTokenizer; import javax.security.auth.x500.X500Principal; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.forgerock.i18n.LocalizedIllegalArgumentException; import org.forgerock.openam.audit.context.AuditRequestContext; import org.forgerock.openam.ldap.LDAPRequests; diff --git a/openam-console/src/main/java/com/sun/identity/console/service/ServerEditViewBeanBase.java b/openam-console/src/main/java/com/sun/identity/console/service/ServerEditViewBeanBase.java index 3d30728750..2aa36a7e28 100644 --- a/openam-console/src/main/java/com/sun/identity/console/service/ServerEditViewBeanBase.java +++ b/openam-console/src/main/java/com/sun/identity/console/service/ServerEditViewBeanBase.java @@ -25,6 +25,7 @@ * $Id: ServerEditViewBeanBase.java,v 1.3 2008/09/11 16:33:16 veiming Exp $ * * Portions Copyrighted 2011-2015 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package com.sun.identity.console.service; @@ -59,7 +60,7 @@ import com.sun.web.ui.view.html.CCPassword; import com.sun.web.ui.view.pagetitle.CCPageTitle; import com.sun.web.ui.view.tabs.CCTabs; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.utils.CollectionUtils; import java.security.AccessController; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV1.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV1.java index d13d4a3fd1..fc29eec92e 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV1.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV1.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. + * Portions Copyrighted 2022-2025 3A Systems, LLC. */ package org.forgerock.openam.core.rest; @@ -33,7 +34,7 @@ import javax.mail.MessagingException; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.forgerock.guice.core.InjectorHolder; import org.forgerock.json.JsonPointer; import org.forgerock.json.JsonValue; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV2.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV2.java index 46132eee1c..613503b2d6 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV2.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/IdentityResourceV2.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. - * Portions copyright 2023 3A Systems LLC + * Portions copyright 2023-2025 3A Systems LLC */ package org.forgerock.openam.core.rest; @@ -72,7 +72,7 @@ import com.sun.identity.sm.ServiceConfigManager; import com.sun.identity.sm.ServiceListener; import com.sun.identity.sm.ServiceNotFoundException; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.forgerock.guice.core.InjectorHolder; import org.forgerock.json.resource.PreconditionFailedException; import org.forgerock.openam.sm.config.ConsoleConfigHandler; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/AuthIdHelper.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/AuthIdHelper.java index f46d047f94..f3a7aefc95 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/AuthIdHelper.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/AuthIdHelper.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn; @@ -36,7 +37,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.forgerock.json.jose.builders.JwtBuilderFactory; import org.forgerock.json.jose.exceptions.JwtRuntimeException; import org.forgerock.json.jose.jws.JwsAlgorithm; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandler.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandler.java index 8aa9fa58f8..f21f2ad0e2 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandler.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthNameCallbackHandler.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2018-2025 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn.callbackhandlers; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonException; import org.forgerock.json.JsonValue; import org.forgerock.openam.rest.RestUtils; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandler.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandler.java index 210f09801e..67bdc76f58 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandler.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/callbackhandlers/RestAuthPasswordCallbackHandler.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn.callbackhandlers; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonException; import org.forgerock.json.JsonValue; import org.forgerock.openam.rest.RestUtils; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticator.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticator.java index 1b64bba6c5..43d431c53d 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticator.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/authn/core/LoginAuthenticator.java @@ -13,6 +13,7 @@ * * Copyright 2013-2016 ForgeRock AS. * Portions Copyrighted 2014 Nomura Research Institute, Ltd + * Portions Copyrighted 2022-2025 3A Systems, LLC. */ package org.forgerock.openam.core.rest.authn.core; @@ -25,7 +26,7 @@ import com.sun.identity.authentication.util.AMAuthUtils; import com.sun.identity.idm.IdRepoException; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.core.rest.authn.core.wrappers.AuthContextLocalWrapper; import org.forgerock.openam.core.rest.authn.core.wrappers.CoreServicesWrapper; import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModule.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModule.java index 19cbfdca7c..29a59ebe34 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModule.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/session/TokenOwnerAuthzModule.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.core.rest.session; @@ -24,7 +25,7 @@ import com.iplanet.sso.SSOToken; import com.iplanet.sso.SSOTokenManager; import com.sun.identity.shared.Constants; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.authz.filter.api.AuthorizationResult; import org.forgerock.authz.filter.crest.api.CrestAuthorizationModule; import org.forgerock.json.resource.ActionRequest; diff --git a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsJsonConverter.java b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsJsonConverter.java index 2f508dca38..2bb38c15d4 100644 --- a/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsJsonConverter.java +++ b/openam-core-rest/src/main/java/org/forgerock/openam/core/rest/sms/SmsJsonConverter.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package org.forgerock.openam.core.rest.sms; @@ -49,7 +50,7 @@ import com.sun.identity.sm.InvalidAttributeValueException; import com.sun.identity.sm.SMSException; import com.sun.identity.sm.ServiceSchema; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import org.forgerock.json.resource.BadRequestException; diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/monitoring/MonitoredOperations.java b/openam-core/src/main/java/com/iplanet/dpro/session/monitoring/MonitoredOperations.java index a5a07e5ebc..65b167eca2 100644 --- a/openam-core/src/main/java/com/iplanet/dpro/session/monitoring/MonitoredOperations.java +++ b/openam-core/src/main/java/com/iplanet/dpro/session/monitoring/MonitoredOperations.java @@ -12,12 +12,13 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2016 ForgeRock AS. +* Portions Copyrighted 2025 3A Systems, LLC. */ package com.iplanet.dpro.session.monitoring; import java.util.Collection; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.forgerock.openam.dpro.session.PartialSession; import org.forgerock.openam.utils.CrestQuery; diff --git a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionAuditor.java b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionAuditor.java index 4cfdc8a6f0..05ad35a305 100644 --- a/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionAuditor.java +++ b/openam-core/src/main/java/com/iplanet/dpro/session/service/SessionAuditor.java @@ -12,7 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. - * Portions Copyrighted 2022 Open Identity Platform Community + * Portions Copyrighted 2022-2025 3A Systems, LLC. */ package com.iplanet.dpro.session.service; @@ -30,7 +30,7 @@ import javax.inject.Inject; import javax.inject.Singleton; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.audit.AMActivityAuditEventBuilder; import org.forgerock.openam.audit.AuditEventFactory; import org.forgerock.openam.audit.AuditEventPublisher; diff --git a/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java b/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java index c89ad7e1ec..23a0d7b1d9 100644 --- a/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java +++ b/openam-core/src/main/java/com/sun/identity/authentication/service/LoginState.java @@ -26,7 +26,7 @@ * * Portions Copyrighted 2010-2016 ForgeRock AS. * Portions Copyrighted 2016 Nomura Research Institute, Ltd. - * Portions Copyrighted 2024 3A Systems LLC + * Portions Copyrighted 2017-2025 3A Systems LLC */ package com.sun.identity.authentication.service; @@ -67,7 +67,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import org.forgerock.guice.core.InjectorHolder; diff --git a/openam-core/src/main/java/com/sun/identity/common/configuration/ServerPropertyValidator.java b/openam-core/src/main/java/com/sun/identity/common/configuration/ServerPropertyValidator.java index 8f09678c61..2f95e26daa 100644 --- a/openam-core/src/main/java/com/sun/identity/common/configuration/ServerPropertyValidator.java +++ b/openam-core/src/main/java/com/sun/identity/common/configuration/ServerPropertyValidator.java @@ -24,6 +24,7 @@ * * $Id: ServerPropertyValidator.java,v 1.5 2008/09/02 23:44:07 babysunil Exp $ * + * Portions Copyrighted 2025 3A Systems, LLC. */ /** @@ -44,7 +45,7 @@ import java.util.ResourceBundle; import java.util.Set; import java.util.StringTokenizer; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonException; import org.forgerock.json.JsonPointer; diff --git a/openam-core/src/main/java/com/sun/identity/entitlement/util/SearchAttribute.java b/openam-core/src/main/java/com/sun/identity/entitlement/util/SearchAttribute.java index 86eb976bbe..2023cc50ba 100644 --- a/openam-core/src/main/java/com/sun/identity/entitlement/util/SearchAttribute.java +++ b/openam-core/src/main/java/com/sun/identity/entitlement/util/SearchAttribute.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package com.sun.identity.entitlement.util; -import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; import org.forgerock.util.Reject; /** diff --git a/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java b/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java index b9c690f940..d796b68395 100644 --- a/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java +++ b/openam-core/src/main/java/com/sun/identity/log/handlers/FileHandler.java @@ -26,6 +26,7 @@ * * Portions Copyrighted 2011-2016 ForgeRock AS. * Portions Copyrighted 2014 Nomura Research Institute, Ltd + * Portions Copyrighted 2020-2025 3A Systems, LLC. */ package com.sun.identity.log.handlers; @@ -50,7 +51,7 @@ import java.util.logging.LogRecord; import java.util.zip.GZIPOutputStream; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.iplanet.am.util.ThreadPoolException; import com.iplanet.log.NullLocationException; diff --git a/openam-core/src/main/java/com/sun/identity/setup/AMSetupServlet.java b/openam-core/src/main/java/com/sun/identity/setup/AMSetupServlet.java index 05dbf43464..4cad12276b 100644 --- a/openam-core/src/main/java/com/sun/identity/setup/AMSetupServlet.java +++ b/openam-core/src/main/java/com/sun/identity/setup/AMSetupServlet.java @@ -25,6 +25,7 @@ * $Id: AMSetupServlet.java,v 1.117 2010/01/20 17:01:35 veiming Exp $ * * Portions Copyrighted 2010-2016 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package com.sun.identity.setup; @@ -86,7 +87,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.guice.core.InjectorHolder; import org.forgerock.openam.license.License; import org.forgerock.openam.license.LicenseLocator; diff --git a/openam-core/src/main/java/com/sun/identity/setup/BootstrapCreator.java b/openam-core/src/main/java/com/sun/identity/setup/BootstrapCreator.java index 38aa501296..78b1551b22 100644 --- a/openam-core/src/main/java/com/sun/identity/setup/BootstrapCreator.java +++ b/openam-core/src/main/java/com/sun/identity/setup/BootstrapCreator.java @@ -25,6 +25,7 @@ * $Id: BootstrapCreator.java,v 1.14 2009/08/03 23:32:54 veiming Exp $ * * Portions Copyrighted 2011-2016 ForgeRock AS. + * Portions Copyrighted 2018-2025 3A Systems, LLC. */ package com.sun.identity.setup; @@ -37,7 +38,7 @@ import java.util.Collection; import java.util.Iterator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.keystore.KeyStoreConfig; import org.forgerock.openam.setup.BootstrapConfig; import org.forgerock.openam.setup.ConfigStoreProperties; diff --git a/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java b/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java index 19e5ac9997..2323fb54f2 100644 --- a/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java +++ b/openam-core/src/main/java/org/forgerock/openam/blacklist/CTSBlacklist.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2022-2025 3A Systems, LLC. */ package org.forgerock.openam.blacklist; @@ -31,7 +32,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.CTSPersistentStore; import org.forgerock.openam.cts.api.filter.TokenFilter; import org.forgerock.openam.cts.api.filter.TokenFilterBuilder; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/CTSPersistentStoreImpl.java b/openam-core/src/main/java/org/forgerock/openam/cts/CTSPersistentStoreImpl.java index 500a08315a..c0c5bacca5 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/CTSPersistentStoreImpl.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/CTSPersistentStoreImpl.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts; @@ -24,7 +25,7 @@ import com.google.inject.name.Named; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.cts.api.filter.TokenFilter; import org.forgerock.openam.cts.api.filter.TokenFilterBuilder; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthValues.java b/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthValues.java index 29636863e7..fc77f8a171 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthValues.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/adapters/OAuthValues.java @@ -12,12 +12,13 @@ * 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 copyright [year] [name of copyright owner]". + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.adapters; import static org.forgerock.openam.utils.Time.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.utils.TimeUtils; import java.util.ArrayList; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/impl/CTSDataLayerConfiguration.java b/openam-core/src/main/java/org/forgerock/openam/cts/impl/CTSDataLayerConfiguration.java index 79cd737bbf..9cb22b2d44 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/impl/CTSDataLayerConfiguration.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/impl/CTSDataLayerConfiguration.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.impl; @@ -19,7 +20,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.sm.datalayer.api.DataLayerConstants; import org.forgerock.openam.sm.datalayer.api.StoreMode; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/impl/LDAPConfig.java b/openam-core/src/main/java/org/forgerock/openam/cts/impl/LDAPConfig.java index c0123dce58..99ef58561e 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/impl/LDAPConfig.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/impl/LDAPConfig.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions Copyrighted 2020-2025 3A Systems, LLC. */ package org.forgerock.openam.cts.impl; import com.iplanet.am.util.SystemProperties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.sm.datalayer.api.StoreMode; import org.forgerock.openam.utils.ModifiedProperty; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/utils/KeyConversion.java b/openam-core/src/main/java/org/forgerock/openam/cts/utils/KeyConversion.java index bb80365471..16c1972f73 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/utils/KeyConversion.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/utils/KeyConversion.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.utils; @@ -19,7 +20,7 @@ import com.sun.identity.session.util.SessionUtils; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.UnsupportedEncodingException; import java.text.MessageFormat; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcess.java b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcess.java index 6fc74e34a2..e36aca73ed 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcess.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerBaseProcess.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; import java.util.Collection; import java.util.concurrent.CountDownLatch; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.time.StopWatch; import org.forgerock.openam.cts.exceptions.CoreTokenException; import org.forgerock.openam.cts.impl.query.worker.CTSWorkerQuery; import org.forgerock.openam.cts.worker.CTSWorkerFilter; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcess.java b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcess.java index a9b4c3f6c6..b2a56f73eb 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcess.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/CTSWorkerDeleteProcess.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; @@ -21,7 +22,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.time.StopWatch; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.cts.exceptions.CoreTokenException; import org.forgerock.openam.cts.impl.query.worker.CTSWorkerQuery; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/MaxSessionTimeExpiredProcess.java b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/MaxSessionTimeExpiredProcess.java index 816085406f..ecd5b491fb 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/MaxSessionTimeExpiredProcess.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/MaxSessionTimeExpiredProcess.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; @@ -21,7 +22,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.time.StopWatch; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.cts.exceptions.CoreTokenException; import org.forgerock.openam.cts.impl.query.worker.CTSWorkerConstants; diff --git a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/SessionIdleTimeExpiredProcess.java b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/SessionIdleTimeExpiredProcess.java index 4f4b25ead3..d47a2e11aa 100644 --- a/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/SessionIdleTimeExpiredProcess.java +++ b/openam-core/src/main/java/org/forgerock/openam/cts/worker/process/SessionIdleTimeExpiredProcess.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.worker.process; @@ -21,7 +22,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.time.StopWatch; +import org.apache.commons.lang3.time.StopWatch; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.cts.exceptions.CoreTokenException; import org.forgerock.openam.cts.impl.query.worker.CTSWorkerConstants; diff --git a/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java b/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java index 696f68a946..3d62075e8f 100644 --- a/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java +++ b/openam-core/src/main/java/org/forgerock/openam/ldap/LDAPAuthUtils.java @@ -27,7 +27,7 @@ * Portions Copyrighted 2011-2016 ForgeRock AS. * Portions Copyrighted 2014-2016 Nomura Research Institute, Ltd * Portions Copyrighted 2019 Open Source Solution Technology Corporation - * Portions Copyrighted 2024 3A Systems LLC + * Portions Copyrighted 2024-2025 3A Systems LLC */ package org.forgerock.openam.ldap; @@ -64,7 +64,7 @@ import java.util.concurrent.TimeUnit; import javax.net.ssl.SSLContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.opendj.ldap.Attribute; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.Connection; diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyAllAction.java b/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyAllAction.java index 9f6af78859..833d22270d 100644 --- a/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyAllAction.java +++ b/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyAllAction.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 2017-2025 3A Systems, LLC. */ package org.forgerock.openam.session.service; @@ -27,7 +28,7 @@ import com.iplanet.dpro.session.service.QuotaExhaustionActionImpl; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This action will invalidate all currently existing sessions, but it will diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyNextExpiringAction.java b/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyNextExpiringAction.java index f1f76a6132..a6da2a3988 100644 --- a/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyNextExpiringAction.java +++ b/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyNextExpiringAction.java @@ -19,6 +19,7 @@ * [name of copyright owner]" * * Portions Copyrighted 2011-2015 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package org.forgerock.openam.session.service; @@ -27,7 +28,7 @@ import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class DestroyNextExpiringAction extends QuotaExhaustionActionImpl { diff --git a/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyOldestAction.java b/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyOldestAction.java index b990abff0d..d2620a9b74 100644 --- a/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyOldestAction.java +++ b/openam-core/src/main/java/org/forgerock/openam/session/service/DestroyOldestAction.java @@ -16,6 +16,7 @@ * 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 2017-2025 3A Systems, LLC. * */ package org.forgerock.openam.session.service; @@ -28,7 +29,7 @@ import java.util.HashSet; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/openam-core/src/main/java/org/forgerock/openam/setup/BootstrapConfig.java b/openam-core/src/main/java/org/forgerock/openam/setup/BootstrapConfig.java index 474febc7e2..1f3b201661 100644 --- a/openam-core/src/main/java/org/forgerock/openam/setup/BootstrapConfig.java +++ b/openam-core/src/main/java/org/forgerock/openam/setup/BootstrapConfig.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.setup; @@ -23,7 +24,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.text.StrSubstitutor; +import org.apache.commons.lang3.text.StrSubstitutor; import org.forgerock.openam.keystore.KeyStoreConfig; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/query/QueryBuilder.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/query/QueryBuilder.java index f385db360a..6be91d3f75 100644 --- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/query/QueryBuilder.java +++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/api/query/QueryBuilder.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.api.query; @@ -23,7 +24,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.forgerock.openam.cts.api.tokens.Token; import org.forgerock.openam.cts.continuous.ContinuousQuery; import org.forgerock.openam.cts.continuous.ContinuousQueryListener; diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/LabelsDataLayerConfiguration.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/LabelsDataLayerConfiguration.java index a5297df58c..a45d3f610e 100644 --- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/LabelsDataLayerConfiguration.java +++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/LabelsDataLayerConfiguration.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl; @@ -19,7 +20,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.sm.datalayer.api.DataLayerConstants; import org.forgerock.openam.sm.datalayer.api.StoreMode; import org.forgerock.openam.sm.datalayer.impl.ldap.LdapDataLayerConfiguration; diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ResourceSetDataLayerConfiguration.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ResourceSetDataLayerConfiguration.java index aa1e08a80b..bdf4ee8dd0 100644 --- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ResourceSetDataLayerConfiguration.java +++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ResourceSetDataLayerConfiguration.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl; @@ -19,7 +20,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.sm.datalayer.api.DataLayerConstants; import org.forgerock.openam.sm.datalayer.api.StoreMode; diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaAuditDataLayerConfiguration.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaAuditDataLayerConfiguration.java index de3e1cf48b..ae891e9414 100644 --- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaAuditDataLayerConfiguration.java +++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaAuditDataLayerConfiguration.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2020-2025 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl; @@ -19,7 +20,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.sm.datalayer.api.DataLayerConstants; import org.forgerock.openam.sm.datalayer.api.StoreMode; import org.forgerock.openam.sm.datalayer.impl.ldap.LdapDataLayerConfiguration; diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaPendingRequestDataLayerConfiguration.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaPendingRequestDataLayerConfiguration.java index feec234363..4c133d17d2 100644 --- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaPendingRequestDataLayerConfiguration.java +++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/UmaPendingRequestDataLayerConfiguration.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl; @@ -21,7 +22,7 @@ import com.iplanet.am.util.AMPasswordUtil; import com.iplanet.am.util.SystemProperties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.sm.datalayer.api.DataLayerConstants; import org.forgerock.openam.sm.datalayer.api.StoreMode; import org.forgerock.openam.sm.datalayer.impl.ldap.LdapDataLayerConfiguration; diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfig.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfig.java index d974960831..ec00548b36 100644 --- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfig.java +++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/ExternalLdapConfig.java @@ -12,13 +12,14 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl.ldap; import com.iplanet.services.naming.ServerEntryNotFoundException; import com.iplanet.services.naming.WebtopNaming; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.ldap.LDAPURL; import org.forgerock.openam.ldap.LDAPUtils; import org.forgerock.openam.session.SessionConstants; diff --git a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilder.java b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilder.java index e4cc07aaad..5e05bf26d2 100644 --- a/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilder.java +++ b/openam-core/src/main/java/org/forgerock/openam/sm/datalayer/impl/ldap/LdapQueryBuilder.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.sm.datalayer.impl.ldap; @@ -27,7 +28,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.api.CoreTokenConstants; import org.forgerock.openam.cts.continuous.ContinuousQuery; import org.forgerock.openam.cts.continuous.ContinuousQueryListener; diff --git a/openam-core/src/main/java/org/forgerock/openam/upgrade/VersionUtils.java b/openam-core/src/main/java/org/forgerock/openam/upgrade/VersionUtils.java index 6ec4288b8c..b19e056eba 100644 --- a/openam-core/src/main/java/org/forgerock/openam/upgrade/VersionUtils.java +++ b/openam-core/src/main/java/org/forgerock/openam/upgrade/VersionUtils.java @@ -25,6 +25,7 @@ * $Id: UpgradeUtils.java,v 1.18 2009/09/30 17:35:24 goodearth Exp $ * * Portions Copyrighted 2011-2015 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package org.forgerock.openam.upgrade; @@ -40,7 +41,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Utility class that deals with determining and comparing versions of OpenAM. diff --git a/openam-core/src/test/java/org/forgerock/openam/core/realms/RealmTestHelper.java b/openam-core/src/test/java/org/forgerock/openam/core/realms/RealmTestHelper.java index 589d630a7f..90430ade42 100644 --- a/openam-core/src/test/java/org/forgerock/openam/core/realms/RealmTestHelper.java +++ b/openam-core/src/test/java/org/forgerock/openam/core/realms/RealmTestHelper.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.core.realms; @@ -24,7 +25,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.iplanet.sso.SSOToken; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.assertj.core.description.Description; import org.forgerock.openam.core.CoreWrapper; import org.forgerock.util.Reject; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/TokenTestUtils.java b/openam-core/src/test/java/org/forgerock/openam/cts/TokenTestUtils.java index a6331a3a8a..3bf1f42ca3 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/TokenTestUtils.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/TokenTestUtils.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts; @@ -19,8 +20,8 @@ import org.forgerock.openam.tokens.CoreTokenField; import org.forgerock.openam.cts.api.fields.CoreTokenFieldTypes; import org.forgerock.openam.cts.api.tokens.Token; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.RandomStringUtils; import java.text.MessageFormat; import java.util.Calendar; diff --git a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java index 0ea5decf67..551302377f 100644 --- a/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java +++ b/openam-core/src/test/java/org/forgerock/openam/cts/impl/LdapAdapterTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.cts.impl; @@ -31,7 +32,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.forgerock.openam.cts.api.filter.TokenFilter; import org.forgerock.openam.cts.api.filter.TokenFilterBuilder; import org.forgerock.openam.cts.api.tokens.Token; diff --git a/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml b/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml index 91471eadb2..143d08e3e4 100644 --- a/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml +++ b/openam-distribution/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml @@ -22,7 +22,7 @@ * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * -* Portions Copyrighted 2019-2024 3A Systems, LLC +* Portions Copyrighted 2019-2025 3A Systems, LLC --> javax.inject:javax.inject com.google.inject:guice:jar:no_aop com.google.inject.extensions:guice-assistedinject - commons-lang:commons-lang + org.apache.commons:commons-lang3 commons-collections:commons-collections javax.xml:jaxrpc-api external:jaxrpc-impl diff --git a/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml b/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml index d9c524d05f..75511207b5 100644 --- a/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml +++ b/openam-distribution/openam-distribution-ssoconfiguratortools/src/main/assembly/openAMToolsAssembly_Descriptor.xml @@ -21,7 +21,7 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" -* + * Portions Copyrighted 2019-2025 3A Systems, LLC. --> org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject org.slf4j:slf4j-api org.slf4j:slf4j-nop - commons-lang:commons-lang + org.apache.commons:commons-lang3 org.openidentityplatform.openam:openam-tools org.openidentityplatform.openam:openam-license-core org.openidentityplatform.openam:openam-installer-utils diff --git a/openam-entitlements/src/main/java/com/sun/identity/entitlement/JwtClaimSubject.java b/openam-entitlements/src/main/java/com/sun/identity/entitlement/JwtClaimSubject.java index 60646b347b..9c31368876 100644 --- a/openam-entitlements/src/main/java/com/sun/identity/entitlement/JwtClaimSubject.java +++ b/openam-entitlements/src/main/java/com/sun/identity/entitlement/JwtClaimSubject.java @@ -13,13 +13,14 @@ * * Copyright 2014 ForgeRock AS. * Portions copyright 2016 Agile Digital Engineering + * Portions Copyrighted 2025 3A Systems, LLC. */ package com.sun.identity.entitlement; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonValue; import org.json.JSONException; import org.json.JSONObject; diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java index 6810b1aa4f..c8ae8de2e3 100644 --- a/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java +++ b/openam-entitlements/src/main/java/org/forgerock/openam/entitlement/rest/ApplicationV1Filter.java @@ -13,6 +13,7 @@ * * Copyright 2015-2016 ForgeRock AS. * Portions Copyrighted 2015 Nomura Research Institute, Ltd. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.entitlement.rest; @@ -33,7 +34,7 @@ import com.sun.identity.entitlement.Application; import com.sun.identity.entitlement.EntitlementException; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.forgerock.services.context.Context; import org.forgerock.json.JsonValue; import org.forgerock.json.resource.ActionRequest; diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/XACMLResourceTypeUtils.java b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/XACMLResourceTypeUtils.java index f0ad820423..e85f07ec10 100644 --- a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/XACMLResourceTypeUtils.java +++ b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/XACMLResourceTypeUtils.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.xacml.v3; @@ -25,7 +26,7 @@ import javax.security.auth.Subject; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.forgerock.openam.entitlement.ResourceType; import org.forgerock.openam.entitlement.configuration.SmsAttribute; import org.forgerock.openam.entitlement.service.ResourceTypeService; diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSocialAuthN.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSocialAuthN.java index 252900333b..b517d5e031 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSocialAuthN.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/ConfigureSocialAuthN.java @@ -13,6 +13,7 @@ * * Copyright 2014-2015 ForgeRock AS. * Portions Copyrighted 2015 Nomura Research Institute, Ltd. + * Portions Copyrighted 2025 3A Systems, LLC. */ package com.sun.identity.workflow; @@ -31,7 +32,7 @@ import com.sun.identity.sm.OrganizationConfigManager; import com.sun.identity.sm.SMSException; import com.sun.identity.sm.ServiceConfig; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonValue; import org.forgerock.json.jose.utils.Utils; import org.forgerock.openam.utils.MapHelper; diff --git a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateSoapSTSDeployment.java b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateSoapSTSDeployment.java index 7e8f62b47b..e26b8cf763 100644 --- a/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateSoapSTSDeployment.java +++ b/openam-federation/OpenFM/src/main/java/com/sun/identity/workflow/CreateSoapSTSDeployment.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package com.sun.identity.workflow; @@ -25,7 +26,7 @@ import com.sun.identity.shared.Constants; import com.sun.identity.shared.configuration.SystemPropertiesManager; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import com.google.common.annotations.VisibleForTesting; import org.forgerock.openam.shared.security.crypto.KeyStoreBuilder; import org.forgerock.openam.shared.security.crypto.KeyStoreType; diff --git a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java index 21efc6fd64..188a4dbd00 100644 --- a/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java +++ b/openam-federation/openam-federation-library/src/main/java/com/sun/identity/saml2/plugins/SAML2IDPProxyFRImpl.java @@ -21,6 +21,7 @@ * your own identifying information: * "Portions Copyrighted [year] [name of copyright owner]" * + * Portions Copyrighted 2025 3A Systems, LLC. */ package com.sun.identity.saml2.plugins; @@ -58,7 +59,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * This class SAML2IDPProxyFRImpl is used to find a preferred Identity diff --git a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.java b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.java index 0da2579adf..0e5b848478 100644 --- a/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.java +++ b/openam-federation/openam-federation-library/src/main/java/org/forgerock/openam/saml2/UtilProxyIDPRequestValidator.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.saml2; @@ -28,7 +29,7 @@ import com.sun.identity.saml2.profile.IDPSSOUtil; import com.sun.identity.saml2.profile.ServerFaultException; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; import java.util.logging.Level; diff --git a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/common/SAML2UtilsTest.java b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/common/SAML2UtilsTest.java index b6e4ae64ae..7ca6af8c00 100644 --- a/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/common/SAML2UtilsTest.java +++ b/openam-federation/openam-federation-library/src/test/java/com/sun/identity/saml2/common/SAML2UtilsTest.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014-2015 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package com.sun.identity.saml2.common; @@ -19,7 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.sun.identity.shared.encode.URLEncDec; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.testng.annotations.Test; import java.util.ArrayList; diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ConsentRequiredResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ConsentRequiredResource.java index 27b9993d02..52dc2ffa2e 100644 --- a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ConsentRequiredResource.java +++ b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ConsentRequiredResource.java @@ -13,6 +13,7 @@ * * Copyright 2015-2016 ForgeRock AS. * Portions Copyrighted 2019 Open Source Solution Technology Corp. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.oauth2.restlet; @@ -23,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonValue; import org.forgerock.openam.oauth2.OAuth2Constants; import org.forgerock.oauth2.core.OAuth2Request; diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatelessTokenCtsAdapter.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatelessTokenCtsAdapter.java index cbdfe77666..f871b98bbc 100644 --- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatelessTokenCtsAdapter.java +++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatelessTokenCtsAdapter.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.oauth2; @@ -25,7 +26,7 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.cts.adapters.TokenAdapter; import org.forgerock.openam.cts.api.tokens.Token; import org.forgerock.openam.tokens.CoreTokenField; diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.java index ae87598efd..619255f344 100644 --- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.java +++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/resources/ResourceSetRegistrationEndpoint.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.oauth2.resources; @@ -28,7 +29,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonValue; import org.forgerock.oauth2.core.AccessToken; import org.forgerock.openam.oauth2.OAuth2Constants; diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/TokenResource.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/TokenResource.java index 6fee804e85..95b3dffe00 100644 --- a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/TokenResource.java +++ b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/rest/TokenResource.java @@ -20,6 +20,8 @@ * with the fields enclosed by brackets [] replaced by * your own identifying information: * "Portions copyright [year] [name of copyright owner]" + * + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.oauth2.rest; @@ -62,7 +64,7 @@ import com.sun.identity.shared.Constants; import com.sun.identity.shared.debug.Debug; import com.sun.identity.sm.DNMapper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.resource.BadRequestException; import org.forgerock.json.resource.ForbiddenException; import org.forgerock.oauth2.core.OAuth2ProviderSettingsFactory; diff --git a/openam-rest/src/main/java/org/forgerock/openam/notifications/NotificationsWebSocketFilter.java b/openam-rest/src/main/java/org/forgerock/openam/notifications/NotificationsWebSocketFilter.java index d5f35cb8a0..5a5e036655 100644 --- a/openam-rest/src/main/java/org/forgerock/openam/notifications/NotificationsWebSocketFilter.java +++ b/openam-rest/src/main/java/org/forgerock/openam/notifications/NotificationsWebSocketFilter.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.notifications; @@ -30,7 +31,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.guice.core.InjectorHolder; import org.forgerock.openam.authentication.service.AuthUtilsWrapper; import org.forgerock.openam.core.CoreWrapper; diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java b/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java index f2089c13aa..bfba359fc5 100644 --- a/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java +++ b/openam-rest/src/main/java/org/forgerock/openam/rest/LocalSSOTokenSessionModule.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package org.forgerock.openam.rest; @@ -40,7 +41,7 @@ import com.iplanet.sso.SSOToken; import com.sun.identity.session.util.RestrictedTokenAction; import com.sun.identity.session.util.RestrictedTokenContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.caf.authentication.api.AsyncServerAuthModule; import org.forgerock.caf.authentication.api.AuthenticationException; import org.forgerock.caf.authentication.api.MessageInfoContext; diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/SSOTokenFactory.java b/openam-rest/src/main/java/org/forgerock/openam/rest/SSOTokenFactory.java index 5887da63d9..b5368183fb 100644 --- a/openam-rest/src/main/java/org/forgerock/openam/rest/SSOTokenFactory.java +++ b/openam-rest/src/main/java/org/forgerock/openam/rest/SSOTokenFactory.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2013-2015 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.rest; @@ -24,7 +25,7 @@ import com.iplanet.sso.SSOTokenManager; import com.sun.identity.security.AdminTokenAction; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Responsible for generating SSOTokens. diff --git a/openam-shared/pom.xml b/openam-shared/pom.xml index 7582d68a82..6dba148552 100755 --- a/openam-shared/pom.xml +++ b/openam-shared/pom.xml @@ -13,7 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions copyright 2017-2024 3A Systems, LLC + * Portions copyright 2017-2025 3A Systems, LLC --> 4.0.0 @@ -78,8 +78,8 @@ - commons-lang - commons-lang + org.apache.commons + commons-lang3 diff --git a/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.java b/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.java index 295a59a9c6..7051c8e560 100644 --- a/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.java +++ b/openam-shared/src/main/java/com/sun/identity/shared/datastruct/CollectionHelper.java @@ -26,6 +26,7 @@ * * Portions Copyrighted 2010-2016 ForgeRock AS. * Portions Copyrighted 2016 Nomura Research Institute, Ltd. + * Portions Copyrighted 2025 3A Systems, LLC. */ package com.sun.identity.shared.datastruct; @@ -34,7 +35,7 @@ import com.sun.identity.shared.Constants; import com.sun.identity.shared.configuration.SystemPropertiesManager; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java b/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java index 8292c40ecb..8d86a9bc26 100644 --- a/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java +++ b/openam-shared/src/main/java/com/sun/identity/shared/encode/CookieUtils.java @@ -25,6 +25,7 @@ * $Id: CookieUtils.java,v 1.6 2009/10/02 00:08:26 ericow Exp $ * * Portions Copyrighted 2014-2016 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package com.sun.identity.shared.encode; @@ -53,7 +54,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Implements utility methods for handling Cookie. diff --git a/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/operation/TokenRequestMarshallerImpl.java b/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/operation/TokenRequestMarshallerImpl.java index 6c4a41372d..a5ed28ea1b 100644 --- a/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/operation/TokenRequestMarshallerImpl.java +++ b/openam-sts/openam-rest-sts/src/main/java/org/forgerock/openam/sts/rest/operation/TokenRequestMarshallerImpl.java @@ -12,6 +12,7 @@ * information: "Portions Copyrighted [year] [name of copyright owner]". * * Copyright 2013-2016 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. */ package org.forgerock.openam.sts.rest.operation; @@ -32,7 +33,7 @@ import javax.inject.Inject; import javax.inject.Named; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.forgerock.services.context.Context; import org.forgerock.services.context.ClientContext; import org.forgerock.json.JsonValue; diff --git a/openam-tools/build-helper-plugin/pom.xml b/openam-tools/build-helper-plugin/pom.xml index c45c421382..89388b27dd 100644 --- a/openam-tools/build-helper-plugin/pom.xml +++ b/openam-tools/build-helper-plugin/pom.xml @@ -13,6 +13,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2012-2016 ForgeRock AS. + * Portions Copyrighted 2017-2025 3A Systems, LLC. --> 4.0.0 @@ -77,8 +78,8 @@ - commons-lang - commons-lang + org.apache.commons + commons-lang3 diff --git a/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/inject/content/XmlContentConverter.java b/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/inject/content/XmlContentConverter.java index d8f50dca78..36ee0e333d 100644 --- a/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/inject/content/XmlContentConverter.java +++ b/openam-tools/build-helper-plugin/src/main/java/org/forgerock/maven/plugins/inject/content/XmlContentConverter.java @@ -12,11 +12,12 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2014 ForgeRock AS. + * Portions Copyrighted 2023-2025 3A Systems, LLC. */ package org.forgerock.maven.plugins.inject.content; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; /** * An implementation of a {@code ContentConverter} which will escape xml special characters from the line. diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/AuthorizationRequestEndpoint.java b/openam-uma/src/main/java/org/forgerock/openam/uma/AuthorizationRequestEndpoint.java index f6c3d05aca..a7a09bebc7 100644 --- a/openam-uma/src/main/java/org/forgerock/openam/uma/AuthorizationRequestEndpoint.java +++ b/openam-uma/src/main/java/org/forgerock/openam/uma/AuthorizationRequestEndpoint.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.uma; @@ -36,7 +37,7 @@ import com.sun.identity.idm.AMIdentity; import com.sun.identity.idm.IdUtils; import com.sun.identity.shared.debug.Debug; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonValue; import org.forgerock.oauth2.core.AccessToken; import org.forgerock.oauth2.core.OAuth2ProviderSettings; diff --git a/openam-uma/src/main/java/org/forgerock/openam/uma/PermissionRequestEndpoint.java b/openam-uma/src/main/java/org/forgerock/openam/uma/PermissionRequestEndpoint.java index 9ee73cd20a..1839e6e71a 100644 --- a/openam-uma/src/main/java/org/forgerock/openam/uma/PermissionRequestEndpoint.java +++ b/openam-uma/src/main/java/org/forgerock/openam/uma/PermissionRequestEndpoint.java @@ -12,6 +12,7 @@ * information: "Portions copyright [year] [name of copyright owner]". * * Copyright 2015-2016 ForgeRock AS. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.uma; @@ -27,7 +28,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.json.JsonValue; import org.forgerock.json.JsonValueException; import org.forgerock.oauth2.core.AccessToken; diff --git a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeServiceSchemaStep.java b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeServiceSchemaStep.java index 452182b0a1..48b29c5c0c 100644 --- a/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeServiceSchemaStep.java +++ b/openam-upgrade/src/main/java/org/forgerock/openam/upgrade/steps/UpgradeServiceSchemaStep.java @@ -16,6 +16,7 @@ /* * Portions Copyrighted 2015 Nomura Research Institute, Ltd. + * Portions Copyrighted 2025 3A Systems, LLC. */ package org.forgerock.openam.upgrade.steps; @@ -34,7 +35,7 @@ import javax.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.forgerock.openam.sm.datalayer.api.ConnectionFactory; import org.forgerock.openam.sm.datalayer.api.ConnectionType; import org.forgerock.openam.sm.datalayer.api.DataLayer; diff --git a/pom.xml b/pom.xml index 751618d814..8a54afeff5 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,6 @@ 1.11.0 3.2.2 2.1 - 2.6 1.10.0 1.1.3 1.1 @@ -1067,11 +1066,6 @@ commons-digester ${commons-digester.version} - - commons-lang - commons-lang - ${commons-lang.version} - commons-logging commons-logging @@ -2309,7 +2303,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.3 + 3.15.1 org.apache.maven.plugins