[maven-release-plugin] prepare for next development iteration

[maven-release-plugin] prepare release fess-14.18.0
fix #2858 upgrade tasks for 14.18
2024-11-21 05:57:26 +00:00 · 2024-11-21 05:57:24 +00:00 · 2024-11-21 10:14:06 +09:00 · 2024-11-21 10:03:16 +09:00
7 changed files with 68 additions and 14 deletions
--- a/dbflute.xml
+++ b/dbflute.xml
@ -2,7 +2,7 @@
 <project name="dbflute" basedir=".">
 	<property name="mydbflute.dir" value="${basedir}/mydbflute" />
 	<property name="target.dir" value="${basedir}/target" />
-	<property name="branch.name" value="fess-14.17" />
+	<property name="branch.name" value="fess-14.18" />
 	<property name="mydbflute.url" value="https://github.com/lastaflute/lastaflute-example-waterfront/archive/${branch.name}.zip" />

 	<target name="mydbflute.check">
--- a/module.xml
+++ b/module.xml
@ -6,7 +6,7 @@
 	<!-- Maven Repository -->
 	<property name="maven.snapshot.repo.url" value="https://maven.codelibs.org/" />
 	<property name="maven.release.repo.url" value="https://maven.codelibs.org/" />
-	<property name="opensearch.version" value="2.17.0" />
+	<property name="opensearch.version" value="2.18.0" />

 	<target name="install.modules">
 		<mkdir dir="${target.dir}" />
--- a/plugin.xml
+++ b/plugin.xml
@ -17,8 +17,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-extension" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
@ -26,8 +26,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
@ -35,8 +35,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>
 		<!-- minhash -->
 		<antcall target="install.plugin">
@ -44,8 +44,8 @@
 			<param name="plugin.groupId" value="org/codelibs/opensearch" />
 			<param name="plugin.name.prefix" value="opensearch-" />
 			<param name="plugin.name" value="minhash" />
-			<param name="plugin.version" value="2.17.0" />
-			<param name="plugin.zip.version" value="2.17.0" />
+			<param name="plugin.version" value="2.18.0" />
+			<param name="plugin.zip.version" value="2.18.0" />
 		</antcall>

 		<antcall target="remove.jars" />
--- a/pom.xml
+++ b/pom.xml
@ -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.18.0-SNAPSHOT</version>
+	<version>14.18.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>Fess</name>
 	<description>Fess is Full tExt Search System.</description>
@ -30,7 +30,7 @@
 	<parent>
 		<groupId>org.codelibs.fess</groupId>
 		<artifactId>fess-parent</artifactId>
-		<version>14.18.0-SNAPSHOT</version>
+		<version>14.18.0</version>
 		<relativePath />
 	</parent>
 	<properties>
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@ -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
    //
@ -227,6 +229,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -272,6 +275,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -316,6 +320,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -359,6 +364,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -401,6 +407,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -442,6 +449,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -482,6 +490,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -521,6 +530,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -559,6 +569,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -596,6 +607,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -632,6 +644,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -666,6 +679,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -699,6 +713,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -731,6 +746,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -762,6 +778,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -793,6 +810,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -823,6 +841,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -852,6 +871,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -880,6 +900,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -907,6 +928,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -933,6 +955,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -958,6 +981,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -982,6 +1006,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1005,6 +1030,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1027,6 +1053,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1048,6 +1075,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1068,6 +1096,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1087,6 +1116,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1105,6 +1135,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1122,6 +1153,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1138,6 +1170,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1153,6 +1186,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1167,6 +1201,7 @@ public class AdminUpgradeAction extends FessAdminAction {
                upgradeFrom14_14();
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1180,6 +1215,7 @@ public class AdminUpgradeAction extends FessAdminAction {
            try {
                upgradeFrom14_15();
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1192,6 +1228,7 @@ public class AdminUpgradeAction extends FessAdminAction {
        } else if (VERSION_14_16.equals(form.targetVersion)) {
            try {
                upgradeFrom14_16();
+                upgradeFrom14_17();
                upgradeFromAll();

                saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -1201,6 +1238,18 @@ public class AdminUpgradeAction extends FessAdminAction {
                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));
        }
@ -1440,6 +1489,10 @@ public class AdminUpgradeAction extends FessAdminAction {
        // 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) {
--- a/src/main/java/org/codelibs/fess/helper/SystemHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SystemHelper.java
@ -135,7 +135,7 @@ public class SystemHelper {
            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");
--- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
@ -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>
Author	SHA1	Message	Date
Shinsuke Sugaya	de9652cfe1	[maven-release-plugin] prepare for next development iteration	2024-11-21 05:57:26 +00:00
Shinsuke Sugaya	f80acf08a1	[maven-release-plugin] prepare release fess-14.18.0	2024-11-21 05:57:24 +00:00
Shinsuke Sugaya	84178f793b	fix #2858 upgrade tasks for 14.18	2024-11-21 10:14:06 +09:00
Shinsuke Sugaya	d6248035a3	fess-parent 14.18.0	2024-11-21 10:03:16 +09:00