fix #2788 bump up to tomcat 10.1

deps.xml

@@ -24,13 +24,13 @@
 		<mkdir dir="${suggest.dir}/lib" />
 		<delete dir="${thumbnail.dir}/lib" />
 		<mkdir dir="${thumbnail.dir}/lib" />
-		<!-- javax.annotation-api -->
+		<!-- annotation-api -->
 		<antcall target="install.env.jar">
 			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="jar.groupId" value="javax/annotation" />
-			<param name="jar.artifactId" value="javax.annotation-api" />
-			<param name="jar.version" value="1.3.2" />
-			<param name="file.version" value="1.3.2" />
+			<param name="jar.groupId" value="jakarta/annotation" />
+			<param name="jar.artifactId" value="jakarta.annotation-api" />
+			<param name="jar.version" value="2.1.1" />
+			<param name="file.version" value="2.1.1" />
 		</antcall>
 		<!-- kopf -->
 		<get dest="${target.dir}/kopf.zip">

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.12.0-SNAPSHOT</version>
+	<version>15.0.0-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.12.0-SNAPSHOT</version>
+		<version>15.0.0-SNAPSHOT</version>
 		<relativePath />
 	</parent>
 	<properties>
@@ -939,16 +939,31 @@
 
 		<!-- J2EE -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>${jstl.version}</version>
+			<groupId>jakarta.servlet.jsp.jstl</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+			<version>${jakarta.jstl.api.version}</version>
 			<!-- contains taglibs.standard -->
 			<!-- <scope>provided</scope> -->
+			<exclusions>
+				<exclusion>
+					<groupId>jakarta.el</groupId>
+					<artifactId>jakarta.el-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>jakarta.servlet</groupId>
+					<artifactId>jakarta.servlet-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl</artifactId>
+			<version>${jakarta.jstl.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>javax.transaction-api</artifactId>
-			<version>${javax.transaction.api.version}</version>
+			<groupId>jakarta.transaction</groupId>
+			<artifactId>jakarta.transaction-api</artifactId>
+			<version>${jakarta.transaction.api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
@@ -1314,7 +1329,7 @@
 			<version>${okhttp.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.onelogin</groupId>
+			<groupId>org.codelibs</groupId>
 			<artifactId>java-saml</artifactId>
 			<version>${java.saml.version}</version>
 			<exclusions>
@@ -1339,8 +1354,8 @@
 
 		<!-- fileupload -->
 		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-fileupload2-jakarta</artifactId>
 			<version>${commons.fileupload.version}</version>
 		</dependency>
 
@@ -1528,7 +1543,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.dbflute.utflute</groupId>
-			<artifactId>utflute-lastaflute</artifactId>
+			<artifactId>utflute-lastaflute-jakarta</artifactId>
 			<version>${utflute.version}</version>
 			<scope>test</scope>
 		</dependency>

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

@@ -30,6 +30,7 @@ import org.apache.catalina.startup.Tomcat;
 import org.apache.tomcat.util.http.CookieProcessorBase;
 import org.apache.tomcat.util.http.Rfc6265CookieProcessor;
 import org.apache.tomcat.util.net.SSLHostConfig;
+import org.apache.tomcat.util.net.SSLHostConfigCertificate;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.tomcat.valve.SuppressErrorReportValve;
 import org.codelibs.fess.tomcat.webresources.FessWebResourceRoot;
@@ -171,12 +172,16 @@ public class FessBoot extends TomcatBoot {
                     connector.setProperty("SSLEnabled", "true");
                     final SSLHostConfig sslHostConfig = new SSLHostConfig();
                     sslHostConfig.setHostName("_default_");
-                    doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> sslHostConfig.setCertificateKeystoreFile(v));
-                    doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> sslHostConfig.setCertificateKeystorePassword(v));
-                    doSetupServerConfig(logger, props, "certificateKeyAlias", v -> sslHostConfig.setCertificateKeyAlias(v));
+                    final SSLHostConfigCertificate certificate =
+                            new SSLHostConfigCertificate(sslHostConfig, SSLHostConfigCertificate.Type.UNDEFINED);
+                    doSetupServerConfig(logger, props, "certificateKeystoreFile", v -> certificate.setCertificateKeystoreFile(v));
+                    doSetupServerConfig(logger, props, "certificateKeystorePassword", v -> certificate.setCertificateKeystorePassword(v));
+                    doSetupServerConfig(logger, props, "certificateKeyAlias", v -> certificate.setCertificateKeyAlias(v));
                     doSetupServerConfig(logger, props, "sslProtocol", v -> sslHostConfig.setSslProtocol(v));
                     doSetupServerConfig(logger, props, "enabledProtocols", v -> sslHostConfig.setEnabledProtocols(v.trim().split(",")));
+                    sslHostConfig.addCertificate(certificate);
                     connector.addSslHostConfig(sslHostConfig);
+
                 }
             });
             doSetupServerConfig(logger, props, "sameSiteCookies", value -> {

src/main/java/org/codelibs/fess/api/BaseApiManager.java

@@ -20,14 +20,14 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.fess.Constants;
 import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public abstract class BaseApiManager implements WebApiManager {
 
     private static final String API_FORMAT_TYPE = "apiFormatType";

src/main/java/org/codelibs/fess/api/WebApiManager.java

@@ -17,10 +17,10 @@ package org.codelibs.fess.api;
 
 import java.io.IOException;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public interface WebApiManager {
 

src/main/java/org/codelibs/fess/api/WebApiManagerFactory.java

@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public class WebApiManagerFactory {
 

src/main/java/org/codelibs/fess/api/WebApiRequest.java

@@ -15,8 +15,8 @@
  */
 package org.codelibs.fess.api;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
 
 public class WebApiRequest extends HttpServletRequestWrapper {
     protected String servletPath;

src/main/java/org/codelibs/fess/api/WebApiResponse.java

@@ -18,11 +18,11 @@ package org.codelibs.fess.api;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-
 import org.apache.commons.io.output.ByteArrayOutputStream;
 
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+
 public class WebApiResponse extends HttpServletResponseWrapper {
 
     public WebApiResponse(final HttpServletResponse response) {

src/main/java/org/codelibs/fess/api/engine/SearchEngineApiManager.java

@@ -23,14 +23,6 @@ import java.nio.file.Path;
 import java.util.Locale;
 import java.util.UUID;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.catalina.connector.ClientAbortException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -49,6 +41,14 @@ import org.codelibs.fess.util.ResourceUtil;
 import org.lastaflute.web.servlet.request.RequestManager;
 import org.lastaflute.web.servlet.session.SessionManager;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SearchEngineApiManager extends BaseApiManager {
     private static final String ADMIN_SERVER = "/admin/server_";
 

src/main/java/org/codelibs/fess/api/json/SearchApiManager.java

@@ -32,12 +32,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.function.Supplier;
 
-import javax.annotation.PostConstruct;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
@@ -83,6 +77,12 @@ import org.lastaflute.web.util.LaRequestUtil;
 import org.lastaflute.web.util.LaResponseUtil;
 import org.opensearch.script.Script;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class SearchApiManager extends BaseApiManager {
 
     private static final Logger logger = LogManager.getLogger(SearchApiManager.class);

src/main/java/org/codelibs/fess/app/job/AllJobScheduler.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.app.job;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.lang.StringUtil;
@@ -36,6 +34,8 @@ import org.lastaflute.job.LaJob;
 import org.lastaflute.job.LaJobRunner;
 import org.lastaflute.job.LaJobScheduler;
 
+import jakarta.annotation.Resource;
+
 public class AllJobScheduler implements LaJobScheduler {
 
     private static final Logger logger = LogManager.getLogger(AllJobScheduler.class);

src/main/java/org/codelibs/fess/app/logic/AccessContextLogic.java

@@ -15,14 +15,14 @@
  */
 package org.codelibs.fess.app.logic;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.dbflute.hook.AccessContext;
 import org.dbflute.optional.OptionalThing;
 import org.lastaflute.core.time.TimeManager;
 import org.lastaflute.db.dbflute.accesscontext.AccessContextResource;
 
+import jakarta.annotation.Resource;
+
 public class AccessContextLogic {
 
     // ===================================================================================

src/main/java/org/codelibs/fess/app/service/AccessTokenService.java

@@ -21,9 +21,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -38,6 +35,9 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+
 public class AccessTokenService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/BadWordService.java

@@ -21,8 +21,6 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@@ -43,6 +41,8 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;
 
+import jakarta.annotation.Resource;
+
 public class BadWordService {
 
     private static final String DELETE_PREFIX = "--";

src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class BoostDocumentRuleService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/CharMappingService.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.CharMappingPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.dict.mapping.CharMappingItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class CharMappingService {
     @Resource
     protected DictionaryManager dictionaryManager;

src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java

@@ -28,8 +28,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.CoreLibConstants;
@@ -54,6 +52,8 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;
 
+import jakarta.annotation.Resource;
+
 public class CrawlingInfoService {
 
     private static final Logger logger = LogManager.getLogger(CrawlingInfoService.class);

src/main/java/org/codelibs/fess/app/service/DataConfigService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -32,6 +30,8 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class DataConfigService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class DuplicateHostService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/ElevateWordService.java

@@ -25,8 +25,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@@ -52,6 +50,8 @@ import com.orangesignal.csv.CsvConfig;
 import com.orangesignal.csv.CsvReader;
 import com.orangesignal.csv.CsvWriter;
 
+import jakarta.annotation.Resource;
+
 public class ElevateWordService {
 
     private static final Logger logger = LogManager.getLogger(ElevateWordService.class);

src/main/java/org/codelibs/fess/app/service/FailureUrlService.java

@@ -20,8 +20,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@@ -39,6 +37,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class FailureUrlService {
 
     private static final Logger logger = LogManager.getLogger(FailureUrlService.class);

src/main/java/org/codelibs/fess/app/service/FavoriteLogService.java

@@ -20,8 +20,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.es.log.exbhv.FavoriteLogBhv;
 import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
 import org.codelibs.fess.es.log.exentity.FavoriteLog;
@@ -31,6 +29,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.ListResultBean;
 
+import jakarta.annotation.Resource;
+
 public class FavoriteLogService {
     @Resource
     protected SystemHelper systemHelper;

src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.FileAuthPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class FileAuthenticationService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/FileConfigService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -33,6 +31,8 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class FileConfigService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/GroupService.java

@@ -19,8 +19,6 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.GroupPager;
@@ -33,6 +31,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class GroupService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/JobLogService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.JobLogPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class JobLogService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/KeyMatchService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -30,6 +28,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class KeyMatchService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/KuromojiService.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.KuromojiPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.dict.kuromoji.KuromojiItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class KuromojiService {
     @Resource
     protected DictionaryManager dictionaryManager;

src/main/java/org/codelibs/fess/app/service/LabelTypeService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -32,6 +30,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class LabelTypeService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/PathMappingService.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collection;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -32,6 +30,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class PathMappingService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/ProtwordsService.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ProtwordsPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.dict.protwords.ProtwordsItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class ProtwordsService {
     @Resource
     protected DictionaryManager dictionaryManager;

src/main/java/org/codelibs/fess/app/service/RelatedContentService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -31,6 +29,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class RelatedContentService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/RelatedQueryService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -31,6 +29,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class RelatedQueryService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.ReqHeaderPager;
@@ -29,6 +27,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class RequestHeaderService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/RoleService.java

@@ -19,8 +19,6 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RolePager;
@@ -33,6 +31,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class RoleService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/RoleTypeService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.RoleTypePager;
@@ -29,6 +27,8 @@ import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class RoleTypeService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@@ -33,6 +31,8 @@ import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 import org.lastaflute.job.LaCron;
 
+import jakarta.annotation.Resource;
+
 public class ScheduledJobService {
 
     private static final Logger logger = LogManager.getLogger(ScheduledJobService.class);

src/main/java/org/codelibs/fess/app/service/SearchLogService.java

@@ -27,8 +27,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@@ -61,6 +59,8 @@ import org.opensearch.search.aggregations.bucket.terms.Terms;
 import org.opensearch.search.aggregations.metrics.Avg;
 import org.opensearch.search.aggregations.metrics.Cardinality;
 
+import jakarta.annotation.Resource;
+
 public class SearchLogService {
 
     private static final String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";

src/main/java/org/codelibs/fess/app/service/StemmerOverrideService.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.StemmerOverridePager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.dict.stemmeroverride.StemmerOverrideItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class StemmerOverrideService {
     @Resource
     protected DictionaryManager dictionaryManager;

src/main/java/org/codelibs/fess/app/service/StopwordsService.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.StopwordsPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.dict.stopwords.StopwordsItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class StopwordsService {
     @Resource
     protected DictionaryManager dictionaryManager;

src/main/java/org/codelibs/fess/app/service/SynonymService.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.service;
 import java.util.Collections;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.SynonymPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.dict.synonym.SynonymItem;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class SynonymService {
     @Resource
     protected DictionaryManager dictionaryManager;

src/main/java/org/codelibs/fess/app/service/UserInfoService.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.service;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.es.log.exbhv.UserInfoBhv;
 import org.codelibs.fess.helper.SystemHelper;
 
+import jakarta.annotation.Resource;
+
 public class UserInfoService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/UserService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -33,6 +31,8 @@ import org.codelibs.fess.util.ComponentUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class UserService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.pager.WebAuthPager;
@@ -30,6 +28,8 @@ import org.codelibs.fess.util.ParameterUtil;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class WebAuthenticationService {
 
     @Resource

src/main/java/org/codelibs/fess/app/service/WebConfigService.java

@@ -17,8 +17,6 @@ package org.codelibs.fess.app.service;
 
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -34,6 +32,8 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.cbean.result.PagingResultBean;
 import org.dbflute.optional.OptionalEntity;
 
+import jakarta.annotation.Resource;
+
 public class WebConfigService extends FessAppService {
 
     @Resource

src/main/java/org/codelibs/fess/app/web/admin/accesstoken/AdminAccesstokenAction.java

@@ -20,8 +20,6 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -42,6 +40,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  */

src/main/java/org/codelibs/fess/app/web/admin/accesstoken/CreateForm.java

@@ -15,15 +15,15 @@
  */
 package org.codelibs.fess.app.web.admin.accesstoken;
 
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.CustomSize;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 public class CreateForm {
 
     @ValidateTypeFailure

src/main/java/org/codelibs/fess/app/web/admin/accesstoken/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.accesstoken;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author jflute

src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java

@@ -43,8 +43,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -80,6 +78,8 @@ import org.xml.sax.InputSource;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  */

src/main/java/org/codelibs/fess/app/web/admin/badword/AdminBadwordAction.java

@@ -25,8 +25,6 @@ import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.concurrent.CommonPoolUtil;
 import org.codelibs.fess.Constants;
@@ -49,6 +47,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/badword/CreateForm.java

@@ -15,13 +15,13 @@
  */
 package org.codelibs.fess.app.web.admin.badword;
 
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/badword/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.badword;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/AdminBoostdocAction.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.app.web.admin.boostdoc;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
@@ -35,6 +33,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  */

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/CreateForm.java

@@ -15,15 +15,15 @@
  */
 package org.codelibs.fess.app.web.admin.boostdoc;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 public class CreateForm {
 
     @ValidateTypeFailure

src/main/java/org/codelibs/fess/app/web/admin/boostdoc/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.boostdoc;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author jflute

src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.app.web.admin.crawlinginfo;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.Constants;
@@ -32,6 +30,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Shunji Makino

src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.crawlinginfo;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author Shunji Makino

src/main/java/org/codelibs/fess/app/web/admin/dashboard/AdminDashboardAction.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.app.web.admin.dashboard;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.api.engine.SearchEngineApiManager;
 import org.codelibs.fess.app.web.base.FessAdminAction;
@@ -25,6 +23,8 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java

@@ -25,8 +25,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
@@ -49,6 +47,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/dataconfig/CreateForm.java

@@ -15,16 +15,16 @@
  */
 package org.codelibs.fess.app.web.admin.dataconfig;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.CustomSize;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/dataconfig/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.dataconfig;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.design;
 
-import javax.validation.constraints.Pattern;
-
 import org.lastaflute.web.ruts.multipart.MultipartFormFile;
 import org.lastaflute.web.validation.Required;
 
+import jakarta.validation.constraints.Pattern;
+
 public class UploadForm {
 
     @Required

src/main/java/org/codelibs/fess/app/web/admin/dict/AdminDictAction.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.app.web.admin.dict;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.web.base.FessAdminAction;
 import org.codelibs.fess.dict.DictionaryFile;
@@ -27,6 +25,8 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java

@@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -44,6 +42,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/CreateForm.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.app.web.admin.dict.kuromoji;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/AdminDictMappingAction.java

@@ -21,8 +21,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -46,6 +44,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author nullpos
  * @author ma2tani

src/main/java/org/codelibs/fess/app/web/admin/dict/mapping/CreateForm.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.app.web.admin.dict.mapping;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author nullpos
  * @author ma2tani

src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/AdminDictProtwordsAction.java

@@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -44,6 +42,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author ma2tani
  */

src/main/java/org/codelibs/fess/app/web/admin/dict/protwords/CreateForm.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.app.web.admin.dict.protwords;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author ma2tani
  */

src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/AdminDictStemmeroverrideAction.java

@@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -44,6 +42,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  */

src/main/java/org/codelibs/fess/app/web/admin/dict/stemmeroverride/CreateForm.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.app.web.admin.dict.stemmeroverride;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/AdminDictStopwordsAction.java

@@ -19,8 +19,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -42,6 +40,8 @@ import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author ma2tani
  */

src/main/java/org/codelibs/fess/app/web/admin/dict/stopwords/CreateForm.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.app.web.admin.dict.stopwords;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author ma2tani
  */

src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java

@@ -21,8 +21,6 @@ import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
@@ -46,6 +44,8 @@ import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaErrorHook;
 import org.lastaflute.web.validation.exception.ValidationErrorException;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/CreateForm.java

@@ -15,12 +15,12 @@
  */
 package org.codelibs.fess.app.web.admin.dict.synonym;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/AdminDuplicatehostAction.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.app.web.admin.duplicatehost;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.pager.DuplicateHostPager;
@@ -34,6 +32,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/CreateForm.java

@@ -15,15 +15,15 @@
  */
 package org.codelibs.fess.app.web.admin.duplicatehost;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/duplicatehost/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.duplicatehost;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/elevateword/AdminElevatewordAction.java

@@ -30,8 +30,6 @@ import java.nio.file.Path;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.core.concurrent.CommonPoolUtil;
 import org.codelibs.core.lang.StringUtil;
@@ -57,6 +55,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/elevateword/CreateForm.java

@@ -15,13 +15,13 @@
  */
 package org.codelibs.fess.app.web.admin.elevateword;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.CustomSize;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/elevateword/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.elevateword;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.app.web.admin.failureurl;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.pager.FailureUrlPager;
@@ -29,6 +27,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/failureurl/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.failureurl;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/fileauth/AdminFileauthAction.java

@@ -21,8 +21,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.pager.FileAuthPager;
@@ -42,6 +40,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/fileauth/CreateForm.java

@@ -15,15 +15,15 @@
  */
 package org.codelibs.fess.app.web.admin.fileauth;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/fileauth/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.fileauth;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/fileconfig/AdminFileconfigAction.java

@@ -21,8 +21,6 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
@@ -45,6 +43,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/fileconfig/CreateForm.java

@@ -15,10 +15,6 @@
  */
 package org.codelibs.fess.app.web.admin.fileconfig;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.mylasta.direction.FessConfig;
@@ -29,6 +25,10 @@ import org.codelibs.fess.validation.UriTypeValidator.ProtocolType;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/fileconfig/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.fileconfig;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/general/AdminGeneralAction.java

@@ -22,8 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.core.beans.util.BeanUtil;
@@ -41,6 +39,8 @@ import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Shunji Makino

src/main/java/org/codelibs/fess/app/web/admin/general/EditForm.java

@@ -15,13 +15,13 @@
  */
 package org.codelibs.fess.app.web.admin.general;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author Shunji Makino

src/main/java/org/codelibs/fess/app/web/admin/general/MailForm.java

@@ -15,10 +15,10 @@
  */
 package org.codelibs.fess.app.web.admin.general;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  */

src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java

@@ -19,8 +19,6 @@ import java.util.Base64;
 import java.util.Map;
 import java.util.function.Consumer;
 
-import javax.annotation.Resource;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.codelibs.fess.Constants;
@@ -41,6 +39,8 @@ import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 import org.lastaflute.web.validation.VaMessenger;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/group/CreateForm.java

@@ -18,12 +18,12 @@ package org.codelibs.fess.app.web.admin.group;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author shinsuke
  * @author Keiichi Watanabe

src/main/java/org/codelibs/fess/app/web/admin/group/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.group;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author Keiichi Watanabe
  */

src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java

@@ -18,8 +18,6 @@ package org.codelibs.fess.app.web.admin.joblog;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.pager.JobLogPager;
@@ -32,6 +30,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Shunji Makino

src/main/java/org/codelibs/fess/app/web/admin/keymatch/AdminKeymatchAction.java

@@ -19,8 +19,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
 import org.codelibs.fess.app.pager.KeyMatchPager;
@@ -39,6 +37,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author jflute

src/main/java/org/codelibs/fess/app/web/admin/keymatch/CreateForm.java

@@ -15,16 +15,16 @@
  */
 package org.codelibs.fess.app.web.admin.keymatch;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
-
 import org.codelibs.fess.app.web.CrudMode;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.validation.CustomSize;
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author jflute

src/main/java/org/codelibs/fess/app/web/admin/keymatch/EditForm.java

@@ -15,11 +15,11 @@
  */
 package org.codelibs.fess.app.web.admin.keymatch;
 
-import javax.validation.constraints.Size;
-
 import org.lastaflute.web.validation.Required;
 import org.lastaflute.web.validation.theme.conversion.ValidateTypeFailure;
 
+import jakarta.validation.constraints.Size;
+
 /**
  * @author codelibs
  * @author jflute

src/main/java/org/codelibs/fess/app/web/admin/labeltype/AdminLabeltypeAction.java

@@ -21,8 +21,6 @@ import static org.codelibs.core.stream.StreamUtil.stream;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.annotation.Secured;
@@ -43,6 +41,8 @@ import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
 import org.lastaflute.web.ruts.process.ActionRuntime;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  * @author Shunji Makino