fix #2726 upgrade for 14.7

src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

@@ -93,6 +93,8 @@ public class AdminUpgradeAction extends FessAdminAction {
 
     private static final String VERSION_14_5 = "14.5";
 
+    private static final String VERSION_14_6 = "14.6";
+
     // ===================================================================================
     //                                                                           Attribute
     //
@@ -183,6 +185,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -217,6 +220,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -250,6 +254,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -282,6 +287,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -313,6 +319,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -343,6 +350,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -372,6 +380,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -400,6 +409,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -427,6 +437,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -453,6 +464,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -478,6 +490,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -501,6 +514,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -523,6 +537,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -544,6 +559,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -564,6 +580,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -584,6 +601,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -603,6 +621,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -621,6 +640,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -638,6 +658,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -654,6 +675,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -669,6 +691,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -683,6 +706,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                 upgradeFrom14_3();
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -696,6 +720,7 @@ public class AdminUpgradeAction extends FessAdminAction {
             try {
                 upgradeFrom14_4();
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -708,6 +733,7 @@ public class AdminUpgradeAction extends FessAdminAction {
         } else if (VERSION_14_5.equals(form.targetVersion)) {
             try {
                 upgradeFrom14_5();
+                upgradeFrom14_6();
                 upgradeFromAll();
 
                 saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -717,6 +743,18 @@ public class AdminUpgradeAction extends FessAdminAction {
                 logger.warn("Failed to upgrade data.", e);
                 saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_5, e.getLocalizedMessage()));
             }
+        } else if (VERSION_14_6.equals(form.targetVersion)) {
+            try {
+                upgradeFrom14_6();
+                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_6, e.getLocalizedMessage()));
+            }
         } else {
             saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
         }
@@ -881,6 +919,10 @@ public class AdminUpgradeAction extends FessAdminAction {
         // nothing
     }
 
+    private void upgradeFrom14_6() {
+        // nothing
+    }
+
     private void upgradeFromAll() {
         // nothing
     }

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(2024, 7 - 1, 1); // EOL Date
+        cal.set(2024, 9 - 1, 1); // EOL Date
         eolTime = cal.getTimeInMillis();
         if (isEoled()) {
             logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");

src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp

@@ -74,6 +74,7 @@
 											<la:option value="14.3">14.3</la:option>
 											<la:option value="14.4">14.4</la:option>
 											<la:option value="14.5">14.5</la:option>
+											<la:option value="14.6">14.6</la:option>
 										</la:select>
 									</div>
 								</div>