From 06dad488671eb71d730cfc481a96edf424e95df5 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Thu, 01 Oct 2026 09:27:32 +0000
Subject: [PATCH] [#1133] Describe upgrade --force as performing the confirmed tasks, and say it does not accept the license (#1137)
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java | 2 +-
opendj-server-legacy/src/messages/org/opends/messages/tool.properties | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
index 346c9c9..b5e0017 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -218,7 +218,7 @@
.buildArgument();
force =
BooleanArgument.builder(OPTION_LONG_FORCE_UPGRADE)
- .description(INFO_UPGRADE_OPTION_FORCE.get(OPTION_LONG_NO_PROMPT))
+ .description(INFO_UPGRADE_OPTION_FORCE.get(OPTION_LONG_ACCEPT_LICENSE, OPTION_LONG_NO_PROMPT))
.buildArgument();
acceptLicense = acceptLicenseArgument();
showUsageArgument = showUsageArgument();
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
index 1c87085..1704ec5 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/tool.properties
@@ -2326,7 +2326,9 @@
known in advance and resolved after the upgrade has completed
INFO_UPGRADE_OPTION_FORCE_1741=Forces a non-interactive upgrade to continue even if it requires user \
interaction. In particular, long running or critical upgrade tasks, such as re-indexing, which \
-require user confirmation will be skipped. This option may only be used with the '%s' option
+require user confirmation will be performed. This option does not accept the license: if the \
+upgrade requires accepting a license, use the '%s' option. This option may only be used with the \
+'%s' option
INFO_UPGRADE_DESCRIPTION_CLI_1743=Upgrades OpenDJ configuration and application data so that it is \
compatible with the installed binaries.%n%nThis tool should be run immediately after upgrading \
the OpenDJ binaries and before restarting the server.%n%nNOTE: this tool does not provide backup \
--
Gitblit v1.10.0