(incubator-kie-tools) branch main updated: NO-ISSUE: CVE-2026-53666 : Upgrade react-router-dom to 7.18.0 (#3703)

[thiagoelg]

This is an automated email from the ASF dual-hosted git repository.

thiagoelg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-tools.git


The following commit(s) were added to refs/heads/main by this push:
     new 293f0c43e5f NO-ISSUE: CVE-2026-53666 : Upgrade react-router-dom to 
7.18.0 (#3703)
293f0c43e5f is described below

commit 293f0c43e5fab6d18af3f032f884d195bc34c9bb
Author: Kusuma04-dev <kusumachinnama...@gmail.com>
AuthorDate: Tue Aug 11 19:31:20 2026 +0530

    NO-ISSUE: CVE-2026-53666 : Upgrade react-router-dom to 7.18.0 (#3703)
    
    Co-authored-by: Kusuma <kusuma-la...@ibm.com>
---
 .../package.json                                   |  2 +-
 .../src/App.tsx                                    |  2 +-
 .../dev-deployment-dmn-form-webapp/package.json    |  2 +-
 .../src/DmnFormApp.tsx                             |  2 +-
 .../src/DmnFormToolbar.tsx                         |  2 +-
 .../tests/jest.setup.ts                            |  3 +
 .../tests/testing_utils.tsx                        |  2 +-
 .../tsconfig.tests.json                            |  2 +-
 packages/online-editor/package.json                |  2 +-
 packages/online-editor/src/App.tsx                 |  4 +-
 packages/online-editor/src/NoMatchPage.tsx         |  2 +-
 .../src/accelerators/AcceleratorsHooks.tsx         |  2 +-
 packages/online-editor/src/editor/EditorPage.tsx   |  2 +-
 .../src/editor/EditorPageErrorPage.tsx             |  2 +-
 .../src/editor/Toolbar/EditorToolbar.tsx           |  2 +-
 .../GitIntegrationContextProvider.tsx              |  2 +-
 .../src/editor/Toolbar/Workspace/Hooks.tsx         |  2 +-
 .../editor/Toolbar/Workspace/WorkspaceToolbar.tsx  |  2 +-
 .../online-editor/src/filesList/FileDataList.tsx   |  2 +-
 .../online-editor/src/gitlab/ParseGitLabUrl.ts     |  2 +-
 packages/online-editor/src/home/HomePage.tsx       |  2 +-
 packages/online-editor/src/home/UploadCard.tsx     |  2 +-
 .../importFromUrl/ImportFromUrlHomePageCard.tsx    |  2 +-
 .../src/importFromUrl/ImportableUrlHooks.tsx       |  2 +-
 .../src/importFromUrl/NewWorkspaceFromUrlPage.tsx  |  2 +-
 .../NewWorkspaceWithEmptyFilePage.tsx              |  2 +-
 .../src/navigation/NavigationContextProvider.tsx   |  2 +-
 .../src/pageTemplate/OnlineEditorPage.tsx          |  2 +-
 .../src/queryParams/QueryParamsContext.ts          |  2 +-
 .../online-editor/src/settings/SettingsContext.tsx |  2 +-
 .../components/WorkspaceStatusIndicator.tsx        |  2 +-
 packages/pmml-editor/package.json                  |  2 +-
 packages/pmml-editor/src/editor/PMMLEditor.tsx     |  2 +-
 .../EditorCore/organisms/SingleEditorRouter.tsx    |  2 +-
 .../LandingPage/templates/LandingPage.tsx          |  2 +-
 .../LandingPage/templates/LandingPage.test.tsx     | 11 +--
 packages/pmml-editor/tests/jest.setup.ts           |  3 +
 packages/pmml-editor/tsconfig.tests.json           |  2 +-
 packages/runtime-tools-components/package.json     |  2 +-
 .../PageSectionHeader/PageSectionHeader.tsx        |  2 +-
 .../package.json                                   |  2 +-
 .../authSessions/components/AuthSessionSelect.tsx  |  2 +-
 .../components/NewAuthSessionLoginSuccessPage.tsx  |  2 +-
 .../src/jobs/Jobs.tsx                              |  2 +-
 .../src/jobs/JobsPage.tsx                          |  2 +-
 .../src/managementConsole/ManagementConsole.tsx    |  2 +-
 .../managementConsole/ManagementConsoleHome.tsx    |  2 +-
 .../ManagementConsolePageLayout.tsx                |  2 +-
 .../managementConsole/ManagementConsoleRoutes.tsx  |  4 +-
 .../navigation/queryParams/QueryParamsContext.ts   |  2 +-
 .../process/definitions/ProcessDefinitionsList.tsx |  2 +-
 .../definitions/ProcessDefinitionsListPage.tsx     |  2 +-
 .../src/process/details/ProcessDetails.tsx         |  2 +-
 .../src/process/details/ProcessDetailsPage.tsx     |  2 +-
 .../src/process/form/ProcessDefinitionFormPage.tsx |  2 +-
 .../src/process/list/ProcessList.tsx               |  2 +-
 .../src/process/list/ProcessListPage.tsx           |  2 +-
 .../src/runtime/RuntimeContext.tsx                 |  2 +-
 .../src/runtime/RuntimeNav.tsx                     |  2 +-
 .../src/tasks/TaskDetails.tsx                      |  2 +-
 .../src/tasks/TaskDetailsPage.tsx                  |  2 +-
 .../src/tasks/Tasks.tsx                            |  4 +-
 .../src/tasks/TasksPage.tsx                        |  2 +-
 .../tasks/components/ImpersonationPageSection.tsx  |  2 +-
 .../package.json                                   |  2 +-
 .../components/DevUI/DevUILayout/DevUILayout.tsx   |  2 +-
 .../src/components/DevUI/DevUINav/DevUINav.tsx     |  2 +-
 .../components/DevUI/DevUIRoutes/DevUIRoutes.tsx   |  2 +-
 .../FormsListContainer/FormsListContainer.tsx      |  2 +-
 .../ProcessDefinitionListContainer.tsx             |  2 +-
 .../ProcessDetailsContainer.tsx                    |  2 +-
 .../ProcessListContainer/ProcessListContainer.tsx  |  2 +-
 .../TaskListContainer/TaskListContainer.tsx        |  2 +-
 .../pages/FormDetailsPage/FormDetailsPage.tsx      |  2 +-
 .../ProcessDetailsPage/ProcessDetailsPage.tsx      |  2 +-
 .../pages/ProcessFormPage/ProcessFormPage.tsx      |  2 +-
 .../pages/ProcessesPage/ProcessesPage.tsx          |  2 +-
 .../pages/TaskDetailsPage/TaskDetailsPage.tsx      |  2 +-
 .../package.json                                   |  2 +-
 .../src/NoData/NoData.tsx                          |  2 +-
 .../src/PageNotFound/PageNotFound.tsx              |  2 +-
 pnpm-lock.yaml                                     | 96 +++++++++++-----------
 82 files changed, 136 insertions(+), 139 deletions(-)

diff --git 
a/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/package.json
 
b/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/package.json
index 37bdd7b27bb..683fcef7809 100644
--- 
a/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/package.json
+++ 
b/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/package.json
@@ -27,7 +27,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.30.4",
+    "react-router": "^7.18.0",
     "rimraf": "^3.0.2",
     "typescript": "^5.9.3",
     "webpack": "^5.108.4",
diff --git 
a/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/src/App.tsx
 
b/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/src/App.tsx
index f43828eda70..23afd1f9e49 100644
--- 
a/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/src/App.tsx
+++ 
b/examples/micro-frontends-multiplying-architecture-ping-pong-views-on-webapp/src/App.tsx
@@ -23,7 +23,7 @@ import { Brand } from 
"@patternfly/react-core/dist/js/components/Brand";
 import { Nav, NavItem, NavList } from 
"@patternfly/react-core/dist/js/components/Nav";
 import { Page } from "@patternfly/react-core/dist/js/components/Page";
 import { PageHeader } from "@patternfly/react-core/deprecated";
-import { HashRouter as Router, Link, Route, Routes } from "react-router-dom";
+import { HashRouter as Router, Link, Route, Routes } from "react-router";
 import { PingPongReactIFrameViewsPage } from 
"./React/PingPongReactIFrameViewsPage";
 import { PingPongReactDivViewsPage } from "./React/PingPongReactDivViewsPage";
 import { PingPongAngularIFrameViewsPage } from 
"./Angular/PingPongAngularIFrameViewsPage";
diff --git a/packages/dev-deployment-dmn-form-webapp/package.json 
b/packages/dev-deployment-dmn-form-webapp/package.json
index 04de82eb3ed..972c3a94760 100644
--- a/packages/dev-deployment-dmn-form-webapp/package.json
+++ b/packages/dev-deployment-dmn-form-webapp/package.json
@@ -38,7 +38,7 @@
     "@readme/openapi-parser": "^2.5.0",
     "json-refs": "^3.0.15",
     "lodash": "^4.18.1",
-    "react-router-dom": "^6.30.4"
+    "react-router": "^7.18.0"
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",
diff --git a/packages/dev-deployment-dmn-form-webapp/src/DmnFormApp.tsx 
b/packages/dev-deployment-dmn-form-webapp/src/DmnFormApp.tsx
index 8f4ece2bd1e..0a28d07a389 100644
--- a/packages/dev-deployment-dmn-form-webapp/src/DmnFormApp.tsx
+++ b/packages/dev-deployment-dmn-form-webapp/src/DmnFormApp.tsx
@@ -19,7 +19,7 @@
 
 import * as React from "react";
 import { I18nDictionariesProvider } from 
"@kie-tools-core/i18n/dist/react-components";
-import { HashRouter, Navigate, Route, Routes, useParams } from 
"react-router-dom";
+import { HashRouter, Navigate, Route, Routes, useParams } from "react-router";
 import { AppContext, AppContextType } from "./AppContext";
 import { AppContextProvider } from "./AppContextProvider";
 import { DmnFormErrorPage } from "./DmnFormErrorPage";
diff --git a/packages/dev-deployment-dmn-form-webapp/src/DmnFormToolbar.tsx 
b/packages/dev-deployment-dmn-form-webapp/src/DmnFormToolbar.tsx
index 14b9622b7ec..b77052deaa9 100644
--- a/packages/dev-deployment-dmn-form-webapp/src/DmnFormToolbar.tsx
+++ b/packages/dev-deployment-dmn-form-webapp/src/DmnFormToolbar.tsx
@@ -33,7 +33,7 @@ import { Tooltip } from 
"@patternfly/react-core/dist/js/components/Tooltip";
 import { EllipsisVIcon } from 
"@patternfly/react-icons/dist/js/icons/ellipsis-v-icon";
 import { ExternalLinkAltIcon } from 
"@patternfly/react-icons/dist/js/icons/external-link-alt-icon";
 import HelpIcon from "@patternfly/react-icons/dist/js/icons/help-icon";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useApp } from "./AppContext";
 import { useDmnFormI18n } from "./i18n";
 import { routes } from "./Routes";
diff --git a/packages/dev-deployment-dmn-form-webapp/tests/jest.setup.ts 
b/packages/dev-deployment-dmn-form-webapp/tests/jest.setup.ts
index 1c413b1660e..6e22db060a6 100644
--- a/packages/dev-deployment-dmn-form-webapp/tests/jest.setup.ts
+++ b/packages/dev-deployment-dmn-form-webapp/tests/jest.setup.ts
@@ -18,3 +18,6 @@
  */
 
 import "@testing-library/jest-dom";
+import { TextEncoder } from "util";
+
+global.TextEncoder = TextEncoder;
diff --git a/packages/dev-deployment-dmn-form-webapp/tests/testing_utils.tsx 
b/packages/dev-deployment-dmn-form-webapp/tests/testing_utils.tsx
index debaeaf1b76..04fa518fcd3 100644
--- a/packages/dev-deployment-dmn-form-webapp/tests/testing_utils.tsx
+++ b/packages/dev-deployment-dmn-form-webapp/tests/testing_utils.tsx
@@ -21,7 +21,7 @@ import { I18nDictionariesProvider, 
I18nDictionariesProviderProps } from "@kie-to
 import React from "react";
 import { AppContext, AppContextType } from "../src/AppContext";
 import { DmnFormI18n, DmnFormI18nContext, dmnFormI18nDefaults, 
dmnFormI18nDictionaries } from "../src/i18n";
-import { BrowserRouter } from "react-router-dom";
+import { BrowserRouter } from "react-router";
 
 export function usingTestingDmnFormI18nContext(
   children: React.ReactElement,
diff --git a/packages/dev-deployment-dmn-form-webapp/tsconfig.tests.json 
b/packages/dev-deployment-dmn-form-webapp/tsconfig.tests.json
index 1b2aedc6d23..55f09e910b5 100644
--- a/packages/dev-deployment-dmn-form-webapp/tsconfig.tests.json
+++ b/packages/dev-deployment-dmn-form-webapp/tsconfig.tests.json
@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "types": ["@testing-library/jest-dom"]
+    "types": ["@testing-library/jest-dom", "node"]
   }
 }
diff --git a/packages/online-editor/package.json 
b/packages/online-editor/package.json
index 55221630dd1..6cd118046e5 100644
--- a/packages/online-editor/package.json
+++ b/packages/online-editor/package.json
@@ -81,7 +81,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-dropzone": "^11.4.2",
-    "react-router-dom": "^6.30.4",
+    "react-router": "^7.18.0",
     "react-virtualized-auto-sizer": "^1.0.7",
     "react-window": "^1.3.1",
     "uuid": "^14.0.0"
diff --git a/packages/online-editor/src/App.tsx 
b/packages/online-editor/src/App.tsx
index 96a59e398fe..2b04996192d 100644
--- a/packages/online-editor/src/App.tsx
+++ b/packages/online-editor/src/App.tsx
@@ -21,13 +21,13 @@ import * as React from "react";
 import { useMemo } from "react";
 import {
   createHashRouter,
+  RouterProvider,
   createRoutesFromElements,
   Navigate,
   Outlet,
   Route,
-  RouterProvider,
   useParams,
-} from "react-router-dom";
+} from "react-router";
 import { EditorEnvelopeLocatorContextProvider } from 
"./envelopeLocator/hooks/EditorEnvelopeLocatorContext";
 import { EditorPage } from "./editor/EditorPage";
 import { OnlineI18nContextProvider } from "./i18n";
diff --git a/packages/online-editor/src/NoMatchPage.tsx 
b/packages/online-editor/src/NoMatchPage.tsx
index a1d8299efbc..b3bbb11e4b4 100644
--- a/packages/online-editor/src/NoMatchPage.tsx
+++ b/packages/online-editor/src/NoMatchPage.tsx
@@ -23,7 +23,7 @@ import { Text, TextContent } from 
"@patternfly/react-core/dist/js/components/Tex
 import { EmptyState, EmptyStateBody, EmptyStateFooter } from 
"@patternfly/react-core/dist/js/components/EmptyState";
 import { Button, ButtonVariant } from 
"@patternfly/react-core/dist/js/components/Button";
 import { useRoutes } from "./navigation/Hooks";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { Bullseye } from "@patternfly/react-core/dist/js/layouts/Bullseye";
 import { EmptyStateActions } from 
"@patternfly/react-core/dist/js/components/EmptyState";
 
diff --git a/packages/online-editor/src/accelerators/AcceleratorsHooks.tsx 
b/packages/online-editor/src/accelerators/AcceleratorsHooks.tsx
index fe7927f3b03..ec2d805dc9b 100644
--- a/packages/online-editor/src/accelerators/AcceleratorsHooks.tsx
+++ b/packages/online-editor/src/accelerators/AcceleratorsHooks.tsx
@@ -31,7 +31,7 @@ import {
 } from "./AcceleratorsApi";
 import { WorkspaceFile, useWorkspaces } from 
"@kie-tools-core/workspaces-git-fs/dist/context/WorkspacesContext";
 import { dirname, join } from "path";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useRoutes } from "../navigation/Hooks";
 import { useGlobalAlert } from "../alerts";
 import { Alert } from "@patternfly/react-core/dist/js/components/Alert";
diff --git a/packages/online-editor/src/editor/EditorPage.tsx 
b/packages/online-editor/src/editor/EditorPage.tsx
index 4ffb0005af8..a40cde5d15d 100644
--- a/packages/online-editor/src/editor/EditorPage.tsx
+++ b/packages/online-editor/src/editor/EditorPage.tsx
@@ -19,7 +19,7 @@
 
 import * as React from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router";
 import { useRoutes } from "../navigation/Hooks";
 import { EditorToolbar } from "./Toolbar/EditorToolbar";
 import { useOnlineI18n } from "../i18n";
diff --git a/packages/online-editor/src/editor/EditorPageErrorPage.tsx 
b/packages/online-editor/src/editor/EditorPageErrorPage.tsx
index b135a44ebce..9242d4fe84a 100644
--- a/packages/online-editor/src/editor/EditorPageErrorPage.tsx
+++ b/packages/online-editor/src/editor/EditorPageErrorPage.tsx
@@ -31,7 +31,7 @@ import { Button, ButtonVariant } from 
"@patternfly/react-core/dist/js/components
 import * as React from "react";
 import { useCallback, useMemo, useState } from "react";
 import { useRoutes } from "../navigation/Hooks";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { ClipboardCopy, ClipboardCopyVariant } from 
"@patternfly/react-core/dist/js/components/ClipboardCopy";
 import { Bullseye } from "@patternfly/react-core/dist/js/layouts/Bullseye";
 
diff --git a/packages/online-editor/src/editor/Toolbar/EditorToolbar.tsx 
b/packages/online-editor/src/editor/Toolbar/EditorToolbar.tsx
index 28721ce5316..f60cf1659fc 100644
--- a/packages/online-editor/src/editor/Toolbar/EditorToolbar.tsx
+++ b/packages/online-editor/src/editor/Toolbar/EditorToolbar.tsx
@@ -31,7 +31,7 @@ import { useOnlineI18n } from "../../i18n";
 import { ExtendedServicesButtons } from 
"../ExtendedServices/ExtendedServicesButtons";
 import { useNavigationBlockersBypass, useRoutes } from 
"../../navigation/Hooks";
 import { EmbeddedEditorRef } from "@kie-tools-core/editor/dist/embedded";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useWorkspaces, WorkspaceFile } from 
"@kie-tools-core/workspaces-git-fs/dist/context/WorkspacesContext";
 import { PlusIcon } from "@patternfly/react-icons/dist/js/icons/plus-icon";
 import { Flex, FlexItem } from "@patternfly/react-core/dist/js/layouts/Flex";
diff --git 
a/packages/online-editor/src/editor/Toolbar/GitIntegration/GitIntegrationContextProvider.tsx
 
b/packages/online-editor/src/editor/Toolbar/GitIntegration/GitIntegrationContextProvider.tsx
index 621ebe4d140..f9883b61707 100644
--- 
a/packages/online-editor/src/editor/Toolbar/GitIntegration/GitIntegrationContextProvider.tsx
+++ 
b/packages/online-editor/src/editor/Toolbar/GitIntegration/GitIntegrationContextProvider.tsx
@@ -51,7 +51,7 @@ import {
   GIT_ORIGIN_REMOTE_NAME,
 } from "@kie-tools-core/workspaces-git-fs/dist/constants/GitConstants";
 import { useNavigationBlockersBypass, useRoutes } from 
"../../../navigation/Hooks";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useGitIntegrationAlerts } from "./GitIntegrationAlerts";
 import { AuthProviderGroup, isGistEnabledAuthProviderType } from 
"../../../authProviders/AuthProvidersApi";
 import { useEditorToolbarDispatchContext } from 
"../EditorToolbarContextProvider";
diff --git a/packages/online-editor/src/editor/Toolbar/Workspace/Hooks.tsx 
b/packages/online-editor/src/editor/Toolbar/Workspace/Hooks.tsx
index c31588a1fc2..120059a7821 100644
--- a/packages/online-editor/src/editor/Toolbar/Workspace/Hooks.tsx
+++ b/packages/online-editor/src/editor/Toolbar/Workspace/Hooks.tsx
@@ -32,7 +32,7 @@ import { PushToGitAlertActionLinks } from 
"../GitIntegration/PushToGitAlertActio
 import { useGitIntegration } from 
"../GitIntegration/GitIntegrationContextProvider";
 import { switchExpression } from "@kie-tools-core/switch-expression-ts";
 import { GIT_ORIGIN_REMOTE_NAME } from 
"@kie-tools-core/workspaces-git-fs/dist/constants/GitConstants";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useEditorToolbarContext } from "../EditorToolbarContextProvider";
 
 export function useWorkspaceNavigationBlocker(workspace: ActiveWorkspace) {
diff --git 
a/packages/online-editor/src/editor/Toolbar/Workspace/WorkspaceToolbar.tsx 
b/packages/online-editor/src/editor/Toolbar/Workspace/WorkspaceToolbar.tsx
index 049b3db9aee..6e5e901fcb5 100644
--- a/packages/online-editor/src/editor/Toolbar/Workspace/WorkspaceToolbar.tsx
+++ b/packages/online-editor/src/editor/Toolbar/Workspace/WorkspaceToolbar.tsx
@@ -21,7 +21,7 @@ import React, { useCallback, useEffect, useRef } from "react";
 import { ActiveWorkspace } from 
"@kie-tools-core/workspaces-git-fs/dist/model/ActiveWorkspace";
 import { Flex, FlexItem } from "@patternfly/react-core/dist/js/layouts/Flex";
 import { Button, ButtonVariant } from 
"@patternfly/react-core/dist/js/components/Button";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useRoutes } from "../../../navigation/Hooks";
 import AngleLeftIcon from 
"@patternfly/react-icons/dist/js/icons/angle-left-icon";
 import { AuthSessionSelect } from "../../../authSessions/AuthSessionSelect";
diff --git a/packages/online-editor/src/filesList/FileDataList.tsx 
b/packages/online-editor/src/filesList/FileDataList.tsx
index 45f63ba3c8e..076bd217d7f 100644
--- a/packages/online-editor/src/filesList/FileDataList.tsx
+++ b/packages/online-editor/src/filesList/FileDataList.tsx
@@ -30,7 +30,7 @@ import {
   DataListItemCells,
   DataListItemRow,
 } from "@patternfly/react-core/dist/js/components/DataList";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { useRoutes } from "../navigation/Hooks";
 import { TaskIcon } from "@patternfly/react-icons/dist/js/icons/task-icon";
 import { WorkspaceDescriptor } from 
"@kie-tools-core/workspaces-git-fs/dist/worker/api/WorkspaceDescriptor";
diff --git a/packages/online-editor/src/gitlab/ParseGitLabUrl.ts 
b/packages/online-editor/src/gitlab/ParseGitLabUrl.ts
index 417bde15b30..4518c348b4c 100644
--- a/packages/online-editor/src/gitlab/ParseGitLabUrl.ts
+++ b/packages/online-editor/src/gitlab/ParseGitLabUrl.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { matchPath } from "react-router-dom";
+import { matchPath } from "react-router";
 import { ImportableUrl, UrlType } from "../importFromUrl/ImportableUrlHooks";
 
 const GITLAB_NAMESPACE_REGEX = "([^\\/]+(?:\\/[^\\/]+)*)"; // group or nested 
group(s)
diff --git a/packages/online-editor/src/home/HomePage.tsx 
b/packages/online-editor/src/home/HomePage.tsx
index 672d5c69a22..befeffef6b9 100644
--- a/packages/online-editor/src/home/HomePage.tsx
+++ b/packages/online-editor/src/home/HomePage.tsx
@@ -23,7 +23,7 @@ import { PageSection } from 
"@patternfly/react-core/dist/js/components/Page";
 import { Text, TextContent, TextVariants } from 
"@patternfly/react-core/dist/js/components/Text";
 import { Label } from "@patternfly/react-core/dist/js/components/Label";
 import { useEditorEnvelopeLocator } from 
"../envelopeLocator/hooks/EditorEnvelopeLocatorContext";
-import { useNavigate, Link } from "react-router-dom";
+import { useNavigate, Link } from "react-router";
 import { Button, ButtonVariant } from 
"@patternfly/react-core/dist/js/components/Button";
 import { Card, CardBody, CardFooter, CardHeader, CardTitle } from 
"@patternfly/react-core/dist/js/components/Card";
 import { Flex, FlexItem } from "@patternfly/react-core/dist/js/layouts/Flex";
diff --git a/packages/online-editor/src/home/UploadCard.tsx 
b/packages/online-editor/src/home/UploadCard.tsx
index fb7a16f1820..444ef969d4f 100644
--- a/packages/online-editor/src/home/UploadCard.tsx
+++ b/packages/online-editor/src/home/UploadCard.tsx
@@ -26,7 +26,7 @@ import { Bullseye } from 
"@patternfly/react-core/dist/js/layouts/Bullseye";
 import { Card, CardBody, CardFooter, CardTitle } from 
"@patternfly/react-core/dist/js/components/Card";
 import { Text, TextContent, TextVariants } from 
"@patternfly/react-core/dist/js/components/Text";
 import { useRoutes } from "../navigation/Hooks";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { Button, ButtonVariant } from 
"@patternfly/react-core/dist/js/components/Button";
 import { Spinner } from "@patternfly/react-core/dist/js/components/Spinner";
 import { UploadIcon } from "@patternfly/react-icons/dist/js/icons/upload-icon";
diff --git 
a/packages/online-editor/src/importFromUrl/ImportFromUrlHomePageCard.tsx 
b/packages/online-editor/src/importFromUrl/ImportFromUrlHomePageCard.tsx
index a012eb7acea..24245343f02 100644
--- a/packages/online-editor/src/importFromUrl/ImportFromUrlHomePageCard.tsx
+++ b/packages/online-editor/src/importFromUrl/ImportFromUrlHomePageCard.tsx
@@ -28,7 +28,7 @@ import { CodeIcon } from 
"@patternfly/react-icons/dist/js/icons/code-icon";
 import { ExclamationCircleIcon } from 
"@patternfly/react-icons/dist/js/icons/exclamation-circle-icon";
 import * as React from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { AccountsDispatchActionKind, useAccountsDispatch } from 
"../accounts/AccountsContext";
 import { useAuthProviders } from "../authProviders/AuthProvidersContext";
 import { AUTH_SESSION_NONE, AuthSession } from 
"../authSessions/AuthSessionApi";
diff --git a/packages/online-editor/src/importFromUrl/ImportableUrlHooks.tsx 
b/packages/online-editor/src/importFromUrl/ImportableUrlHooks.tsx
index 3d00ec2a06c..e18dc5d2068 100644
--- a/packages/online-editor/src/importFromUrl/ImportableUrlHooks.tsx
+++ b/packages/online-editor/src/importFromUrl/ImportableUrlHooks.tsx
@@ -26,7 +26,7 @@ import { Flex, FlexItem } from 
"@patternfly/react-core/dist/js/layouts/Flex";
 import { extname } from "path";
 import * as React from "react";
 import { useCallback, useMemo } from "react";
-import { matchPath } from "react-router-dom";
+import { matchPath } from "react-router";
 import { AuthProviderIcon } from "../authProviders/AuthProviderIcon";
 import { useAuthProvider, useAuthProviders } from 
"../authProviders/AuthProvidersContext";
 import { AuthSession, AUTH_SESSION_NONE } from 
"../authSessions/AuthSessionApi";
diff --git 
a/packages/online-editor/src/importFromUrl/NewWorkspaceFromUrlPage.tsx 
b/packages/online-editor/src/importFromUrl/NewWorkspaceFromUrlPage.tsx
index f2957cc9dd9..4ea31ea4cbc 100644
--- a/packages/online-editor/src/importFromUrl/NewWorkspaceFromUrlPage.tsx
+++ b/packages/online-editor/src/importFromUrl/NewWorkspaceFromUrlPage.tsx
@@ -24,7 +24,7 @@ import { Text, TextContent, TextVariants } from 
"@patternfly/react-core/dist/js/
 import { Bullseye } from "@patternfly/react-core/dist/js/layouts/Bullseye";
 import { basename } from "path";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { EditorPageErrorPage } from "../editor/EditorPageErrorPage";
 import { useRoutes } from "../navigation/Hooks";
 import { QueryParams } from "../navigation/Routes";
diff --git 
a/packages/online-editor/src/importFromUrl/NewWorkspaceWithEmptyFilePage.tsx 
b/packages/online-editor/src/importFromUrl/NewWorkspaceWithEmptyFilePage.tsx
index 0b3a6f6ffdf..ad8ca400b71 100644
--- a/packages/online-editor/src/importFromUrl/NewWorkspaceWithEmptyFilePage.tsx
+++ b/packages/online-editor/src/importFromUrl/NewWorkspaceWithEmptyFilePage.tsx
@@ -20,7 +20,7 @@
 import * as React from "react";
 import { useWorkspaces } from 
"@kie-tools-core/workspaces-git-fs/dist/context/WorkspacesContext";
 import { useEffect } from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router";
 import { useRoutes } from "../navigation/Hooks";
 import { OnlineEditorPage } from "../pageTemplate/OnlineEditorPage";
 import { PageSection } from "@patternfly/react-core/dist/js/components/Page";
diff --git 
a/packages/online-editor/src/navigation/NavigationContextProvider.tsx 
b/packages/online-editor/src/navigation/NavigationContextProvider.tsx
index e5ad4f940d1..d0ff5cd5e63 100644
--- a/packages/online-editor/src/navigation/NavigationContextProvider.tsx
+++ b/packages/online-editor/src/navigation/NavigationContextProvider.tsx
@@ -19,7 +19,7 @@
 
 import * as React from "react";
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { useBlocker, Location } from "react-router-dom";
+import { useBlocker, Location } from "react-router";
 
 export type BlockerDelegate = (args: { location: Location }) => boolean;
 
diff --git a/packages/online-editor/src/pageTemplate/OnlineEditorPage.tsx 
b/packages/online-editor/src/pageTemplate/OnlineEditorPage.tsx
index f7ff99080d7..67f85e82e0c 100644
--- a/packages/online-editor/src/pageTemplate/OnlineEditorPage.tsx
+++ b/packages/online-editor/src/pageTemplate/OnlineEditorPage.tsx
@@ -22,7 +22,7 @@ import { PageHeaderToolsItem } from 
"@patternfly/react-core/deprecated";
 
 import * as React from "react";
 import { useRoutes } from "../navigation/Hooks";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { Masthead, MastheadBrand, MastheadMain } from 
"@patternfly/react-core/dist/js/components/Masthead";
 import { SettingsButton } from "../settings/SettingsButton";
 import { Flex } from "@patternfly/react-core/dist/js/layouts/Flex";
diff --git a/packages/online-editor/src/queryParams/QueryParamsContext.ts 
b/packages/online-editor/src/queryParams/QueryParamsContext.ts
index f75a746caa8..255b5df9917 100644
--- a/packages/online-editor/src/queryParams/QueryParamsContext.ts
+++ b/packages/online-editor/src/queryParams/QueryParamsContext.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import { useMemo } from "react";
 import { newQueryParamsImpl, QueryParamsImpl } from "../navigation/Routes";
 
diff --git a/packages/online-editor/src/settings/SettingsContext.tsx 
b/packages/online-editor/src/settings/SettingsContext.tsx
index d1419ffd5eb..09f7ba05c77 100644
--- a/packages/online-editor/src/settings/SettingsContext.tsx
+++ b/packages/online-editor/src/settings/SettingsContext.tsx
@@ -24,7 +24,7 @@ import { decoder, encoder } from 
"@kie-tools-core/workspaces-git-fs/dist/encoder
 import { LfsFsCache } from 
"@kie-tools-core/workspaces-git-fs/dist/lfs/LfsFsCache";
 import { LfsStorageFile, LfsStorageService } from 
"@kie-tools-core/workspaces-git-fs/dist/lfs/LfsStorageService";
 import { createContext, PropsWithChildren, useCallback, useContext, useEffect, 
useMemo, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useEnv } from "../env/hooks/EnvContext";
 import { QueryParams } from "../navigation/Routes";
 import { useQueryParams } from "../queryParams/QueryParamsContext";
diff --git 
a/packages/online-editor/src/workspace/components/WorkspaceStatusIndicator.tsx 
b/packages/online-editor/src/workspace/components/WorkspaceStatusIndicator.tsx
index 1324aefcc3a..d084fbb90a7 100644
--- 
a/packages/online-editor/src/workspace/components/WorkspaceStatusIndicator.tsx
+++ 
b/packages/online-editor/src/workspace/components/WorkspaceStatusIndicator.tsx
@@ -30,7 +30,7 @@ import { OutlinedClockIcon } from 
"@patternfly/react-icons/dist/js/icons/outline
 import { SecurityIcon } from 
"@patternfly/react-icons/dist/js/icons/security-icon";
 import { CheckCircleIcon } from 
"@patternfly/react-icons/dist/js/icons/check-circle-icon";
 import { useNavigationBlocker, useRoutes } from "../../navigation/Hooks";
-import { matchPath } from "react-router-dom";
+import { matchPath } from "react-router";
 import { WorkspaceFile } from 
"@kie-tools-core/workspaces-git-fs/dist/context/WorkspacesContext";
 import { switchExpression } from "@kie-tools-core/switch-expression-ts";
 import { Flex, FlexItem } from "@patternfly/react-core/dist/js/layouts/Flex";
diff --git a/packages/pmml-editor/package.json 
b/packages/pmml-editor/package.json
index 4379cecab77..a970d6ed8ac 100644
--- a/packages/pmml-editor/package.json
+++ b/packages/pmml-editor/package.json
@@ -51,7 +51,7 @@
     "react-cool-onclickoutside": "^1.6.1",
     "react-monaco-editor": "^0.49.0",
     "react-redux": "^9.1.2",
-    "react-router-dom": "^6.30.4",
+    "react-router": "^7.18.0",
     "react-sortable-hoc": "^2.0.0",
     "react-transition-group": "^4.4.1",
     "redux": "^4.1.0",
diff --git a/packages/pmml-editor/src/editor/PMMLEditor.tsx 
b/packages/pmml-editor/src/editor/PMMLEditor.tsx
index 0c6bdc5dfd5..6ab46da9df1 100644
--- a/packages/pmml-editor/src/editor/PMMLEditor.tsx
+++ b/packages/pmml-editor/src/editor/PMMLEditor.tsx
@@ -35,7 +35,7 @@ import mergeReducers from "combine-reducer";
 import { HistoryContext, HistoryService } from "./history";
 import { LandingPage } from "./components/LandingPage/templates";
 import { Page } from "@patternfly/react-core/dist/js/components/Page";
-import { HashRouter, Navigate, Route, Routes } from "react-router-dom";
+import { HashRouter, Navigate, Route, Routes } from "react-router";
 import { EmptyStateNoContent } from "./components/LandingPage/organisms";
 import { SingleEditorRouter } from "./components/EditorCore/organisms";
 import { PMMLModelMapping, PMMLModels, SupportedCapability } from 
"./PMMLModelHelper";
diff --git 
a/packages/pmml-editor/src/editor/components/EditorCore/organisms/SingleEditorRouter.tsx
 
b/packages/pmml-editor/src/editor/components/EditorCore/organisms/SingleEditorRouter.tsx
index 88d9520d030..c18d6df255b 100644
--- 
a/packages/pmml-editor/src/editor/components/EditorCore/organisms/SingleEditorRouter.tsx
+++ 
b/packages/pmml-editor/src/editor/components/EditorCore/organisms/SingleEditorRouter.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import * as React from "react";
-import { useParams } from "react-router-dom";
+import { useParams } from "react-router";
 import { ScorecardEditorPage } from "../../EditorScorecard/templates";
 import { getModelType, isSupportedModelType } from "../../..";
 import { Model, PMML } from "@kie-tools/pmml-editor-marshaller";
diff --git 
a/packages/pmml-editor/src/editor/components/LandingPage/templates/LandingPage.tsx
 
b/packages/pmml-editor/src/editor/components/LandingPage/templates/LandingPage.tsx
index fb70aca05c4..115af0ba337 100644
--- 
a/packages/pmml-editor/src/editor/components/LandingPage/templates/LandingPage.tsx
+++ 
b/packages/pmml-editor/src/editor/components/LandingPage/templates/LandingPage.tsx
@@ -27,7 +27,7 @@ import { useSelector } from "react-redux";
 import { getModelName, getModelType, isSupportedModelType, ModelType } from 
"../../..";
 import { LandingPageHeader, LandingPageToolbar, ModelCard } from 
"../molecules";
 import { Actions } from "../../../reducers";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useBatchDispatch, useHistoryService } from "../../../history";
 
 interface LandingPageProps {
diff --git 
a/packages/pmml-editor/tests/editor/components/LandingPage/templates/LandingPage.test.tsx
 
b/packages/pmml-editor/tests/editor/components/LandingPage/templates/LandingPage.test.tsx
index 5a557b78dd6..2dea1585844 100644
--- 
a/packages/pmml-editor/tests/editor/components/LandingPage/templates/LandingPage.test.tsx
+++ 
b/packages/pmml-editor/tests/editor/components/LandingPage/templates/LandingPage.test.tsx
@@ -16,23 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { fireEvent, render, waitFor } from "@testing-library/react";
+import { fireEvent, render } from "@testing-library/react";
 import * as React from "react";
 import { LandingPage } from 
"@kie-tools/pmml-editor/dist/editor/components/LandingPage/templates";
 import { Provider } from "react-redux";
 import { createStore, Store } from "redux";
 import { PMML, Scorecard, TreeModel } from "@kie-tools/pmml-editor-marshaller";
-import { BrowserRouter } from "react-router-dom";
+import { BrowserRouter } from "react-router";
 
 const PATH: string = "path";
 
-jest.mock("react-router-dom", () => ({
-  ...jest.requireActual("react-router-dom"),
-  useHistory: () => ({
-    push: jest.fn(),
-  }),
-}));
-
 describe("LandingPage", () => {
   test("render::No Models", () => {
     const pmml: PMML = { version: "1.0", DataDictionary: { DataField: [] }, 
Header: {} };
diff --git a/packages/pmml-editor/tests/jest.setup.ts 
b/packages/pmml-editor/tests/jest.setup.ts
index f3de619e966..7e335db90bc 100644
--- a/packages/pmml-editor/tests/jest.setup.ts
+++ b/packages/pmml-editor/tests/jest.setup.ts
@@ -18,7 +18,10 @@
  */
 
 import "@testing-library/jest-dom";
+import { TextEncoder } from "util";
 import { enableMapSet, enablePatches } from "immer";
 
+global.TextEncoder = TextEncoder;
+
 enableMapSet();
 enablePatches();
diff --git a/packages/pmml-editor/tsconfig.tests.json 
b/packages/pmml-editor/tsconfig.tests.json
index 1b2aedc6d23..55f09e910b5 100644
--- a/packages/pmml-editor/tsconfig.tests.json
+++ b/packages/pmml-editor/tsconfig.tests.json
@@ -1,6 +1,6 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "types": ["@testing-library/jest-dom"]
+    "types": ["@testing-library/jest-dom", "node"]
   }
 }
diff --git a/packages/runtime-tools-components/package.json 
b/packages/runtime-tools-components/package.json
index de815d14402..ef88ab18a50 100644
--- a/packages/runtime-tools-components/package.json
+++ b/packages/runtime-tools-components/package.json
@@ -43,7 +43,7 @@
     "monaco-editor": "^0.39.0",
     "react-datetime-picker": "^3.5.0",
     "react-moment": "0.9.7",
-    "react-router-dom": "^6.30.4",
+    "react-router": "^7.18.0",
     "uniforms": "^3.10.2",
     "uniforms-bridge-json-schema": "^3.10.2",
     "uuid": "^14.0.0"
diff --git 
a/packages/runtime-tools-components/src/components/PageSectionHeader/PageSectionHeader.tsx
 
b/packages/runtime-tools-components/src/components/PageSectionHeader/PageSectionHeader.tsx
index 7770a62d12b..6650ac5027b 100644
--- 
a/packages/runtime-tools-components/src/components/PageSectionHeader/PageSectionHeader.tsx
+++ 
b/packages/runtime-tools-components/src/components/PageSectionHeader/PageSectionHeader.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import * as React from "react";
-import { Link, Location } from "react-router-dom";
+import { Link, Location } from "react-router";
 import { useMemo, ReactElement } from "react";
 import { PageSection } from "@patternfly/react-core/dist/js/components/Page";
 import { Breadcrumb, BreadcrumbItem } from 
"@patternfly/react-core/dist/js/components/Breadcrumb";
diff --git a/packages/runtime-tools-management-console-webapp/package.json 
b/packages/runtime-tools-management-console-webapp/package.json
index 9b5c07fb6e8..fde296c95e6 100644
--- a/packages/runtime-tools-management-console-webapp/package.json
+++ b/packages/runtime-tools-management-console-webapp/package.json
@@ -51,7 +51,7 @@
     "react-apollo": "3.1.3",
     "react-apollo-hooks": "^0.5.0",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.30.4"
+    "react-router": "^7.18.0"
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",
diff --git 
a/packages/runtime-tools-management-console-webapp/src/authSessions/components/AuthSessionSelect.tsx
 
b/packages/runtime-tools-management-console-webapp/src/authSessions/components/AuthSessionSelect.tsx
index 6515f13046a..7f9504fda52 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/authSessions/components/AuthSessionSelect.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/authSessions/components/AuthSessionSelect.tsx
@@ -30,7 +30,7 @@ import { Flex, FlexItem } from 
"@patternfly/react-core/dist/js/layouts/Flex";
 import { Tooltip } from "@patternfly/react-core/dist/js/components/Tooltip";
 import { AuthSessionStatus, getAuthSessionDisplayInfo } from 
"../AuthSessionApi";
 import { useRoutes } from "../../navigation/Hooks";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 
 export type AuthSessionSelectProps = {
   isPlain: boolean;
diff --git 
a/packages/runtime-tools-management-console-webapp/src/authSessions/components/NewAuthSessionLoginSuccessPage.tsx
 
b/packages/runtime-tools-management-console-webapp/src/authSessions/components/NewAuthSessionLoginSuccessPage.tsx
index 849dd03453e..cf6bcb023bd 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/authSessions/components/NewAuthSessionLoginSuccessPage.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/authSessions/components/NewAuthSessionLoginSuccessPage.tsx
@@ -19,7 +19,7 @@
 
 import React, { useEffect, useRef, useState } from "react";
 import { useAuthSessions, useAuthSessionsDispatch } from 
"../AuthSessionsContext";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { AuthSessionsService } from "../AuthSessionsService";
 import { ManagementConsolePageLayout } from 
"../../managementConsole/ManagementConsolePageLayout";
 import { useRoutes } from "../../navigation/Hooks";
diff --git a/packages/runtime-tools-management-console-webapp/src/jobs/Jobs.tsx 
b/packages/runtime-tools-management-console-webapp/src/jobs/Jobs.tsx
index 84ccc69353f..96bd0a5e179 100644
--- a/packages/runtime-tools-management-console-webapp/src/jobs/Jobs.tsx
+++ b/packages/runtime-tools-management-console-webapp/src/jobs/Jobs.tsx
@@ -22,7 +22,7 @@ import {
   JobsManagementState,
 } from 
"@kie-tools/runtime-tools-process-enveloped-components/dist/jobsManagement";
 import { useJobsManagementChannelApi } from 
"@kie-tools/runtime-tools-process-webapp-components/dist/JobsManagement";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
 import { useQueryParam, useQueryParams } from 
"../navigation/queryParams/QueryParamsContext";
 import { RuntimePathSearchParamsRoutes, useRuntimeDispatch } from 
"../runtime/RuntimeContext";
 import { QueryParams } from "../navigation/Routes";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/jobs/JobsPage.tsx 
b/packages/runtime-tools-management-console-webapp/src/jobs/JobsPage.tsx
index e5d2c707c88..531665be8c2 100644
--- a/packages/runtime-tools-management-console-webapp/src/jobs/JobsPage.tsx
+++ b/packages/runtime-tools-management-console-webapp/src/jobs/JobsPage.tsx
@@ -20,7 +20,7 @@ import React, { useEffect } from "react";
 import { Card } from "@patternfly/react-core/dist/js/components/Card";
 import { Jobs } from "./Jobs";
 import { AuthSession, useAuthSessionsDispatch } from "../authSessions";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useRuntimeInfo, useRuntimeSpecificRoutes } from 
"../runtime/RuntimeContext";
 import { useEnv } from "../env/hooks/EnvContext";
 import { useRuntimePageLayoutDispatch } from 
"../runtime/RuntimePageLayoutContext";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsole.tsx
 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsole.tsx
index 9eec75663d9..b546e522adc 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsole.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsole.tsx
@@ -18,7 +18,7 @@
  */
 
 import React from "react";
-import { BrowserRouter } from "react-router-dom";
+import { BrowserRouter } from "react-router";
 import { AuthSessionsContextProvider } from 
"../authSessions/AuthSessionsContext";
 import { ManagementConsoleRoutes } from "./ManagementConsoleRoutes";
 import { EnvContextProvider } from "../env/hooks/EnvContextProvider";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleHome.tsx
 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleHome.tsx
index 3a8b344f9f9..685310f5700 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleHome.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleHome.tsx
@@ -35,7 +35,7 @@ import { CubesIcon } from 
"@patternfly/react-icons/dist/js/icons/cubes-icon";
 import { PlusIcon } from "@patternfly/react-icons/dist/js/icons/plus-icon";
 import { useEnv } from "../env/hooks/EnvContext";
 import { AuthSession, AuthSessionsList, isOpenIdConnectAuthSession } from 
"../authSessions";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useRoutes } from "../navigation/Hooks";
 import { Flex } from "@patternfly/react-core/dist/js/layouts/Flex";
 import { Divider } from "@patternfly/react-core/dist/js/components/Divider";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsolePageLayout.tsx
 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsolePageLayout.tsx
index 73fe9afcc2e..b64b1a8f033 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsolePageLayout.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsolePageLayout.tsx
@@ -22,7 +22,7 @@ import { Page, PageSection, PageSidebar, PageSidebarBody } 
from "@patternfly/rea
 import { PageHeader, PageHeaderTools } from 
"@patternfly/react-core/deprecated";
 import { useEnv } from "../env/hooks/EnvContext";
 import { useRoutes } from "../navigation/Hooks";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { ManagementConsoleToolbar } from "./ManagementConsoleToolbar";
 import { AboutButton } from "../aboutModal/AboutButton";
 import { PageSectionHeader } from 
"@kie-tools/runtime-tools-components/dist/components/PageSectionHeader";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleRoutes.tsx
 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleRoutes.tsx
index 7c2a2d0998e..7b8ec31fada 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleRoutes.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/managementConsole/ManagementConsoleRoutes.tsx
@@ -17,9 +17,9 @@
  * under the License.
  */
 import React, { FC, useCallback } from "react";
-import { Outlet, Route } from "react-router-dom";
+import { Outlet, Route } from "react-router";
 import { ProcessListPage, ProcessDefinitionsListPage } from "../process";
-import { Routes, useNavigate, useLocation, useParams } from "react-router-dom";
+import { Routes, useNavigate, useLocation, useParams } from "react-router";
 import { ManagementConsoleHome } from "./ManagementConsoleHome";
 import { NewAuthSessionLoginSuccessPage, NewAuthSessionModal } from 
"../authSessions/components";
 import { useRoutes } from "../navigation/Hooks";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/navigation/queryParams/QueryParamsContext.ts
 
b/packages/runtime-tools-management-console-webapp/src/navigation/queryParams/QueryParamsContext.ts
index 73c98b9c16f..bfcce8c5d15 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/navigation/queryParams/QueryParamsContext.ts
+++ 
b/packages/runtime-tools-management-console-webapp/src/navigation/queryParams/QueryParamsContext.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import { useMemo } from "react";
 import { newQueryParamsImpl, QueryParamsImpl } from "../Routes";
 
diff --git 
a/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsList.tsx
 
b/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsList.tsx
index 332c0c28574..c800c3e5fee 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsList.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsList.tsx
@@ -22,7 +22,7 @@ import {
   ProcessDefinitionsFilter,
   ProcessDefinitionsListState,
 } from 
"@kie-tools/runtime-tools-process-enveloped-components/dist/processDefinitionsList";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useQueryParam, useQueryParams } from 
"../../navigation/queryParams/QueryParamsContext";
 import { QueryParams } from "../../navigation/Routes";
 import { RuntimePathSearchParamsRoutes, useRuntimeDispatch } from 
"../../runtime/RuntimeContext";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsListPage.tsx
 
b/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsListPage.tsx
index 20d27d20c93..69e4e202041 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsListPage.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/process/definitions/ProcessDefinitionsListPage.tsx
@@ -21,7 +21,7 @@ import { Card } from 
"@patternfly/react-core/dist/js/components/Card";
 import { ProcessDefinitionsList } from "./ProcessDefinitionsList";
 import { useRuntimeInfo, useRuntimeSpecificRoutes } from 
"../../runtime/RuntimeContext";
 import { AuthSession, useAuthSessionsDispatch } from "../../authSessions";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useRoutes } from "../../navigation/Hooks";
 import { useEnv } from "../../env/hooks/EnvContext";
 import { useRuntimePageLayoutDispatch } from 
"../../runtime/RuntimePageLayoutContext";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetails.tsx
 
b/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetails.tsx
index d6d7e7e3e69..1a515ea4ac6 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetails.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetails.tsx
@@ -37,7 +37,7 @@ import { useCancelableEffect } from 
"@kie-tools-core/react-hooks/dist/useCancela
 import { EmbeddedProcessDetails } from 
"@kie-tools/runtime-tools-process-enveloped-components/dist/processDetails";
 import { useProcessDetailsChannelApi } from 
"@kie-tools/runtime-tools-process-webapp-components/dist/ProcessDetails";
 import { useRuntimeSpecificRoutes } from "../../runtime/RuntimeContext";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 
 interface Props {
   processInstanceId: string;
diff --git 
a/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetailsPage.tsx
 
b/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetailsPage.tsx
index 02a0d837949..f67152d863e 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetailsPage.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/process/details/ProcessDetailsPage.tsx
@@ -20,7 +20,7 @@ import React, { useCallback, useEffect } from "react";
 import { ProcessDetails } from "./ProcessDetails";
 import { useRuntimeInfo, useRuntimeSpecificRoutes } from 
"../../runtime/RuntimeContext";
 import { AuthSession, useAuthSessionsDispatch } from "../../authSessions";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router";
 import { KogitoSpinner } from 
"@kie-tools/runtime-tools-components/dist/components/KogitoSpinner";
 import { useEnv } from "../../env/hooks/EnvContext";
 import { useRoutes } from "../../navigation/Hooks";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/process/form/ProcessDefinitionFormPage.tsx
 
b/packages/runtime-tools-management-console-webapp/src/process/form/ProcessDefinitionFormPage.tsx
index 094a84c693d..3ddcdbc2fee 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/process/form/ProcessDefinitionFormPage.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/process/form/ProcessDefinitionFormPage.tsx
@@ -20,7 +20,7 @@ import React, { useCallback, useEffect } from "react";
 import { ProcessDefinitionForm } from "./ProcessDefinitionForm";
 import { useRuntimeInfo, useRuntimeSpecificRoutes } from 
"../../runtime/RuntimeContext";
 import { AuthSession, useAuthSessionsDispatch } from "../../authSessions";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router";
 import { KogitoSpinner } from 
"@kie-tools/runtime-tools-components/dist/components/KogitoSpinner";
 import { useEnv } from "../../env/hooks/EnvContext";
 import { useRoutes } from "../../navigation/Hooks";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/process/list/ProcessList.tsx
 
b/packages/runtime-tools-management-console-webapp/src/process/list/ProcessList.tsx
index 601f4077fab..32779cdba62 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/process/list/ProcessList.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/process/list/ProcessList.tsx
@@ -28,7 +28,7 @@ import {
   EmbeddedProcessList,
   ProcessListState,
 } from 
"@kie-tools/runtime-tools-process-enveloped-components/dist/processList";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
 import { OrderBy } from 
"@kie-tools/runtime-tools-shared-gateway-api/dist/types";
 import { useQueryParam, useQueryParams } from 
"../../navigation/queryParams/QueryParamsContext";
 import { QueryParams } from "../../navigation/Routes";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/process/list/ProcessListPage.tsx
 
b/packages/runtime-tools-management-console-webapp/src/process/list/ProcessListPage.tsx
index 97f4d8e1a62..2e0d1ef1703 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/process/list/ProcessListPage.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/process/list/ProcessListPage.tsx
@@ -21,7 +21,7 @@ import { Card } from 
"@patternfly/react-core/dist/js/components/Card";
 import { ProcessList } from "./ProcessList";
 import { useRuntimeInfo, useRuntimeSpecificRoutes } from 
"../../runtime/RuntimeContext";
 import { AuthSession, useAuthSessionsDispatch } from "../../authSessions";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useRoutes } from "../../navigation/Hooks";
 import { useEnv } from "../../env/hooks/EnvContext";
 import { useRuntimePageLayoutDispatch } from 
"../../runtime/RuntimePageLayoutContext";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeContext.tsx
 
b/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeContext.tsx
index 8a14fc4654c..95752d18913 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeContext.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeContext.tsx
@@ -28,7 +28,7 @@ import {
   isUnauthenticatedAuthSession,
   OpenIDConnectAuthSession,
 } from "../authSessions/AuthSessionApi";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
 import { useRoutes } from "../navigation/Hooks";
 import ApolloClient from "apollo-client";
 import { InMemoryCache, NormalizedCacheObject } from "apollo-cache-inmemory";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeNav.tsx 
b/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeNav.tsx
index 5c0a8beb666..36f7b194093 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeNav.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/runtime/RuntimeNav.tsx
@@ -18,7 +18,7 @@
  */
 import React from "react";
 import { Nav, NavItem, NavList } from 
"@patternfly/react-core/dist/js/components/Nav";
-import { Link, useLocation } from "react-router-dom";
+import { Link, useLocation } from "react-router";
 import { useRuntimeSpecificRoutes } from "./RuntimeContext";
 
 export const RuntimeNav: React.FC = () => {
diff --git 
a/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetails.tsx 
b/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetails.tsx
index 50bcaad5174..13fb7b41c60 100644
--- a/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetails.tsx
+++ b/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetails.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useCallback, useMemo, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import {
   Drawer,
   DrawerActions,
diff --git 
a/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetailsPage.tsx
 
b/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetailsPage.tsx
index b9ff5c91d72..68e88f533ed 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetailsPage.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/tasks/TaskDetailsPage.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useCallback, useEffect } from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router";
 import { useRuntimeInfo, useRuntimeSpecificRoutes } from 
"../runtime/RuntimeContext";
 import { AuthSession, useAuthSessionsDispatch } from "../authSessions";
 import { useEnv } from "../env/hooks/EnvContext";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/tasks/Tasks.tsx 
b/packages/runtime-tools-management-console-webapp/src/tasks/Tasks.tsx
index f6a7cb22c98..f899ac6f038 100644
--- a/packages/runtime-tools-management-console-webapp/src/tasks/Tasks.tsx
+++ b/packages/runtime-tools-management-console-webapp/src/tasks/Tasks.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect, useMemo } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { EmbeddedTaskList } from 
"@kie-tools/runtime-tools-process-enveloped-components/dist/taskList";
 import { getActiveTaskStates, getAllTaskStates } from 
"@kie-tools/runtime-tools-process-webapp-components/dist/utils";
 import {
@@ -29,7 +29,7 @@ import { TaskListState } from 
"@kie-tools/runtime-tools-process-enveloped-compon
 import { RuntimePathSearchParamsRoutes, useRuntimeDispatch } from 
"../runtime/RuntimeContext";
 import { useQueryParam, useQueryParams } from 
"../navigation/queryParams/QueryParamsContext";
 import { QueryParams } from "../navigation/Routes";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import { useTaskListChannelApi } from 
"@kie-tools/runtime-tools-process-webapp-components/dist/TaskList";
 
 interface Props {
diff --git 
a/packages/runtime-tools-management-console-webapp/src/tasks/TasksPage.tsx 
b/packages/runtime-tools-management-console-webapp/src/tasks/TasksPage.tsx
index a8bb35e38c7..e7aacbdb208 100644
--- a/packages/runtime-tools-management-console-webapp/src/tasks/TasksPage.tsx
+++ b/packages/runtime-tools-management-console-webapp/src/tasks/TasksPage.tsx
@@ -21,7 +21,7 @@ import { Card } from 
"@patternfly/react-core/dist/js/components/Card";
 import { Tasks } from "./Tasks";
 import { useEnv } from "../env/hooks/EnvContext";
 import { useRuntimeInfo, useRuntimeSpecificRoutes } from 
"../runtime/RuntimeContext";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useRoutes } from "../navigation/Hooks";
 import { AuthSession, useAuthSessionsDispatch } from "../authSessions";
 import { useRuntimePageLayoutDispatch } from 
"../runtime/RuntimePageLayoutContext";
diff --git 
a/packages/runtime-tools-management-console-webapp/src/tasks/components/ImpersonationPageSection.tsx
 
b/packages/runtime-tools-management-console-webapp/src/tasks/components/ImpersonationPageSection.tsx
index 41dd6426aa5..1b5876ff7cc 100644
--- 
a/packages/runtime-tools-management-console-webapp/src/tasks/components/ImpersonationPageSection.tsx
+++ 
b/packages/runtime-tools-management-console-webapp/src/tasks/components/ImpersonationPageSection.tsx
@@ -31,7 +31,7 @@ import { TextInput } from 
"@patternfly/react-core/dist/js/components/TextInput";
 import UserTagIcon from "@patternfly/react-icons/dist/esm/icons/user-tag-icon";
 import UserIcon from "@patternfly/react-icons/dist/js/icons/user-icon";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
 import { AuthSessionType, getAuthSessionDisplayInfo, useAuthSessions } from 
"../../authSessions";
 import { QueryParams } from "../../navigation/Routes";
 import { useQueryParams } from 
"../../navigation/queryParams/QueryParamsContext";
diff --git a/packages/runtime-tools-process-dev-ui-webapp/package.json 
b/packages/runtime-tools-process-dev-ui-webapp/package.json
index 3357cf9a933..6dd0de19b03 100644
--- a/packages/runtime-tools-process-dev-ui-webapp/package.json
+++ b/packages/runtime-tools-process-dev-ui-webapp/package.json
@@ -48,7 +48,7 @@
     "react-apollo-hooks": "^0.5.0",
     "react-dom": "^18.3.1",
     "react-moment": "0.9.7",
-    "react-router-dom": "^6.30.4",
+    "react-router": "^7.18.0",
     "util": "^0.12.5",
     "uuid": "^14.0.0"
   },
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx
index 7628edab80b..fa1bdd17f71 100755
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUILayout/DevUILayout.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from "react";
-import { MemoryRouter, Route, Routes } from "react-router-dom";
+import { MemoryRouter, Route, Routes } from "react-router";
 import { ApolloProvider } from "react-apollo";
 import { ApolloClient } from "apollo-client";
 import DevUINav from "../DevUINav/DevUINav";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx
index 84cab11b9e3..2154eaf51ca 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUINav/DevUINav.tsx
@@ -18,7 +18,7 @@
  */
 import React from "react";
 import { Nav, NavItem, NavList } from 
"@patternfly/react-core/dist/js/components/Nav";
-import { Link, useLocation } from "react-router-dom";
+import { Link, useLocation } from "react-router";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import { ouiaAttribute } from 
"@kie-tools/runtime-tools-components/dist/ouiaTools";
 
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx
index c15b30553f7..4e19b97fd8c 100755
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/DevUI/DevUIRoutes/DevUIRoutes.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React from "react";
-import { Navigate, Route, Routes } from "react-router-dom";
+import { Navigate, Route, Routes } from "react-router";
 import { JobsManagementPage, ProcessesPage } from "../../pages";
 import ProcessDetailsPage from 
"../../pages/ProcessDetailsPage/ProcessDetailsPage";
 import TaskListPage from "../../pages/TaskListPage/TaskListPage";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx
index dea2fcb02bd..ab3aa554dae 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/FormsListContainer/FormsListContainer.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import { FormInfo } from 
"@kie-tools/runtime-tools-shared-gateway-api/dist/types";
 import { EmbeddedFormsList } from 
"@kie-tools/runtime-tools-process-enveloped-components/dist/formsList";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx
index 2465be8f3b8..2427dc21ef1 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDefinitionListContainer/ProcessDefinitionListContainer.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect, useMemo } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import { ProcessDefinition } from 
"@kie-tools/runtime-tools-process-gateway-api/dist/types";
 import {
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
index 81eb2e99a32..37cbd45b29c 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessDetailsContainer/ProcessDetailsContainer.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import { ProcessInstance } from 
"@kie-tools/runtime-tools-process-gateway-api/dist/types";
 import { useProcessDetailsChannelApi } from 
"@kie-tools/runtime-tools-process-webapp-components/dist/ProcessDetails";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
index 619c7d66d29..d633c0db688 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/ProcessListContainer/ProcessListContainer.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import {
   EmbeddedProcessList,
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/TaskListContainer/TaskListContainer.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/TaskListContainer/TaskListContainer.tsx
index 6eb58f29ca4..75637ed11b2 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/TaskListContainer/TaskListContainer.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/containers/TaskListContainer/TaskListContainer.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import { useTaskListChannelApi } from 
"@kie-tools/runtime-tools-process-webapp-components/dist/TaskList";
 import { EmbeddedTaskList, TaskListApi } from 
"@kie-tools/runtime-tools-process-enveloped-components/dist/taskList";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx
index a95ba404545..8a76b9ccaf3 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/FormDetailsPage/FormDetailsPage.tsx
@@ -24,7 +24,7 @@ import { Text, TextVariants } from 
"@patternfly/react-core/dist/js/components/Te
 import { OUIAProps, ouiaPageTypeAndObjectId } from 
"@kie-tools/runtime-tools-components/dist/ouiaTools";
 import FormDetailsContainer from 
"../../containers/FormDetailsContainer/FormDetailsContainer";
 import "../../styles.css";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import Moment from "react-moment";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import { FormInfo } from 
"@kie-tools/runtime-tools-shared-gateway-api/dist/types";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
index 6c216b904a6..a3c89baef2e 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessDetailsPage/ProcessDetailsPage.tsx
@@ -25,7 +25,7 @@ import { ServerErrors } from 
"@kie-tools/runtime-tools-components/dist/component
 import { KogitoSpinner } from 
"@kie-tools/runtime-tools-components/dist/components/KogitoSpinner";
 import ProcessDetailsContainer from 
"../../containers/ProcessDetailsContainer/ProcessDetailsContainer";
 import { useProcessDetailsChannelApi } from 
"@kie-tools/runtime-tools-process-webapp-components/dist/ProcessDetails";
-import { useLocation, useNavigate, useParams } from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "react-router";
 import "../../styles.css";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
 import {
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx
index 18c051f2931..58aeafa8d43 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessFormPage/ProcessFormPage.tsx
@@ -19,7 +19,7 @@
 import React, { useState, useCallback, useMemo, ReactElement } from "react";
 import { PageSection } from "@patternfly/react-core/dist/js/components/Page";
 import ProcessFormContainer from 
"../../containers/ProcessFormContainer/ProcessFormContainer";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
 import { InlineEdit } from "./components/InlineEdit/InlineEdit";
 import { ProcessDefinition } from 
"@kie-tools/runtime-tools-process-gateway-api/dist/types";
 import { FormNotification, Notification } from 
"@kie-tools/runtime-tools-components/dist/components/FormNotification";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx
index 199aa69066d..dd5c546ee83 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/ProcessesPage/ProcessesPage.tsx
@@ -20,7 +20,7 @@ import React, { useState } from "react";
 import { Card } from "@patternfly/react-core/dist/js/components/Card";
 import { PageSection } from "@patternfly/react-core/dist/js/components/Page";
 import { Tab, Tabs, TabTitleText } from 
"@patternfly/react-core/dist/js/components/Tabs";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import ProcessListContainer from 
"../../containers/ProcessListContainer/ProcessListContainer";
 import "../../styles.css";
 import { useDevUIAppContext } from "../../contexts/DevUIAppContext";
diff --git 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
index 187f1278efb..e032964d510 100644
--- 
a/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
+++ 
b/packages/runtime-tools-process-dev-ui-webapp/src/components/pages/TaskDetailsPage/TaskDetailsPage.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect, useState } from "react";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router";
 import {
   Drawer,
   DrawerActions,
diff --git a/packages/runtime-tools-shared-webapp-components/package.json 
b/packages/runtime-tools-shared-webapp-components/package.json
index ed7c8f5cd7c..28e3d825af4 100644
--- a/packages/runtime-tools-shared-webapp-components/package.json
+++ b/packages/runtime-tools-shared-webapp-components/package.json
@@ -26,7 +26,7 @@
     "@kie-tools/runtime-tools-components": "workspace:*",
     "@patternfly/react-core": "^5.4.1",
     "@patternfly/react-icons": "^5.4.1",
-    "react-router-dom": "^6.30.4"
+    "react-router": "^7.18.0"
   },
   "devDependencies": {
     "@babel/core": "^7.16.0",
diff --git 
a/packages/runtime-tools-shared-webapp-components/src/NoData/NoData.tsx 
b/packages/runtime-tools-shared-webapp-components/src/NoData/NoData.tsx
index d489ab82b9b..80ba0bbdab6 100644
--- a/packages/runtime-tools-shared-webapp-components/src/NoData/NoData.tsx
+++ b/packages/runtime-tools-shared-webapp-components/src/NoData/NoData.tsx
@@ -31,7 +31,7 @@ import { Button } from 
"@patternfly/react-core/dist/js/components/Button";
 import { PageSection } from "@patternfly/react-core/dist/js/components/Page";
 import { Bullseye } from "@patternfly/react-core/dist/js/layouts/Bullseye";
 import { SearchIcon } from "@patternfly/react-icons/dist/js/icons/search-icon";
-import { Navigate, useLocation } from "react-router-dom";
+import { Navigate, useLocation } from "react-router";
 import { OUIAProps, componentOuiaProps } from 
"@kie-tools/runtime-tools-components/dist/ouiaTools";
 
 export interface IOwnProps {
diff --git 
a/packages/runtime-tools-shared-webapp-components/src/PageNotFound/PageNotFound.tsx
 
b/packages/runtime-tools-shared-webapp-components/src/PageNotFound/PageNotFound.tsx
index b5d09d6d0a6..865bf8f2117 100644
--- 
a/packages/runtime-tools-shared-webapp-components/src/PageNotFound/PageNotFound.tsx
+++ 
b/packages/runtime-tools-shared-webapp-components/src/PageNotFound/PageNotFound.tsx
@@ -31,7 +31,7 @@ import { Button } from 
"@patternfly/react-core/dist/js/components/Button";
 
 import { Bullseye } from "@patternfly/react-core/dist/js/layouts/Bullseye";
 import { ExclamationCircleIcon } from 
"@patternfly/react-icons/dist/js/icons/exclamation-circle-icon";
-import { Navigate, useLocation } from "react-router-dom";
+import { Navigate, useLocation } from "react-router";
 import { componentOuiaProps, OUIAProps } from 
"@kie-tools/runtime-tools-components/dist/ouiaTools/OuiaUtils";
 
 interface IOwnProps {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 29b650bc76c..4bc1170c094 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -692,9 +692,9 @@ importers:
       react-dom:
         specifier: ^18.3.1
         version: 18.3.1(react@18.3.1)
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       rimraf:
         specifier: ^3.0.2
         version: 3.0.2
@@ -2400,9 +2400,9 @@ importers:
       react-dom:
         specifier: '>=18.3.1 <19.0.0'
         version: 18.3.1(react@18.3.1)
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     devDependencies:
       '@babel/core':
         specifier: ^7.16.0
@@ -5781,9 +5781,9 @@ importers:
       react-dropzone:
         specifier: ^11.4.2
         version: 11.7.1(react@18.3.1)
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-virtualized-auto-sizer:
         specifier: ^1.0.7
         version: 1.0.26(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -6071,9 +6071,9 @@ importers:
       react-redux:
         specifier: ^9.1.2
         version: 9.3.0(@types/react@18.3.31)(react@18.3.1)(redux@4.2.1)
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react-sortable-hoc:
         specifier: ^2.0.0
         version: 
2.0.0(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -6459,9 +6459,9 @@ importers:
       react-moment:
         specifier: 0.9.7
         version: 0.9.7(moment@2.30.1)(prop-types@15.8.1)(react@18.3.1)
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       uniforms:
         specifier: ^3.10.2
         version: 3.10.2(react@18.3.1)
@@ -6605,9 +6605,9 @@ importers:
       react-dom:
         specifier: ^18.3.1
         version: 18.3.1(react@18.3.1)
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     devDependencies:
       '@babel/core':
         specifier: ^7.16.0
@@ -6867,9 +6867,9 @@ importers:
       react-moment:
         specifier: 0.9.7
         version: 0.9.7(moment@2.30.1)(prop-types@15.8.1)(react@18.3.1)
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       util:
         specifier: ^0.12.5
         version: 0.12.5
@@ -7375,9 +7375,9 @@ importers:
       react:
         specifier: '>=18.3.1 <19.0.0'
         version: 18.3.1
-      react-router-dom:
-        specifier: ^6.30.4
-        version: 6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      react-router:
+        specifier: ^7.18.0
+        version: 7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
     devDependencies:
       '@babel/core':
         specifier: ^7.16.0
@@ -12809,10 +12809,6 @@ packages:
       selenium-webdriver: '>=4.6.1'
       typescript: '>=4.6.2'
 
-  '@remix-run/router@1.23.3':
-    resolution: {integrity: 
sha512-4An71tdz9X8+3sI4Qqqd2LWd9vS39J7sqd9EU4Scw7TJE/qB10Flv/UuqbPVgfQV9XoK8Np6jNquZitnZq5i+Q==}
-    engines: {node: '>=14.0.0'}
-
   '@repeaterjs/repeater@3.0.4':
     resolution: {integrity: 
sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA==}
 
@@ -15696,6 +15692,10 @@ packages:
     resolution: {integrity: 
sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
     engines: {node: '>= 0.6'}
 
+  cookie@1.1.1:
+    resolution: {integrity: 
sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==}
+    engines: {node: '>=18'}
+
   cookiejar@2.1.4:
     resolution: {integrity: 
sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
 
@@ -21126,18 +21126,15 @@ packages:
       react: '>= 16.3'
       react-dom: '>= 16.3'
 
-  react-router-dom@6.30.4:
-    resolution: {integrity: 
sha512-q4HvNl+mmDdkS0g+MqiBZNteQJCuimWoOyHMy4T/RQLAn9Z29+E91QXRaxOujeMl2HTzRSS0KFPd7lxX3PjV0Q==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      react: '>=16.8'
-      react-dom: '>=16.8'
-
-  react-router@6.30.4:
-    resolution: {integrity: 
sha512-SVUsDe+DybHM/WmYKIVYhZh1o5Dcuf16yM6WjG02Q9XVFMZIJyHYhwrr6bFBXZkVP6z69kNkMyBCujt8FaFLJA==}
-    engines: {node: '>=14.0.0'}
+  react-router@7.18.2:
+    resolution: {integrity: 
sha512-aUVMjFm3GAPTTZL7oYr5E7ETiqfQCHRLH+B+5afnICvf0r7kkK4eR6SMuwbSTJw/7t+12khT/Kahij49fqOCIg==}
+    engines: {node: '>=20.0.0'}
     peerDependencies:
-      react: '>=16.8'
+      react: '>=18'
+      react-dom: '>=18'
+    peerDependenciesMeta:
+      react-dom:
+        optional: true
 
   react-side-effect@2.1.2:
     resolution: {integrity: 
sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==}
@@ -21738,6 +21735,9 @@ packages:
   set-blocking@2.0.0:
     resolution: {integrity: 
sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
+  set-cookie-parser@2.7.2:
+    resolution: {integrity: 
sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==}
+
   set-function-length@1.2.2:
     resolution: {integrity: 
sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
     engines: {node: '>= 0.4'}
@@ -28986,8 +28986,6 @@ snapshots:
       type-fest: 4.41.0
       typescript: 5.9.3
 
-  '@remix-run/router@1.23.3': {}
-
   '@repeaterjs/repeater@3.0.4': {}
 
   '@repeaterjs/repeater@3.1.0': {}
@@ -33142,6 +33140,8 @@ snapshots:
 
   cookie@0.7.2: {}
 
+  cookie@1.1.1: {}
+
   cookiejar@2.1.4: {}
 
   cookies@0.9.1:
@@ -39750,17 +39750,13 @@ snapshots:
       react-dom: 18.3.1(react@18.3.1)
       react-draggable: 4.7.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
 
-  react-router-dom@6.30.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  react-router@7.18.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
-      '@remix-run/router': 1.23.3
+      cookie: 1.1.1
       react: 18.3.1
+      set-cookie-parser: 2.7.2
+    optionalDependencies:
       react-dom: 18.3.1(react@18.3.1)
-      react-router: 6.30.4(react@18.3.1)
-
-  react-router@6.30.4(react@18.3.1):
-    dependencies:
-      '@remix-run/router': 1.23.3
-      react: 18.3.1
 
   react-side-effect@2.1.2(react@18.3.1):
     dependencies:
@@ -40516,6 +40512,8 @@ snapshots:
 
   set-blocking@2.0.0: {}
 
+  set-cookie-parser@2.7.2: {}
+
   set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@kie.apache.org
For additional commands, e-mail: commits-h...@kie.apache.org