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

Merge branch 'master' into issue-2333

Browse source
This commit is contained in:
igarashi 2019-12-17 01:17:34 +09:00
commit e62750e298
3 changed files with 44 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pom.xml
View file

@ -48,8 +48,8 @@
<jackson.version>2.10.1</jackson.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<asm.version>7.2</asm.version>
<tika.version>1.22</tika.version>
<groovy.version>3.0.0-rc-1</groovy.version>
<tika.version>1.23</tika.version>
<groovy.version>3.0.0-rc-2</groovy.version>
<minio.version>6.0.11</minio.version>
<!-- Crawler -->
@ -64,7 +64,7 @@
<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
<!-- Tomcat -->
<tomcat.version>9.0.29</tomcat.version>
<tomcat.version>9.0.30</tomcat.version>
<tomcat.boot.version>0.7.3</tomcat.boot.version>
<!-- Testing -->
@ -1175,6 +1175,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>1.33.0</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-jackson2</artifactId>

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

@ -67,6 +67,8 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_13_3 = "13.3";
private static final String VERSION_13_4 = "13.4";
// ===================================================================================
// Attribute
//
@ -138,6 +140,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -159,6 +162,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -179,6 +183,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -198,6 +203,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -216,6 +222,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -233,6 +240,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -249,6 +257,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -264,6 +273,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -278,6 +288,7 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -291,6 +302,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -303,6 +315,7 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_13_3.equals(form.targetVersion)) {
try {
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -312,6 +325,18 @@ public class AdminUpgradeAction extends FessAdminAction {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_13_3, e.getLocalizedMessage()));
}
} else if (VERSION_13_4.equals(form.targetVersion)) {
try {
upgradeFrom13_4();
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_13_4, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
}
@ -359,7 +384,12 @@ public class AdminUpgradeAction extends FessAdminAction {
}
private void upgradeFrom13_0() {
// nothing
UpgradeUtil
.addData(
fessEsClient,
".fess_config.scheduled_job",
"label_updater",
"{\"name\":\"Label Updater\",\"target\":\"all\",\"cronExpression\":\"\",\"scriptType\":\"groovy\",\"scriptData\":\"return container.getComponent(\\\"updateLabelJob\\\").execute();\",\"jobLogging\":false,\"crawler\":false,\"available\":true,\"sortOrder\":11,\"createdBy\":\"system\",\"createdTime\":0,\"updatedBy\":\"system\",\"updatedTime\":0}");
}
private void upgradeFrom13_1() {
@ -374,6 +404,10 @@ public class AdminUpgradeAction extends FessAdminAction {
// nothing
}
private void upgradeFrom13_4() {
// nothing
}
private void upgradeFromAll() {
// nothing
}

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

@ -56,6 +56,7 @@
<la:option value="13.1">13.1</la:option>
<la:option value="13.2">13.2</la:option>
<la:option value="13.3">13.3</la:option>
<la:option value="13.4">13.4</la:option>
</la:select>
</div>
</div>