Skip to content

Commit 8b7e045

Browse files
committed
完善 solon-server-jetty-jakarta 适配
1 parent 0259296 commit 8b7e045

File tree

9 files changed

+17
-273
lines changed

9 files changed

+17
-273
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,16 @@
7575
<scope>provided</scope>
7676
</dependency>
7777

78+
<dependency>
79+
<groupId>org.noear</groupId>
80+
<artifactId>solon-logging-simple</artifactId>
81+
<scope>test</scope>
82+
</dependency>
83+
7884
<dependency>
7985
<groupId>org.noear</groupId>
8086
<artifactId>solon-test</artifactId>
87+
<scope>test</scope>
8188
</dependency>
8289
</dependencies>
8390

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/test/java/demo/DemoApp.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/test/java/demo/DemoTest.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/test/java/demo/HttpServletRequestWrapperImpl.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/test/java/demo/HttpSessionImpl.java

Lines changed: 0 additions & 122 deletions
This file was deleted.

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/test/java/demo/SeverDemo.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>jakarta.servlet</groupId>
3232
<artifactId>jakarta.servlet-api</artifactId>
33-
<version>${jakarta.servlet5.version}</version>
33+
<version>${jakarta.servlet6.version}</version>
3434
<scope>provided</scope>
3535
</dependency>
3636

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
<dependency>
3030
<groupId>jakarta.servlet</groupId>
3131
<artifactId>jakarta.servlet-api</artifactId>
32-
<version>${jakarta.servlet5.version}</version>
32+
<version>${jakarta.servlet6.version}</version>
33+
<scope>provided</scope>
3334
</dependency>
3435

3536
<dependency>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
<artifactId>solon-web-servlet-jakarta</artifactId>
2222
</dependency>
2323

24+
<dependency>
25+
<groupId>jakarta.servlet</groupId>
26+
<artifactId>jakarta.servlet-api</artifactId>
27+
<version>${jakarta.servlet6.version}</version>
28+
<scope>provided</scope>
29+
</dependency>
30+
2431
<dependency>
2532
<groupId>org.apache.cxf</groupId>
2633
<artifactId>cxf-rt-frontend-jaxws</artifactId>

0 commit comments

Comments
 (0)