Tomcat10

.settings/org.eclipse.jdt.core.prefs

@@ -1,15 +1,18 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=21
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

README.md

@@ -18,7 +18,7 @@ Automatically shutdown before next process boot
 <dependency>
     <groupId>org.dbflute.tomcat</groupId>
     <artifactId>tomcat-boot</artifactId>
-    <version>0.8.5</version>
+    <version>1.0.0</version>
 </dependency>
 ```
 
@@ -28,7 +28,7 @@ Add the jasper to your dependencies like this:
 <dependency> <!-- for jsp -->
     <groupId>org.apache.tomcat</groupId>
     <artifactId>tomcat-jasper</artifactId>
-    <version>9.0.19</version>
+    <version>10.1.13</version>
 </dependency>
 ```
 

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.dbflute.tomcat</groupId>
 	<artifactId>tomcat-boot</artifactId>
-	<version>0.8.5-A-SNAPSHOT</version>
+	<version>2.0.0-A-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Tomcat Boot</name>
@@ -13,8 +13,8 @@
 	<inceptionYear>2015</inceptionYear>
 
 	<properties>
-		<servlet.version>4.0.1</servlet.version>
-		<tomcat.version>9.0.90</tomcat.version>
+		<servlet.version>6.0.0</servlet.version>
+		<tomcat.version>10.1.17</tomcat.version>
 		<utflute.version>0.9.6</utflute.version>
 	</properties>
 
@@ -69,10 +69,12 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.11.0</version>
 					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
+						<source>21</source>
+						<target>21</target>
 						<encoding>UTF-8</encoding>
 						<showDeprecation>true</showDeprecation>
 						<showWarnings>true</showWarnings>
@@ -169,23 +171,16 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- temporarily invalidate for now, to give priority to jakarta release (2024/06/20)
-			 { @log
-			 Execution default of goal org.owasp:dependency-check-maven:9.2.0:check failed:
-			 dependency-check requires Java 8 update 251 or higher
-			 }
 			<plugin>
 				<groupId>org.owasp</groupId>
 				<artifactId>dependency-check-maven</artifactId>
 				<version>9.2.0</version>
 				<configuration>
-			 -->
 					<!-- downloading cost is tolerable so comment out to be simple by jflute (2022/03/30)
 					 (this server is NIST Data Mirror defined at owasp_dependency_check.yaml)
 					<cveUrlModified>http://localhost:8080/nvdcve-1.1-modified.json.gz</cveUrlModified>
 					<cveUrlBase>http://localhost:8080/nvdcve-1.1-%d.json.gz</cveUrlBase>
 					 -->
-			<!-- 
 					<failBuildOnCVSS>4</failBuildOnCVSS>
 					<skipProvidedScope>true</skipProvidedScope>
 					<skipRuntimeScope>true</skipRuntimeScope>
@@ -199,7 +194,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			 -->
 		</plugins>
 	</build>
 
@@ -222,8 +216,8 @@
 		<!--                                                                 = = = = = = = -->
 		<!-- servlet -->
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
 			<version>${servlet.version}</version>
 			<scope>provided</scope>
 		</dependency>

src/main/java/org/dbflute/tomcat/TomcatBoot.java

@@ -38,8 +38,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.servlet.ServletException;
-
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
@@ -59,6 +57,8 @@
 import org.dbflute.tomcat.props.BootPropsTranslator;
 import org.dbflute.tomcat.util.BotmResourceUtil;
 
+import jakarta.servlet.ServletException;
+
 /**
  * @author jflute
  */

src/main/java/org/dbflute/tomcat/util/BotmReflectionUtil.java

@@ -107,6 +107,7 @@ public static Class<?> forName(String className) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public static Object newInstance(Class<?> clazz) {
         assertObjectNotNull("clazz", clazz);
         try {
@@ -585,6 +586,7 @@ public static Object invoke(Method method, Object target, Object[] args) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public static Object invokeForcedly(Method method, Object target, Object[] args) {
         assertObjectNotNull("method", method);
         if (!isPublicMethod(method) && !method.isAccessible()) {

src/main/java/org/dbflute/tomcat/util/BotmResourceUtil.java

@@ -112,6 +112,7 @@ public static URLConnection openConnection(URL url) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public static URL createURL(String spec) {
         try {
             return new URL(spec);
@@ -120,6 +121,7 @@ public static URL createURL(String spec) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public static URL create(URL context, String spec) {
         try {
             return new URL(context, spec);

src/test/java/org/dbflute/tomcat/BootBoot.java

@@ -0,0 +1,13 @@
+package org.dbflute.tomcat;
+
+import org.dbflute.utflute.core.PlainTestCase;
+
+/**
+ * @author jflute
+ */
+public class BootBoot extends PlainTestCase {
+
+    public static void main(String[] args) {
+        new TomcatBoot(8159, "/boot").asDevelopment(true).bootAwait();
+    }
+}