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 a7db5ea5d..1cdff31fe 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 @@ -116,6 +116,8 @@ public class AdminUpgradeAction extends FessAdminAction { private static final String VERSION_14_11 = "14.11"; + private static final String VERSION_14_12 = "14.12"; + // =================================================================================== // Attribute // @@ -212,6 +214,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -252,6 +255,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -291,6 +295,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -329,6 +334,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -366,6 +372,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -402,6 +409,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -437,6 +445,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -471,6 +480,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -504,6 +514,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -536,6 +547,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -567,6 +579,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -596,6 +609,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -624,6 +638,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -651,6 +666,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -677,6 +693,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -703,6 +720,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -728,6 +746,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -752,6 +771,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -775,6 +795,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -797,6 +818,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -818,6 +840,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -838,6 +861,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -857,6 +881,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -875,6 +900,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -892,6 +918,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -908,6 +935,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -923,6 +951,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -937,6 +966,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { upgradeFrom14_9(); upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -950,6 +980,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { try { upgradeFrom14_10(); upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -962,6 +993,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { } else if (VERSION_14_11.equals(form.targetVersion)) { try { upgradeFrom14_11(); + upgradeFrom14_12(); upgradeFromAll(); saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL)); @@ -971,6 +1003,18 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) { logger.warn("Failed to upgrade data.", e); saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_11, e.getLocalizedMessage())); } + } else if (VERSION_14_12.equals(form.targetVersion)) { + try { + upgradeFrom14_12(); + 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_14_12, e.getLocalizedMessage())); + } } else { saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL)); } @@ -1190,6 +1234,10 @@ private void upgradeFrom14_11() { // nothing } + private void upgradeFrom14_12() { + // nothing + } + private String[] getDictionaryPaths() { try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) { if (response.getHttpStatusCode() == 200) { diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java index fc7c3f80d..6b254f8e0 100644 --- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java +++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java @@ -135,7 +135,7 @@ public void init() { logger.debug("Initialize {}", this.getClass().getSimpleName()); } final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC")); - cal.set(2025, 8 - 1, 1); // EOL Date + cal.set(2025, 10 - 1, 1); // EOL Date eolTime = cal.getTimeInMillis(); if (isEoled()) { logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html"); 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 25337e260..8ab5ec9ca 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 @@ -80,6 +80,7 @@ 14.9 14.10 14.11 + 14.12