Skip to content

Commit

Permalink
fix #2808 upgrade tasks for 14.12
Browse files Browse the repository at this point in the history
  • Loading branch information
@marevol
marevol committed Feb 23, 2024
1 parent 81b70b4 commit f128e4a
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 1 deletion.
47 changes: 47 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 @@ -114,6 +114,8 @@ public class AdminUpgradeAction extends FessAdminAction {

private static final String VERSION_14_10 = "14.10";

private static final String VERSION_14_11 = "14.11";

// ===================================================================================
// Attribute
//
Expand Down Expand Up @@ -209,6 +211,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -248,6 +251,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -286,6 +290,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -323,6 +328,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -359,6 +365,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -394,6 +401,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -428,6 +436,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -461,6 +470,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -493,6 +503,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -524,6 +535,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -554,6 +566,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -582,6 +595,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand Down Expand Up @@ -609,6 +623,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -635,6 +650,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -660,6 +676,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -685,6 +702,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -709,6 +727,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -732,6 +751,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -754,6 +774,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -775,6 +796,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -795,6 +817,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -814,6 +837,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -832,6 +856,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -849,6 +874,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -865,6 +891,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -880,6 +907,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -894,6 +922,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -907,6 +936,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
try {
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -919,6 +949,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
} else if (VERSION_14_10.equals(form.targetVersion)) {
try {
upgradeFrom14_10();
upgradeFrom14_11();
upgradeFromAll();

saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
Expand All @@ -928,6 +959,18 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_10, e.getLocalizedMessage()));
}
} else if (VERSION_14_11.equals(form.targetVersion)) {
try {
upgradeFrom14_11();
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_11, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
Expand Down Expand Up @@ -1143,6 +1186,10 @@ private void upgradeFrom14_10() {
// nothing
}

private void upgradeFrom14_11() {
// 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(2025, 4 - 1, 1); // EOL Date
cal.set(2025, 8 - 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
1 change: 1 addition & 0 deletions 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 @@ -79,6 +79,7 @@
<la:option value="14.8">14.8</la:option>
<la:option value="14.9">14.9</la:option>
<la:option value="14.10">14.10</la:option>
<la:option value="14.11">14.11</la:option>
</la:select>
</div>
</div>
Expand Down

0 comments on commit f128e4a

Please sign in to comment.