fess-parent 15.0.0-SNAPSHOT

.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:

pom.xml

@@ -4,7 +4,7 @@
 	<artifactId>fess-ingest-ndjson</artifactId>
 	<packaging>jar</packaging>
 	<name>NDJSON Ingester</name>
-	<version>14.12.0-SNAPSHOT</version>
+	<version>15.0.0-SNAPSHOT</version>
 	<scm>
 		<connection>scm:git:[email protected]:codelibs/fess-ingest-ndjson.git</connection>
 		<developerConnection>scm:git:[email protected]:codelibs/fess-ingest-ndjson.git</developerConnection>
@@ -13,7 +13,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>
 	<build>
@@ -51,15 +51,15 @@
 	</repositories>
 	<dependencies>
 		<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>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>${javax.servlet.api.version}</version>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<version>${jakarta.servlet.api.version}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -102,7 +102,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/ingest/ndjson/NdjsonIngester.java

@@ -28,9 +28,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
 import org.codelibs.core.exception.IORuntimeException;
 import org.codelibs.core.io.CloseableUtil;
 import org.codelibs.core.lang.StringUtil;
@@ -50,6 +47,9 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+
 public class NdjsonIngester extends Ingester {
     private static final Logger logger = LoggerFactory.getLogger(NdjsonIngester.class);
     private static final String NONE = "none";