Skip to content

Commit

Permalink
fix #2858 upgrade tasks for 14.18
Browse files Browse the repository at this point in the history
  • Loading branch information
@marevol
marevol committed Nov 21, 2024
1 parent d624803 commit 84178f7
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 2 deletions.
53 changes: 53 additions & 0 deletions src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ public class AdminUpgradeAction extends FessAdminAction {

private static final String VERSION_14_16 = "14.16";

private static final String VERSION_14_17 = "14.17";

// ===================================================================================
// Attribute
//
Expand Down Expand Up @@ -227,6 +229,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -272,6 +275,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -316,6 +320,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -359,6 +364,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -401,6 +407,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -442,6 +449,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -482,6 +490,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -521,6 +530,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -559,6 +569,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -596,6 +607,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -632,6 +644,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -666,6 +679,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -699,6 +713,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -731,6 +746,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -762,6 +778,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -793,6 +810,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -823,6 +841,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -852,6 +871,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -880,6 +900,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -907,6 +928,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -933,6 +955,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -958,6 +981,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -982,6 +1006,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1005,6 +1030,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1027,6 +1053,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1048,6 +1075,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1068,6 +1096,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1087,6 +1116,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1105,6 +1135,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1122,6 +1153,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1138,6 +1170,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1153,6 +1186,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1167,6 +1201,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_14();
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1180,6 +1215,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
try {
upgradeFrom14_15();
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1192,6 +1228,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
} else if (VERSION_14_16.equals(form.targetVersion)) {
try {
upgradeFrom14_16();
upgradeFrom14_17();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -1201,6 +1238,18 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_16, e.getLocalizedMessage()));
}
} else if (VERSION_14_17.equals(form.targetVersion)) {
try {
upgradeFrom14_17();
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_17, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
Expand Down Expand Up @@ -1440,6 +1489,10 @@ private void upgradeFrom14_16() {
// nothing
}

private void upgradeFrom14_17() {
// nothing
}

private String[] getDictionaryPaths() {
try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) {
if (response.getHttpStatusCode() == 200) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void init() {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.set(2026, 3 - 1, 1); // EOL Date
cal.set(2026, 6 - 1, 1); // EOL Date
eolTime = cal.getTimeInMillis();
if (isEoled()) {
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");
Expand Down
3 changes: 2 additions & 1 deletion src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
<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:option value="14.15">14.16</la:option>
<la:option value="14.16">14.16</la:option>
<la:option value="14.17">14.17</la:option>
</la:select>
</div>
</div>
Expand Down

0 comments on commit 84178f7

Please sign in to comment.