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 001964091..e26a29864 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
@@ -122,6 +122,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_14_14 = "14.14";
+ private static final String VERSION_14_15 = "14.15";
+
// ===================================================================================
// Attribute
//
@@ -221,6 +223,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -264,6 +267,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -306,6 +310,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -347,6 +352,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -387,6 +393,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -426,6 +433,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -464,6 +472,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -501,6 +510,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -537,6 +547,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -572,6 +583,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -606,6 +618,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -638,6 +651,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -669,6 +683,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -699,6 +714,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -728,6 +744,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -757,6 +774,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -785,6 +803,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -812,6 +831,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -838,6 +858,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -863,6 +884,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -887,6 +909,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -910,6 +933,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -932,6 +956,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -953,6 +978,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -973,6 +999,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -992,6 +1019,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1010,6 +1038,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1027,6 +1056,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1043,6 +1073,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1058,6 +1089,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1072,6 +1104,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_12();
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1085,6 +1118,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom14_13();
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1097,6 +1131,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_14_14.equals(form.targetVersion)) {
try {
upgradeFrom14_14();
+ upgradeFrom14_15();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1106,6 +1141,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_14, e.getLocalizedMessage()));
}
+ } else if (VERSION_14_15.equals(form.targetVersion)) {
+ try {
+ upgradeFrom14_15();
+ 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_15, e.getLocalizedMessage()));
+ }
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@@ -1337,6 +1384,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
+ private void upgradeFrom14_15() {
+ // 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 97abddfeb..90e33a13f 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 class SystemHelper {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- cal.set(2026, 1 - 1, 1); // EOL Date
+ cal.set(2026, 2 - 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 b51001a09..eb67efaf0 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
@@ -83,6 +83,7 @@
14.12
14.13
14.14
+ 14.15