diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index f657575..ef6483d 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.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 diff --git a/README.md b/README.md index feffbbd..b3e2187 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Automatically shutdown before next process boot org.dbflute.tomcat tomcat-boot - 0.8.5 + 1.0.0 ``` @@ -28,7 +28,7 @@ Add the jasper to your dependencies like this: org.apache.tomcat tomcat-jasper - 9.0.19 + 10.1.13 ``` diff --git a/pom.xml b/pom.xml index 8352c3a..8ac638d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.dbflute.tomcat tomcat-boot - 0.8.5-A-SNAPSHOT + 2.0.0-A-SNAPSHOT jar Tomcat Boot @@ -13,8 +13,8 @@ 2015 - 4.0.1 - 9.0.90 + 6.0.0 + 10.1.17 0.9.6 @@ -69,10 +69,12 @@ + org.apache.maven.plugins maven-compiler-plugin + 3.11.0 - 1.8 - 1.8 + 21 + 21 UTF-8 true true @@ -169,23 +171,16 @@ - - @@ -222,8 +216,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api ${servlet.version} provided diff --git a/src/main/java/org/dbflute/tomcat/TomcatBoot.java b/src/main/java/org/dbflute/tomcat/TomcatBoot.java index 4922df8..95c8c46 100644 --- a/src/main/java/org/dbflute/tomcat/TomcatBoot.java +++ b/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 */ diff --git a/src/main/java/org/dbflute/tomcat/util/BotmReflectionUtil.java b/src/main/java/org/dbflute/tomcat/util/BotmReflectionUtil.java index 72f72a7..c318576 100644 --- a/src/main/java/org/dbflute/tomcat/util/BotmReflectionUtil.java +++ b/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()) { diff --git a/src/main/java/org/dbflute/tomcat/util/BotmResourceUtil.java b/src/main/java/org/dbflute/tomcat/util/BotmResourceUtil.java index 73be670..79f3d7e 100644 --- a/src/main/java/org/dbflute/tomcat/util/BotmResourceUtil.java +++ b/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); diff --git a/src/test/java/org/dbflute/tomcat/BootBoot.java b/src/test/java/org/dbflute/tomcat/BootBoot.java new file mode 100644 index 0000000..713041f --- /dev/null +++ b/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(); + } +}