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 c8733eaf3..034dac384 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 @@ -53,6 +53,8 @@ public class AdminUpgradeAction extends FessAdminAction { private static final String VERSION_12_2 = "12.2"; + private static final String VERSION_12_3 = "12.3"; + // =================================================================================== // Attribute // @@ -128,6 +130,7 @@ public class AdminUpgradeAction extends FessAdminAction { upgradeFrom12_0(); upgradeFrom12_1(); upgradeFrom12_2(); + upgradeFrom12_3(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -141,6 +144,7 @@ public class AdminUpgradeAction extends FessAdminAction { try { upgradeFrom12_1(); upgradeFrom12_2(); + upgradeFrom12_3(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -153,6 +157,19 @@ public class AdminUpgradeAction extends FessAdminAction { } else if (VERSION_12_2.equals(form.targetVersion)) { try { upgradeFrom12_2(); + upgradeFrom12_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_12_2, e.getLocalizedMessage())); + } + } else if (VERSION_12_3.equals(form.targetVersion)) { + try { + upgradeFrom12_3(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -183,6 +200,10 @@ public class AdminUpgradeAction extends FessAdminAction { } private void upgradeFrom12_2() { + // nothing + } + + private void upgradeFrom12_3() { ComponentUtil.getThumbnailManager().migrate(); } 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 7c918a3e6..7f3fbb71b 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 @@ 12.0 12.1 12.2 + 12.3