完善 solon-server-jetty-jakarta 适配

Author: noear

solon-jakarta-parent/pom.xml

@@ -27,8 +27,6 @@
         <cxf.version>4.1.2</cxf.version>
 
         <jetty.version>12.1.0</jetty.version>
-        <jetty-servlet.version>11.0.26</jetty-servlet.version>
-        <jetty-servlet-jstl.version>10.0.26</jetty-servlet-jstl.version>
     </properties>
 
     <dependencyManagement>

solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta/pom.xml

@@ -18,12 +18,6 @@
     <description>Java project for solon</description>
 
     <dependencies>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>${jakarta.servlet6.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.eclipse.jetty.ee11</groupId>
             <artifactId>jetty-ee11-webapp</artifactId>
@@ -37,9 +31,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>apache-jstl</artifactId>
-            <version>${jetty-servlet-jstl.version}</version>
+            <groupId>org.eclipse.jetty.ee11</groupId>
+            <artifactId>jetty-ee11-glassfish-jstl</artifactId>
+            <version>${jetty.version}</version>
         </dependency>
     </dependencies>
 

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/pom.xml

@@ -28,6 +28,12 @@
             <artifactId>solon-net</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet6.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-web-servlet-jakarta</artifactId>