转移 solon-view-jsp-jakarta 到 solon-jakarta 仓库

Author: noear

solon-jakarta-parent/pom.xml

@@ -21,6 +21,7 @@
         <java.version>17</java.version>
 
         <jakarta.logback.version>1.5.18</jakarta.logback.version>
+        <jakarta.servlet5.version>5.0.0</jakarta.servlet5.version>
         <jakarta.servlet.version>6.1.0</jakarta.servlet.version>
 
         <cxf.version>4.1.2</cxf.version>

solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/pom.xml

@@ -30,7 +30,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>${jakarta.servlet.version}</version>
+            <version>${jakarta.servlet5.version}</version>
             <scope>provided</scope>
         </dependency>
 

solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/JspRender.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * Copyright 2017-2025 noear.org and authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.ModelAndView;
 import org.noear.solon.core.handle.Render;
+import org.noear.solon.core.util.MimeType;
 import org.noear.solon.view.ViewConfig;
 
 public class JspRender implements Render {
@@ -38,7 +39,7 @@ public void render(Object obj, Context ctx) throws Throwable {
 
     public void render_mav(ModelAndView mv, Context ctx) throws Throwable {
         if(ctx.contentTypeNew() == null) {
-            ctx.contentType("text/html;charset=utf-8");
+            ctx.contentType(MimeType.TEXT_HTML_UTF8_VALUE);
         }
 
         if (ViewConfig.isOutputMeta()) {

…org/noear/solon/view/jsp/XPluginImp.java …/view/jsp/integration/ViewJspPlugin.javasolon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/XPluginImp.java renamed to solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/integration/ViewJspPlugin.java solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/XPluginImp.java renamed to solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/integration/ViewJspPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * Copyright 2017-2025 noear.org and authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.noear.solon.view.jsp;
+package org.noear.solon.view.jsp.integration;
 
 import org.noear.solon.core.AppContext;
 import org.noear.solon.core.Plugin;
 import org.noear.solon.core.util.ClassUtil;
 import org.noear.solon.core.util.LogUtil;
+import org.noear.solon.view.jsp.JspRender;
 
-public class XPluginImp implements Plugin {
+public class ViewJspPlugin implements Plugin {
 
     @Override
     public void start(AppContext context) {

solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/tags/AuthPermissionsTag.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * Copyright 2017-2025 noear.org and authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/java/org/noear/solon/view/jsp/tags/AuthRolesTag.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2024 noear.org and authors
+ * Copyright 2017-2025 noear.org and authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

solon-jakarta-projects/solon-view/solon-view-jsp-jakarta/src/main/resources/META-INF/solon/solon.view.jsp.jakarta.properties

@@ -1,2 +1,2 @@
-solon.plugin=org.noear.solon.view.jsp.XPluginImp
+solon.plugin=org.noear.solon.view.jsp.integration.ViewJspPlugin
 solon.plugin.priority=3

solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>${jakarta.servlet.version}</version>
+            <version>${jakarta.servlet5.version}</version>
         </dependency>
 
         <dependency>