diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
index 2267fe20d..93b4adab5 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@@ -58,6 +58,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_11_2 = "11.2";
+ private static final String VERSION_11_3 = "11.3";
+
// ===================================================================================
// Attribute
//
@@ -147,6 +149,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom11_0();
upgradeFrom11_1();
upgradeFrom11_2();
+ upgradeFrom11_3();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -160,6 +163,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom11_1();
upgradeFrom11_2();
+ upgradeFrom11_3();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -172,6 +176,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_11_2.equals(form.targetVersion)) {
try {
upgradeFrom11_2();
+ upgradeFrom11_3();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -181,6 +186,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_11_2, e.getLocalizedMessage()));
}
+ } else if (VERSION_11_3.equals(form.targetVersion)) {
+ try {
+ upgradeFrom11_3();
+ upgradeFromAll();
+
+ saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
+
+ systemHelper.reloadConfiguration();
+ } catch (final Exception e) {
+ logger.warn("Failed to upgrade data.", e);
+ saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_11_3, e.getLocalizedMessage()));
+ }
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@@ -227,6 +244,14 @@ public class AdminUpgradeAction extends FessAdminAction {
"{\"properties\":{\"virtualHost\":{\"type\":\"keyword\"}}}");
}
+ private void upgradeFrom11_3() {
+ final IndicesAdminClient indicesClient = fessEsClient.admin().indices();
+ final String configIndex = ".fess_config";
+
+ UpgradeUtil.addFieldMapping(indicesClient, configIndex, "related_content", "sortOrder",
+ "{\"properties\":{\"sortOrder\":{\"type\":\"integer\"}}}");
+ }
+
private void upgradeFromAll() {
final IndicesAdminClient indicesClient = fessEsClient.admin().indices();
final String crawlerIndex = fessConfig.getIndexDocumentCrawlerIndex();
diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
index 7d6f5305b..497e57894 100644
--- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
@@ -47,6 +47,7 @@
11.0
11.1
11.2
+ 11.3