fix #2838 upgrade task for 14.16
This commit is contained in:
Shinsuke Sugaya
parent
abe6356a44
commit
e40edd2008
3 changed files with 53 additions and 1 deletions
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@
|
|||
<la:option value="14.12">14.12</la:option>
|
||||
<la:option value="14.13">14.13</la:option>
|
||||
<la:option value="14.14">14.14</la:option>
|
||||
<la:option value="14.15">14.15</la:option>
|
||||
</la:select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue