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 66a086bd25c17cd7bbc4fe8eab4911597e625344..4e262d9d547348e036d3dc9010c6d91c5af6fc96 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
@@ -85,6 +85,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_14_1 = "14.1";
+ private static final String VERSION_14_2 = "14.2";
+
// ===================================================================================
// Attribute
//
@@ -171,6 +173,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -201,6 +204,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -230,6 +234,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -258,6 +263,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -285,6 +291,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -311,6 +318,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -336,6 +344,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -360,6 +369,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -383,6 +393,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -405,6 +416,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -426,6 +438,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -445,6 +458,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -463,6 +477,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -480,6 +495,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -496,6 +512,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_16();
upgradeFrom13_17();
upgradeFrom14_0();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -512,6 +529,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -527,6 +545,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -541,6 +560,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_17();
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -554,6 +574,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom14_0();
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -566,6 +587,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_14_1.equals(form.targetVersion)) {
try {
upgradeFrom14_1();
+ upgradeFrom14_2();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -575,6 +597,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_1, e.getLocalizedMessage()));
}
+ } else if (VERSION_14_2.equals(form.targetVersion)) {
+ try {
+ upgradeFrom14_2();
+ 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_2, e.getLocalizedMessage()));
+ }
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@@ -723,6 +757,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
+ private void upgradeFrom14_2() {
+ // nothing
+ }
+
private void upgradeFromAll() {
// nothing
}
diff --git a/src/main/java/org/codelibs/fess/helper/SystemHelper.java b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
index c90519b5d724da4f692ef2517157e185139d79a5..49de12838556c80cfa0b286b0158be3b58298a5d 100644
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@@ -126,7 +126,7 @@ public class SystemHelper {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- cal.set(2023, 10 - 1, 26); // EOL Date
+ cal.set(2023, 12 - 1, 28); // 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 06fed031b48d8cb459e21c9a28945b5d5705709d..1fc84046c97943bff3b0cfbbcd20a1aa6630044a 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
@@ -70,6 +70,7 @@
<la:option value="13.17">13.17</la:option>
<la:option value="14.0">14.0</la:option>
<la:option value="14.1">14.1</la:option>
+ <la:option value="14.2">14.2</la:option>
</la:select>
</div>
</div>