diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e5b48a41..28e43be6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 ## [2023.3.0]
 
 ### Other
-- Updated plugin dependencies [#825](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/825)
+- Updated plugin dependencies for IntelliJ IDEA 2023.3 [#825](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/825)
+
+### Deprecated
+- Migrate from `lang` to `lang3` [#826](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/826)
 
 ## [2023.2.13]
 
diff --git a/src/com/intellij/idea/plugin/hybris/project/configurators/impl/MavenUtils.java b/src/com/intellij/idea/plugin/hybris/project/configurators/impl/MavenUtils.java
index 3adf5069e..b400a1ee0 100644
--- a/src/com/intellij/idea/plugin/hybris/project/configurators/impl/MavenUtils.java
+++ b/src/com/intellij/idea/plugin/hybris/project/configurators/impl/MavenUtils.java
@@ -1,6 +1,6 @@
 /*
  * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
- * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as
@@ -18,6 +18,7 @@
 
 package com.intellij.idea.plugin.hybris.project.configurators.impl;
 
+import com.intellij.idea.plugin.hybris.common.HybrisConstants;
 import com.intellij.idea.plugin.hybris.project.descriptors.ModuleDescriptor;
 import com.intellij.idea.plugin.hybris.settings.HybrisApplicationSettings;
 import com.intellij.openapi.progress.ProgressIndicator;
@@ -29,16 +30,7 @@
 import org.jetbrains.idea.maven.model.MavenArtifact;
 import org.jetbrains.idea.maven.model.MavenExplicitProfiles;
 import org.jetbrains.idea.maven.model.MavenId;
-import org.jetbrains.idea.maven.project.MavenArtifactDownloader;
-import org.jetbrains.idea.maven.project.MavenEmbeddersManager;
-import org.jetbrains.idea.maven.project.MavenGeneralSettings;
-import org.jetbrains.idea.maven.project.MavenProjectReader;
-import org.jetbrains.idea.maven.project.MavenProjectReaderProjectLocator;
-import org.jetbrains.idea.maven.project.MavenProjectReaderResult;
-import org.jetbrains.idea.maven.project.MavenProjectsManager;
-import org.jetbrains.idea.maven.project.MavenProjectsTree;
-import org.jetbrains.idea.maven.project.MavenWorkspaceSettings;
-import org.jetbrains.idea.maven.project.MavenWorkspaceSettingsComponent;
+import org.jetbrains.idea.maven.project.*;
 import org.jetbrains.idea.maven.server.MavenEmbedderWrapper;
 import org.jetbrains.idea.maven.utils.MavenArtifactUtil;
 import org.jetbrains.idea.maven.utils.MavenProcessCanceledException;
@@ -89,7 +81,7 @@ private static List<String> resolveMavenDependencies(
         final List<String> resultPathList = new ArrayList<>();
 
         final File moduleDir = moduleDescriptor.getModuleRootDirectory();
-        final File mavenDescriptorFile = new File(moduleDir, "external-dependencies.xml");
+        final File mavenDescriptorFile = new File(moduleDir, HybrisConstants.EXTERNAL_DEPENDENCIES_XML);
         if (mavenDescriptorFile.exists()) {
             final MavenProjectReader mavenProjectReader = new MavenProjectReader(modifiableRootModel.getProject());
             final VirtualFile vfsMavenDescriptor = VfsUtil.findFileByIoFile(mavenDescriptorFile, false);
diff --git a/src/com/intellij/idea/plugin/hybris/project/utils/FileUtils.java b/src/com/intellij/idea/plugin/hybris/project/utils/FileUtils.java
index 24d062ca0..fe818de3a 100644
--- a/src/com/intellij/idea/plugin/hybris/project/utils/FileUtils.java
+++ b/src/com/intellij/idea/plugin/hybris/project/utils/FileUtils.java
@@ -1,9 +1,27 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019-2023 EPAM Systems <hybrisideaplugin@epam.com> and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package com.intellij.idea.plugin.hybris.project.utils;
 
 import com.google.common.collect.Lists;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.io.FileUtil;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
diff --git a/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/impl/DefaultTSCompletionService.kt b/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/impl/DefaultTSCompletionService.kt
index a35e1b98b..4e6be20b2 100644
--- a/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/impl/DefaultTSCompletionService.kt
+++ b/src/com/intellij/idea/plugin/hybris/system/type/codeInsight/completion/impl/DefaultTSCompletionService.kt
@@ -34,7 +34,7 @@ import com.intellij.idea.plugin.hybris.system.type.meta.TSMetaModelAccess
 import com.intellij.idea.plugin.hybris.system.type.meta.model.*
 import com.intellij.idea.plugin.hybris.system.type.meta.model.TSGlobalMetaItem.TSGlobalMetaItemAttribute
 import com.intellij.openapi.project.Project
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 import java.util.*
 
 class DefaultTSCompletionService(private val project: Project) : TSCompletionService {
diff --git a/src/com/intellij/idea/plugin/hybris/tools/remote/console/impl/HybrisImpexConsole.kt b/src/com/intellij/idea/plugin/hybris/tools/remote/console/impl/HybrisImpexConsole.kt
index d0e624304..6f05165db 100644
--- a/src/com/intellij/idea/plugin/hybris/tools/remote/console/impl/HybrisImpexConsole.kt
+++ b/src/com/intellij/idea/plugin/hybris/tools/remote/console/impl/HybrisImpexConsole.kt
@@ -36,7 +36,7 @@ import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.components.JBLabel
 import com.intellij.util.ui.JBUI
 import com.intellij.vcs.log.ui.frame.WrappedFlowLayout
-import org.apache.commons.lang.StringUtils
+import org.apache.commons.lang3.StringUtils
 import java.awt.BorderLayout
 import java.io.Serial
 import javax.swing.Icon