fess-parent 15.0.0-SNAPSHOT

codelibs · Oct 17, 2024 · b3ab32a · b3ab32a
2 parents 9a2ee65 + 4f8ca86
commit b3ab32a
Show file tree

Hide file tree

Showing 46 changed files with 115 additions and 122 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -20,10 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'temurin'
     - uses: actions/cache@v1
       with:

diff --git a/fess-crawler-es/pom.xml b/fess-crawler-es/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.codelibs.fess</groupId>
 		<artifactId>fess-crawler-parent</artifactId>
-		<version>14.18.0-SNAPSHOT</version>
+		<version>15.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<build>
@@ -79,9 +79,9 @@
 			<version>${lasta.di.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>javax.transaction-api</artifactId>
-			<version>${jta.version}</version>
+			<groupId>jakarta.transaction</groupId>
+			<artifactId>jakarta.transaction-api</artifactId>
+			<version>${jakarta.transaction.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/client/FesenClient.java b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/client/FesenClient.java
@@ -24,8 +24,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
-import javax.annotation.PreDestroy;
-
 import org.apache.commons.lang3.RandomUtils;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.ThreadUtil;
@@ -100,6 +98,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PreDestroy;
+
 public class FesenClient implements Client {
     public static final String HTTP_ADDRESS = "crawler.es.http_address";
 

diff --git a/...awler-es/src/main/java/org/codelibs/fess/crawler/service/impl/AbstractCrawlerService.java b/...awler-es/src/main/java/org/codelibs/fess/crawler/service/impl/AbstractCrawlerService.java
@@ -30,8 +30,6 @@
 import java.util.TimeZone;
 import java.util.function.Consumer;
 
-import javax.annotation.Resource;
-
 import org.apache.lucene.search.TotalHits;
 import org.codelibs.core.beans.BeanDesc;
 import org.codelibs.core.beans.Converter;
@@ -85,6 +83,8 @@
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 
+import jakarta.annotation.Resource;
+
 public abstract class AbstractCrawlerService {
     private static final Logger logger = LoggerFactory.getLogger(AbstractCrawlerService.class);
 

diff --git a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsDataService.java b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsDataService.java
@@ -19,8 +19,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import javax.annotation.PostConstruct;
-
 import org.apache.lucene.search.TotalHits;
 import org.codelibs.core.beans.util.BeanUtil;
 import org.codelibs.fess.crawler.entity.EsAccessResult;
@@ -38,6 +36,8 @@
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchHits;
 
+import jakarta.annotation.PostConstruct;
+
 public class EsDataService extends AbstractCrawlerService implements DataService<EsAccessResult> {
 
     public EsDataService(final EsCrawlerConfig crawlerConfig) {

diff --git a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlFilterService.java b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlFilterService.java
@@ -24,8 +24,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-
 import org.codelibs.fess.crawler.entity.EsUrlFilter;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
 import org.codelibs.fess.crawler.service.UrlFilterService;
@@ -37,6 +35,8 @@
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 
+import jakarta.annotation.PostConstruct;
+
 public class EsUrlFilterService extends AbstractCrawlerService implements UrlFilterService {
 
     private static final String FILTER_TYPE = "filterType";

diff --git a/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueService.java b/fess-crawler-es/src/main/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueService.java
@@ -23,10 +23,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.crawler.Constants;
 import org.codelibs.fess.crawler.entity.AccessResult;
@@ -50,6 +46,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.annotation.Resource;
+
 public class EsUrlQueueService extends AbstractCrawlerService implements UrlQueueService<EsUrlQueue> {
     private static final Logger logger = LoggerFactory.getLogger(EsUrlQueueService.class);
 

diff --git a/fess-crawler-es/src/test/java/org/codelibs/fess/crawler/CrawlerTest.java b/fess-crawler-es/src/test/java/org/codelibs/fess/crawler/CrawlerTest.java
@@ -24,8 +24,6 @@
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.crawler.entity.UrlQueue;
 import org.codelibs.fess.crawler.filter.impl.UrlFilterImpl;
@@ -37,6 +35,8 @@
 import org.codelibs.opensearch.runner.OpenSearchRunner;
 import org.dbflute.utflute.lastadi.LastaDiTestCase;
 
+import jakarta.annotation.Resource;
+
 public class CrawlerTest extends LastaDiTestCase {
 
     @Resource

diff --git a/fess-crawler-es/src/test/java/org/codelibs/fess/crawler/service/impl/EsDataServiceTest.java b/fess-crawler-es/src/test/java/org/codelibs/fess/crawler/service/impl/EsDataServiceTest.java
@@ -21,14 +21,14 @@
 import java.util.List;
 import java.util.UUID;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.crawler.entity.AccessResult;
 import org.codelibs.fess.crawler.entity.EsAccessResult;
 import org.codelibs.opensearch.runner.OpenSearchRunner;
 import org.dbflute.utflute.lastadi.LastaDiTestCase;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  *

diff --git a/...rawler-es/src/test/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueServiceTest.java b/...rawler-es/src/test/java/org/codelibs/fess/crawler/service/impl/EsUrlQueueServiceTest.java
@@ -19,14 +19,14 @@
 
 import java.util.UUID;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.crawler.client.FesenClient;
 import org.codelibs.fess.crawler.entity.EsUrlQueue;
 import org.codelibs.opensearch.runner.OpenSearchRunner;
 import org.dbflute.utflute.lastadi.LastaDiTestCase;
 import org.opensearch.index.query.QueryBuilders;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  *

diff --git a/fess-crawler-lasta/pom.xml b/fess-crawler-lasta/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.codelibs.fess</groupId>
 		<artifactId>fess-crawler-parent</artifactId>
-		<version>14.18.0-SNAPSHOT</version>
+		<version>15.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<build>
@@ -64,9 +64,9 @@
 			<version>${lasta.di.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>javax.transaction-api</artifactId>
-			<version>${jta.version}</version>
+			<groupId>jakarta.transaction</groupId>
+			<artifactId>jakarta.transaction-api</artifactId>
+			<version>${jakarta.transaction.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/fess-crawler-lasta/src/test/java/org/codelibs/fess/crawler/CrawlerTest.java b/fess-crawler-lasta/src/test/java/org/codelibs/fess/crawler/CrawlerTest.java
@@ -17,11 +17,7 @@
 
 import java.io.File;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.io.ResourceUtil;
-import org.codelibs.fess.crawler.Constants;
-import org.codelibs.fess.crawler.Crawler;
 import org.codelibs.fess.crawler.container.CrawlerContainer;
 import org.codelibs.fess.crawler.entity.UrlQueue;
 import org.codelibs.fess.crawler.filter.impl.UrlFilterImpl;
@@ -31,6 +27,8 @@
 import org.codelibs.fess.crawler.util.CrawlerWebServer;
 import org.dbflute.utflute.lastadi.LastaDiTestCase;
 
+import jakarta.annotation.Resource;
+
 public class CrawlerTest extends LastaDiTestCase {
 
     @Resource

diff --git a/fess-crawler/pom.xml b/fess-crawler/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.codelibs.fess</groupId>
 		<artifactId>fess-crawler-parent</artifactId>
-		<version>14.18.0-SNAPSHOT</version>
+		<version>15.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<build>
@@ -119,9 +119,9 @@
 			<version>${httpcomponents.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax.annotation.api.version}</version>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>${jakarta.annotation.api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.codelibs</groupId>
@@ -307,14 +307,8 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.mail</groupId>
-			<artifactId>javax.mail</artifactId>
-			<version>${javax.mail.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.activation</groupId>
-					<artifactId>activation</artifactId>
-				</exclusion>
-			</exclusions>
+			<artifactId>jakarta.mail</artifactId>
+			<version>${jakarta.mail.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.pdfbox</groupId>

diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/Crawler.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/Crawler.java
@@ -19,8 +19,6 @@
 import java.util.Date;
 import java.util.Locale;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.crawler.client.CrawlerClientFactory;
 import org.codelibs.fess.crawler.container.CrawlerContainer;
@@ -34,6 +32,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.Resource;
+
 /**
  * Crawler manages/controls a crawling information.
  *

diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerThread.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/CrawlerThread.java
@@ -21,8 +21,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.lang.SystemUtil;
@@ -45,6 +43,8 @@
 import org.codelibs.fess.crawler.service.UrlQueueService;
 import org.codelibs.fess.crawler.util.CrawlingParameterUtil;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  *

diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/AbstractCrawlerClient.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/AbstractCrawlerClient.java
@@ -17,8 +17,6 @@
 
 import java.util.Map;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.crawler.container.CrawlerContainer;
 import org.codelibs.fess.crawler.entity.RequestData;
 import org.codelibs.fess.crawler.entity.ResponseData;
@@ -27,6 +25,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  *

diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/CrawlerClientCreator.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/CrawlerClientCreator.java
@@ -20,12 +20,12 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Resource;
-
 import org.codelibs.fess.crawler.container.CrawlerContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.Resource;
+
 public class CrawlerClientCreator {
 
     private static final Logger logger = LoggerFactory.getLogger(CrawlerClientCreator.class);

diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/CrawlerClientFactory.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/CrawlerClientFactory.java
@@ -21,15 +21,15 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.fess.crawler.container.CrawlerContainer;
 import org.codelibs.fess.crawler.exception.CrawlerSystemException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  *

diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/fs/FileSystemClient.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/fs/FileSystemClient.java
@@ -33,8 +33,6 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.annotation.Resource;
-
 import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.io.InputStreamUtil;
 import org.codelibs.core.lang.StringUtil;
@@ -55,6 +53,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.Resource;
+
 /**
  * FileSystemClient is CrawlerClient implementation to crawl files on a file
  * system.

diff --git a/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpClient.java b/fess-crawler/src/main/java/org/codelibs/fess/crawler/client/ftp/FtpClient.java
@@ -31,8 +31,6 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import javax.annotation.Resource;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
@@ -64,6 +62,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.Resource;
+
 /**
  * @author shinsuke
  *