From 0f3f5ccc77c53e7d1c6719f37af8725f7de4f51a Mon Sep 17 00:00:00 2001 From: jflute Date: Thu, 31 Aug 2023 22:59:56 +0900 Subject: [PATCH 01/10] import jakarta package ServletException #190 --- pom.xml | 8 ++++---- src/main/java/org/dbflute/tomcat/TomcatBoot.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c05da12..574b1e6 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ 2015 - 4.0.1 - 9.0.76 + 6.0.0 + 10.1.13 0.9.5 @@ -213,8 +213,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 2e3958d..ed9fb47 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 */ From df8506105947ea7243ec679462a54479d6982b8b Mon Sep 17 00:00:00 2001 From: jflute Date: Thu, 31 Aug 2023 23:09:11 +0900 Subject: [PATCH 02/10] add attribute test=true for test scope libraries (for new Eclipse) --- .classpath | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.classpath b/.classpath index 05bc4fe..a21a34f 100755 --- a/.classpath +++ b/.classpath @@ -2,10 +2,17 @@ - - + + + + + + + + + + - From 8334f71a3c10ce69b7446f2e8b12c15d4d9817f5 Mon Sep 17 00:00:00 2001 From: jflute Date: Thu, 31 Aug 2023 23:20:30 +0900 Subject: [PATCH 03/10] making BootBoot to test simple booting #190 --- src/test/java/org/dbflute/tomcat/BootBoot.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/test/java/org/dbflute/tomcat/BootBoot.java 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(); + } +} From d1af3370764c11080b59d88e1e057c9602e8c7d0 Mon Sep 17 00:00:00 2001 From: jflute Date: Thu, 31 Aug 2023 23:22:51 +0900 Subject: [PATCH 04/10] ready for 1.0.0-A-SNAPSHOT --- README.md | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ee408d2..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.2 + 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 574b1e6..2c03381 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.dbflute.tomcat tomcat-boot - 0.8.3 + 1.0.0-A-SNAPSHOT jar Tomcat Boot From b57e650f55bf4ce7496ba032306cd3ec8e1eab56 Mon Sep 17 00:00:00 2001 From: jflute Date: Sun, 30 Jun 2024 21:59:26 +0900 Subject: [PATCH 05/10] add @SuppressWarnings("deprecation") to Reflection methods --- src/main/java/org/dbflute/tomcat/util/BotmReflectionUtil.java | 2 ++ src/main/java/org/dbflute/tomcat/util/BotmResourceUtil.java | 2 ++ 2 files changed, 4 insertions(+) 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); From 0056c36fa32444263a0818df9be01896ab3beeda Mon Sep 17 00:00:00 2001 From: jflute Date: Tue, 2 Jul 2024 18:16:38 +0900 Subject: [PATCH 06/10] maven-compiler-plugin uses java21 --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index db9a91b..7106acd 100644 --- a/pom.xml +++ b/pom.xml @@ -69,10 +69,12 @@ + org.apache.maven.plugins maven-compiler-plugin + 3.11.0 - 1.8 - 1.8 + 21 + 21 UTF-8 true true From 1f4009c3a9dce2bebc2a1cd6f196da041d677f77 Mon Sep 17 00:00:00 2001 From: jflute Date: Tue, 2 Jul 2024 18:16:51 +0900 Subject: [PATCH 07/10] upgrade Tomcat to 10.1.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7106acd..e592493 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 6.0.0 - 10.1.13 + 10.1.17 0.9.6 From 73bb69c440acd242388aaea376a685ecef45e31a Mon Sep 17 00:00:00 2001 From: jflute Date: Tue, 2 Jul 2024 18:19:13 +0900 Subject: [PATCH 08/10] make eclipse compiler java21 --- .settings/org.eclipse.jdt.core.prefs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 From 579e74cce024177df3bbcaace27840417df48e18 Mon Sep 17 00:00:00 2001 From: jflute Date: Wed, 3 Jul 2024 10:57:01 +0900 Subject: [PATCH 09/10] preview 2.0.0-A-SNAPSHOT (use 2.x since tomcat10) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e592493..978ade5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.dbflute.tomcat tomcat-boot - 1.0.0-A-SNAPSHOT + 2.0.0-A-SNAPSHOT jar Tomcat Boot From 5337b12b486551107331b2fe583b5201a344368a Mon Sep 17 00:00:00 2001 From: jflute Date: Wed, 7 Aug 2024 12:23:34 +0900 Subject: [PATCH 10/10] remove java8 headache comment out --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 978ade5..8ac638d 100644 --- a/pom.xml +++ b/pom.xml @@ -171,23 +171,16 @@ - -