0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2775 upgrade tasks for 14.11

Browse source
This commit is contained in:
Shinsuke Sugaya 2023-10-19 16:34:43 +09:00
parent 8ecf5055d3
commit eec6740eba
4 changed files with 49 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>fess</artifactId>
<version>14.11.1-SNAPSHOT</version>
<version>14.11.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>Fess</name>
<description>Fess is Full tExt Search System.</description>

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

@ -112,6 +112,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_14_9 = "14.9";
private static final String VERSION_14_10 = "14.10";
// ===================================================================================
// Attribute
//
@ -206,6 +208,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -244,6 +247,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -281,6 +285,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -317,6 +322,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -352,6 +358,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -386,6 +393,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -419,6 +427,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -451,6 +460,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -482,6 +492,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -512,6 +523,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -541,6 +553,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -568,6 +581,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -594,6 +608,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -619,6 +634,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -643,6 +659,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -667,6 +684,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -690,6 +708,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -712,6 +731,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -733,6 +753,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -753,6 +774,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -772,6 +794,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -790,6 +813,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -807,6 +831,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -823,6 +848,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -838,6 +864,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -852,6 +879,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom14_7();
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -865,6 +893,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom14_8();
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -877,6 +906,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_14_9.equals(form.targetVersion)) {
try {
upgradeFrom14_9();
upgradeFrom14_10();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -886,6 +916,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_9, e.getLocalizedMessage()));
}
} else if (VERSION_14_10.equals(form.targetVersion)) {
try {
upgradeFrom14_10();
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_10, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@ -1097,6 +1139,10 @@ public class AdminUpgradeAction extends FessAdminAction {
}
private void upgradeFrom14_10() {
// nothing
}
private String[] getDictionaryPaths() {
try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) {
if (response.getHttpStatusCode() == 200) {

2
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -129,7 +129,7 @@ public class SystemHelper {
logger.debug("Initialize {}", this.getClass().getSimpleName());
}
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.set(2025, 1 - 1, 1); // EOL Date
cal.set(2025, 4 - 1, 1); // EOL Date
eolTime = cal.getTimeInMillis();
if (isEoled()) {
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");

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

@ -78,6 +78,7 @@
<la:option value="14.7">14.7</la:option>
<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:select>
</div>
</div>