Skip to content

Commit 84178f7

Browse files
marevolmarevol
committed
fix #2858 upgrade tasks for 14.18
1 parent d624803 commit 84178f7

File tree

3 files changed

+56
-2
lines changed

3 files changed

+56
-2
lines changed

‎src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ public class AdminUpgradeAction extends FessAdminAction {
126126

127127
private static final String VERSION_14_16 = "14.16";
128128

129+
private static final String VERSION_14_17 = "14.17";
130+
129131
// ===================================================================================
130132
// Attribute
131133
//
@@ -227,6 +229,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
227229
upgradeFrom14_14();
228230
upgradeFrom14_15();
229231
upgradeFrom14_16();
232+
upgradeFrom14_17();
230233
upgradeFromAll();
231234

232235
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -272,6 +275,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
272275
upgradeFrom14_14();
273276
upgradeFrom14_15();
274277
upgradeFrom14_16();
278+
upgradeFrom14_17();
275279
upgradeFromAll();
276280

277281
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -316,6 +320,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
316320
upgradeFrom14_14();
317321
upgradeFrom14_15();
318322
upgradeFrom14_16();
323+
upgradeFrom14_17();
319324
upgradeFromAll();
320325

321326
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -359,6 +364,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
359364
upgradeFrom14_14();
360365
upgradeFrom14_15();
361366
upgradeFrom14_16();
367+
upgradeFrom14_17();
362368
upgradeFromAll();
363369

364370
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -401,6 +407,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
401407
upgradeFrom14_14();
402408
upgradeFrom14_15();
403409
upgradeFrom14_16();
410+
upgradeFrom14_17();
404411
upgradeFromAll();
405412

406413
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -442,6 +449,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
442449
upgradeFrom14_14();
443450
upgradeFrom14_15();
444451
upgradeFrom14_16();
452+
upgradeFrom14_17();
445453
upgradeFromAll();
446454

447455
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -482,6 +490,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
482490
upgradeFrom14_14();
483491
upgradeFrom14_15();
484492
upgradeFrom14_16();
493+
upgradeFrom14_17();
485494
upgradeFromAll();
486495

487496
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -521,6 +530,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
521530
upgradeFrom14_14();
522531
upgradeFrom14_15();
523532
upgradeFrom14_16();
533+
upgradeFrom14_17();
524534
upgradeFromAll();
525535

526536
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -559,6 +569,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
559569
upgradeFrom14_14();
560570
upgradeFrom14_15();
561571
upgradeFrom14_16();
572+
upgradeFrom14_17();
562573
upgradeFromAll();
563574

564575
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -596,6 +607,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
596607
upgradeFrom14_14();
597608
upgradeFrom14_15();
598609
upgradeFrom14_16();
610+
upgradeFrom14_17();
599611
upgradeFromAll();
600612

601613
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -632,6 +644,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
632644
upgradeFrom14_14();
633645
upgradeFrom14_15();
634646
upgradeFrom14_16();
647+
upgradeFrom14_17();
635648
upgradeFromAll();
636649

637650
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -666,6 +679,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
666679
upgradeFrom14_14();
667680
upgradeFrom14_15();
668681
upgradeFrom14_16();
682+
upgradeFrom14_17();
669683
upgradeFromAll();
670684

671685
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -699,6 +713,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
699713
upgradeFrom14_14();
700714
upgradeFrom14_15();
701715
upgradeFrom14_16();
716+
upgradeFrom14_17();
702717
upgradeFromAll();
703718

704719
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -731,6 +746,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
731746
upgradeFrom14_14();
732747
upgradeFrom14_15();
733748
upgradeFrom14_16();
749+
upgradeFrom14_17();
734750
upgradeFromAll();
735751

736752
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -762,6 +778,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
762778
upgradeFrom14_14();
763779
upgradeFrom14_15();
764780
upgradeFrom14_16();
781+
upgradeFrom14_17();
765782
upgradeFromAll();
766783

767784
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -793,6 +810,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
793810
upgradeFrom14_14();
794811
upgradeFrom14_15();
795812
upgradeFrom14_16();
813+
upgradeFrom14_17();
796814
upgradeFromAll();
797815

798816
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -823,6 +841,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
823841
upgradeFrom14_14();
824842
upgradeFrom14_15();
825843
upgradeFrom14_16();
844+
upgradeFrom14_17();
826845
upgradeFromAll();
827846

828847
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -852,6 +871,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
852871
upgradeFrom14_14();
853872
upgradeFrom14_15();
854873
upgradeFrom14_16();
874+
upgradeFrom14_17();
855875
upgradeFromAll();
856876

857877
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -880,6 +900,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
880900
upgradeFrom14_14();
881901
upgradeFrom14_15();
882902
upgradeFrom14_16();
903+
upgradeFrom14_17();
883904
upgradeFromAll();
884905

885906
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -907,6 +928,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
907928
upgradeFrom14_14();
908929
upgradeFrom14_15();
909930
upgradeFrom14_16();
931+
upgradeFrom14_17();
910932
upgradeFromAll();
911933

912934
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -933,6 +955,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
933955
upgradeFrom14_14();
934956
upgradeFrom14_15();
935957
upgradeFrom14_16();
958+
upgradeFrom14_17();
936959
upgradeFromAll();
937960

938961
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -958,6 +981,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
958981
upgradeFrom14_14();
959982
upgradeFrom14_15();
960983
upgradeFrom14_16();
984+
upgradeFrom14_17();
961985
upgradeFromAll();
962986

963987
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -982,6 +1006,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
9821006
upgradeFrom14_14();
9831007
upgradeFrom14_15();
9841008
upgradeFrom14_16();
1009+
upgradeFrom14_17();
9851010
upgradeFromAll();
9861011

9871012
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1005,6 +1030,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
10051030
upgradeFrom14_14();
10061031
upgradeFrom14_15();
10071032
upgradeFrom14_16();
1033+
upgradeFrom14_17();
10081034
upgradeFromAll();
10091035

10101036
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1027,6 +1053,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
10271053
upgradeFrom14_14();
10281054
upgradeFrom14_15();
10291055
upgradeFrom14_16();
1056+
upgradeFrom14_17();
10301057
upgradeFromAll();
10311058

10321059
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1048,6 +1075,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
10481075
upgradeFrom14_14();
10491076
upgradeFrom14_15();
10501077
upgradeFrom14_16();
1078+
upgradeFrom14_17();
10511079
upgradeFromAll();
10521080

10531081
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1068,6 +1096,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
10681096
upgradeFrom14_14();
10691097
upgradeFrom14_15();
10701098
upgradeFrom14_16();
1099+
upgradeFrom14_17();
10711100
upgradeFromAll();
10721101

10731102
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1087,6 +1116,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
10871116
upgradeFrom14_14();
10881117
upgradeFrom14_15();
10891118
upgradeFrom14_16();
1119+
upgradeFrom14_17();
10901120
upgradeFromAll();
10911121

10921122
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1105,6 +1135,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
11051135
upgradeFrom14_14();
11061136
upgradeFrom14_15();
11071137
upgradeFrom14_16();
1138+
upgradeFrom14_17();
11081139
upgradeFromAll();
11091140

11101141
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1122,6 +1153,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
11221153
upgradeFrom14_14();
11231154
upgradeFrom14_15();
11241155
upgradeFrom14_16();
1156+
upgradeFrom14_17();
11251157
upgradeFromAll();
11261158

11271159
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1138,6 +1170,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
11381170
upgradeFrom14_14();
11391171
upgradeFrom14_15();
11401172
upgradeFrom14_16();
1173+
upgradeFrom14_17();
11411174
upgradeFromAll();
11421175

11431176
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1153,6 +1186,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
11531186
upgradeFrom14_14();
11541187
upgradeFrom14_15();
11551188
upgradeFrom14_16();
1189+
upgradeFrom14_17();
11561190
upgradeFromAll();
11571191

11581192
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1167,6 +1201,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
11671201
upgradeFrom14_14();
11681202
upgradeFrom14_15();
11691203
upgradeFrom14_16();
1204+
upgradeFrom14_17();
11701205
upgradeFromAll();
11711206

11721207
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1180,6 +1215,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
11801215
try {
11811216
upgradeFrom14_15();
11821217
upgradeFrom14_16();
1218+
upgradeFrom14_17();
11831219
upgradeFromAll();
11841220

11851221
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1192,6 +1228,7 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
11921228
} else if (VERSION_14_16.equals(form.targetVersion)) {
11931229
try {
11941230
upgradeFrom14_16();
1231+
upgradeFrom14_17();
11951232
upgradeFromAll();
11961233

11971234
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@@ -1201,6 +1238,18 @@ public HtmlResponse upgradeFrom(final UpgradeForm form) {
12011238
logger.warn("Failed to upgrade data.", e);
12021239
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_16, e.getLocalizedMessage()));
12031240
}
1241+
} else if (VERSION_14_17.equals(form.targetVersion)) {
1242+
try {
1243+
upgradeFrom14_17();
1244+
upgradeFromAll();
1245+
1246+
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
1247+
1248+
systemHelper.reloadConfiguration();
1249+
} catch (final Exception e) {
1250+
logger.warn("Failed to upgrade data.", e);
1251+
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_14_17, e.getLocalizedMessage()));
1252+
}
12041253
} else {
12051254
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
12061255
}
@@ -1440,6 +1489,10 @@ private void upgradeFrom14_16() {
14401489
// nothing
14411490
}
14421491

1492+
private void upgradeFrom14_17() {
1493+
// nothing
1494+
}
1495+
14431496
private String[] getDictionaryPaths() {
14441497
try (CurlResponse response = ComponentUtil.getCurlHelper().get("/_configsync/file").param("size", "1000").execute()) {
14451498
if (response.getHttpStatusCode() == 200) {

‎src/main/java/org/codelibs/fess/helper/SystemHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void init() {
135135
logger.debug("Initialize {}", this.getClass().getSimpleName());
136136
}
137137
final Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
138-
cal.set(2026, 3 - 1, 1); // EOL Date
138+
cal.set(2026, 6 - 1, 1); // EOL Date
139139
eolTime = cal.getTimeInMillis();
140140
if (isEoled()) {
141141
logger.error("Your system is out of support. See https://fess.codelibs.org/eol.html");

‎src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
<la:option value="14.13">14.13</la:option>
8585
<la:option value="14.14">14.14</la:option>
8686
<la:option value="14.15">14.15</la:option>
87-
<la:option value="14.15">14.16</la:option>
87+
<la:option value="14.16">14.16</la:option>
88+
<la:option value="14.17">14.17</la:option>
8889
</la:select>
8990
</div>
9091
</div>

0 commit comments

Comments
 (0)