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

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.0.1-SNAPSHOT</version>
+	<version>14.0.2-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.0.0</version>
+		<version>14.0.1</version>
 		<relativePath />
 	</parent>
 	<properties>

src/main/java/org/codelibs/fess/FessBoot.java

@@ -37,6 +37,8 @@ public class FessBoot extends TomcatBoot {
 
     private static final String FESS_TEMP_PATH = "fess.temp.path";
 
+    private static final String FESS_VAR_PATH = "fess.var.path";
+
     private static final String FESS_WEBAPP_PATH = "fess.webapp.path";
 
     private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
@@ -74,7 +76,10 @@ public class FessBoot extends TomcatBoot {
 
         final TomcatBoot tomcatBoot = new FessBoot(getPort(), getContextPath()) //
                 .useTldDetect(); // for JSP
-        if (tempPath != null) {
+        final String varPath = System.getProperty(FESS_VAR_PATH);
+        if (varPath != null) {
+            tomcatBoot.atBaseDir(new File(varPath, "webapp").getAbsolutePath());
+        } else if (tempPath != null) {
             tomcatBoot.atBaseDir(new File(tempPath, "webapp").getAbsolutePath());
         }
         final String tomcatConfigPath = getTomcatConfigPath();
@@ -90,8 +95,8 @@ public class FessBoot extends TomcatBoot {
             op.replace("fess.log.path", fessLogPath.replace("\\", "/"));
         }).asYouLikeIt(resource -> {
             final Host host = resource.getHost();
-            if (host instanceof StandardHost) {
-                ((StandardHost) host).setErrorReportValveClass(SuppressErrorReportValve.class.getName());
+            if (host instanceof StandardHost standardHost) {
+                standardHost.setErrorReportValveClass(SuppressErrorReportValve.class.getName());
             }
         }).useTldDetect(jarName -> (jarName.contains("jstl") || jarName.contains("lasta-taglib"))).asDevelopment(isNoneEnv()).bootAwait();
     }

src/main/java/org/codelibs/fess/app/web/admin/maintenance/AdminMaintenanceAction.java

@@ -217,7 +217,7 @@ public class AdminMaintenanceAction extends FessAdminAction {
     }
 
     protected void writeFessBasicConfig(final ZipOutputStream zos, final String id) {
-        final String index = ".fess_basic_config";
+        final String index = "fess_basic_config";
         final ZipEntry entry = new ZipEntry(id + "/fess_basic_config.bulk");
         try {
             zos.putNextEntry(entry);

src/main/java/org/codelibs/fess/mylasta/action/FessLabels.java

@@ -3081,7 +3081,7 @@ public class FessLabels extends UserMessages {
     /** The key of the message: Crawler Indices */
     public static final String LABELS_clear_crawler_index = "{labels.clear_crawler_index}";
 
-    /** The key of the message: Clear .crawler Indices */
+    /** The key of the message: Clear Crawler Indices */
     public static final String LABELS_clear_crawler_index_button = "{labels.clear_crawler_index_button}";
 
     /** The key of the message: Diagnostic */

src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java

@@ -355,7 +355,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /** The key of the configuration. e.g. 60 */
     String CRAWLER_SYSTEM_MONITOR_INTERVAL = "crawler.system.monitor.interval";
 
-    /** The key of the configuration. e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.* */
+    /** The key of the configuration. e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.* */
     String CRAWLER_METADATA_CONTENT_EXCLUDES = "crawler.metadata.content.excludes";
 
     /** The key of the configuration. e.g. title=title:string<br>
@@ -2691,7 +2691,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
 
     /**
      * Get the value for the key 'crawler.metadata.content.excludes'. <br>
-     * The value is, e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.* <br>
+     * The value is, e.g. resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.* <br>
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
     String getCrawlerMetadataContentExcludes();
@@ -10215,7 +10215,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
             defaultMap.put(FessConfig.CRAWLER_IGNORE_CONTENT_EXCEPTION, "true");
             defaultMap.put(FessConfig.CRAWLER_FAILURE_URL_STATUS_CODES, "404");
             defaultMap.put(FessConfig.CRAWLER_SYSTEM_MONITOR_INTERVAL, "60");
-            defaultMap.put(FessConfig.CRAWLER_METADATA_CONTENT_EXCLUDES, "resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*");
+            defaultMap.put(FessConfig.CRAWLER_METADATA_CONTENT_EXCLUDES,
+                    "resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*");
             defaultMap.put(FessConfig.CRAWLER_METADATA_NAME_MAPPING, "title=title:string\nTitle=title:string\n");
             defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_CONTENT_XPATH, "//BODY");
             defaultMap.put(FessConfig.CRAWLER_DOCUMENT_HTML_LANG_XPATH, "//HTML/@lang");

src/main/resources/fess_config.properties

@@ -215,7 +215,7 @@ crawler.ignore.robots.tags=false
 crawler.ignore.content.exception=true
 crawler.failure.url.status.codes=404
 crawler.system.monitor.interval=60
-crawler.metadata.content.excludes=resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*
+crawler.metadata.content.excludes=resourceName,X-Parsed-By,Content-Encoding.*,Content-Type.*,X-TIKA.*
 crawler.metadata.name.mapping=\
 title=title:string\n\
 Title=title:string\n\

src/main/resources/fess_label.properties

@@ -1018,7 +1018,7 @@ labels.maintenance_title_configuration=Maintenance
 labels.number_of_shards_for_doc=The number of shards
 labels.auto_expand_replicas_for_doc=Auto expand replicas
 labels.clear_crawler_index=Crawler Indices
-labels.clear_crawler_index_button=Clear .crawler Indices
+labels.clear_crawler_index_button=Clear Crawler Indices
 labels.diagnostic_logs=Diagnostic
 labels.download_diagnostic_logs_button=Download Logs
 labels.reload_doc_index=Reload Doc Index

src/main/resources/fess_label_en.properties

@@ -1018,7 +1018,7 @@ labels.maintenance_title_configuration=Maintenance
 labels.number_of_shards_for_doc=The number of shards
 labels.auto_expand_replicas_for_doc=Auto expand replicas
 labels.clear_crawler_index=Crawler Indices
-labels.clear_crawler_index_button=Clear .crawler Indices
+labels.clear_crawler_index_button=Clear Crawler Indices
 labels.diagnostic_logs=Diagnostic
 labels.download_diagnostic_logs_button=Download Logs
 labels.reload_doc_index=Reload Doc Index

src/main/resources/fess_label_ja.properties

@@ -1018,7 +1018,7 @@ labels.maintenance_title_configuration=メンテナンス
 labels.number_of_shards_for_doc=シャード数
 labels.auto_expand_replicas_for_doc=最大レプリカ数
 labels.clear_crawler_index=Crawlerインデックス
-labels.clear_crawler_index_button=.crawlerインデックスの削除
+labels.clear_crawler_index_button=クロール用インデックスの削除
 labels.diagnostic_logs=診断
 labels.download_diagnostic_logs_button=ログのダウンロード
 labels.reload_doc_index=ドキュメントインデックスのリロード

src/main/resources/fess_label_ko.properties

@@ -1018,7 +1018,7 @@ labels.maintenance_title_configuration=Maintenance
 labels.number_of_shards_for_doc=The number of shards
 labels.auto_expand_replicas_for_doc=Auto expand replicas
 labels.clear_crawler_index=Crawler Indices
-labels.clear_crawler_index_button=Clear .crawler Indices
+labels.clear_crawler_index_button=Clear Crawler Indices
 labels.diagnostic_logs=Diagnostic
 labels.download_diagnostic_logs_button=Download Logs
 labels.reload_doc_index=Reload Doc Index

src/main/resources/fess_label_ru.properties

@@ -1022,7 +1022,7 @@ labels.maintenance_title_configuration=Maintenance
 labels.number_of_shards_for_doc=The number of shards
 labels.auto_expand_replicas_for_doc=Auto expand replicas
 labels.clear_crawler_index=Crawler Indices
-labels.clear_crawler_index_button=Clear .crawler Indices
+labels.clear_crawler_index_button=Clear Crawler Indices
 labels.diagnostic_logs=Diagnostic
 labels.download_diagnostic_logs_button=Download Logs
 labels.reload_doc_index=Reload Doc Index