Skip to content

Commit 5c14146

Browse files
noearnoear
committed
清理不必要代码
1 parent 008a9e4 commit 5c14146

File tree

9 files changed

+24
-235
lines changed

9 files changed

+24
-235
lines changed

‎solon-jakarta-projects/solon-server/solon-server-undertow-add-jsp-jakarta/pom.xml‎

Lines changed: 17 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@
2828
<artifactId>solon-view-jsp-jakarta</artifactId>
2929
</dependency>
3030

31+
<!--jsp-->
3132
<dependency>
32-
<groupId>jakarta.servlet.jsp.jstl</groupId>
33-
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
34-
<version>3.0.0</version>
33+
<groupId>org.mortbay.jasper</groupId>
34+
<artifactId>mortbay-apache-jsp</artifactId>
35+
<version>11.0.10.1</version>
3536
</dependency>
3637

3738
<dependency>
38-
<groupId>jakarta.servlet.jsp</groupId>
39-
<artifactId>jakarta.servlet.jsp-api</artifactId>
40-
<version>3.0.0</version>
39+
<groupId>org.jboss.metadata</groupId>
40+
<artifactId>jboss-metadata-web</artifactId>
41+
<version>${undertow.jboss-metadata.jakarta.version}</version>
4142
</dependency>
4243

4344
<dependency>
@@ -47,62 +48,23 @@
4748
</dependency>
4849

4950
<dependency>
50-
<groupId>org.glassfish</groupId>
51-
<artifactId>jakarta.el</artifactId>
52-
<version>4.0.2</version>
53-
</dependency>
54-
55-
<dependency>
56-
<groupId>org.glassfish.web</groupId>
57-
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
58-
<version>3.0.1</version>
59-
</dependency>
60-
61-
<!--jsp try start-->
62-
<dependency>
63-
<groupId>io.undertow.jastow</groupId>
64-
<artifactId>jastow</artifactId>
65-
<version>${undertow.jastow.jakarta.version}</version>
66-
<exclusions>
67-
<exclusion>
68-
<groupId>log4j</groupId>
69-
<artifactId>log4j</artifactId>
70-
</exclusion>
71-
<exclusion>
72-
<groupId>io.undertow</groupId>
73-
<artifactId>undertow-core</artifactId>
74-
</exclusion>
75-
<exclusion>
76-
<groupId>io.undertow</groupId>
77-
<artifactId>undertow-servlet</artifactId>
78-
</exclusion>
79-
</exclusions>
51+
<groupId>jakarta.el</groupId>
52+
<artifactId>jakarta.el-api</artifactId>
53+
<version>6.0.1</version>
8054
</dependency>
8155

8256
<dependency>
83-
<groupId>org.jboss.metadata</groupId>
84-
<artifactId>jboss-metadata-common</artifactId>
85-
<version>${undertow.jboss-metadata.jakarta.version}</version>
86-
<exclusions>
87-
<exclusion>
88-
<groupId>log4j</groupId>
89-
<artifactId>log4j</artifactId>
90-
</exclusion>
91-
</exclusions>
57+
<groupId>jakarta.servlet.jsp.jstl</groupId>
58+
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
59+
<version>3.0.2</version>
9260
</dependency>
9361

9462
<dependency>
95-
<groupId>org.jboss.metadata</groupId>
96-
<artifactId>jboss-metadata-web</artifactId>
97-
<version>${undertow.jboss-metadata.jakarta.version}</version>
98-
<exclusions>
99-
<exclusion>
100-
<groupId>log4j</groupId>
101-
<artifactId>log4j</artifactId>
102-
</exclusion>
103-
</exclusions>
63+
<groupId>jakarta.servlet.jsp</groupId>
64+
<artifactId>jakarta.servlet.jsp-api</artifactId>
65+
<version>3.1.1</version>
10466
</dependency>
105-
<!--jsp try end-->
67+
<!--jsp end-->
10668

10769
<dependency>
10870
<groupId>org.noear</groupId>

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/pom.xml‎

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -58,79 +58,43 @@
5858
<version>11.0.10.1</version>
5959
<scope>provided</scope>
6060
</dependency>
61-
<!--<dependency>
62-
<groupId>org.jboss.spec.javax.servlet</groupId>
63-
<artifactId>jboss-servlet-api_4.0_spec</artifactId>
64-
<version>2.0.0.Final</version>
65-
</dependency>-->
66-
<!--<dependency>
67-
<groupId>io.undertow.jastow</groupId>
68-
<artifactId>jastow</artifactId>
69-
<version>${undertow.jastow.jakarta.version}</version>
70-
<exclusions>
71-
<exclusion>
72-
<groupId>log4j</groupId>
73-
<artifactId>log4j</artifactId>
74-
</exclusion>
75-
<exclusion>
76-
<groupId>io.undertow</groupId>
77-
<artifactId>undertow-core</artifactId>
78-
</exclusion>
79-
<exclusion>
80-
<groupId>io.undertow</groupId>
81-
<artifactId>undertow-servlet</artifactId>
82-
</exclusion>
83-
</exclusions>
84-
<scope>provided</scope>
85-
</dependency>-->
86-
<!--<dependency>
87-
<groupId>org.jboss.metadata</groupId>
88-
<artifactId>jboss-metadata-common</artifactId>
89-
<version>${undertow.jboss-metadata.jakarta.version}</version>
90-
<scope>provided</scope>
91-
</dependency>-->
61+
9262
<dependency>
9363
<groupId>org.jboss.metadata</groupId>
9464
<artifactId>jboss-metadata-web</artifactId>
9565
<version>${undertow.jboss-metadata.jakarta.version}</version>
9666
<scope>provided</scope>
9767
</dependency>
68+
9869
<dependency>
9970
<groupId>org.eclipse.jdt</groupId>
10071
<artifactId>ecj</artifactId>
10172
<version>3.43.0</version>
10273
<scope>provided</scope>
10374
</dependency>
75+
10476
<dependency>
10577
<groupId>jakarta.el</groupId>
10678
<artifactId>jakarta.el-api</artifactId>
10779
<version>6.0.1</version>
10880
<scope>provided</scope>
10981
</dependency>
110-
<!--<dependency>
111-
<groupId>org.glassfish.expressly</groupId>
112-
<artifactId>expressly</artifactId>
113-
<version>6.0.0</version>
114-
<scope>provided</scope>
115-
</dependency>-->
82+
11683
<dependency>
11784
<groupId>jakarta.servlet.jsp.jstl</groupId>
11885
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
11986
<version>3.0.2</version>
12087
<scope>provided</scope>
12188
</dependency>
89+
12290
<dependency>
12391
<groupId>jakarta.servlet.jsp</groupId>
12492
<artifactId>jakarta.servlet.jsp-api</artifactId>
12593
<version>3.1.1</version>
12694
<scope>provided</scope>
12795
</dependency>
96+
<!--jsp end-->
12897

129-
<dependency>
130-
<groupId>org.projectlombok</groupId>
131-
<artifactId>lombok</artifactId>
132-
<scope>provided</scope>
133-
</dependency>
13498
<dependency>
13599
<groupId>org.noear</groupId>
136100
<artifactId>solon-test</artifactId>
@@ -142,6 +106,7 @@
142106
<artifactId>solon-logging-simple</artifactId>
143107
<scope>test</scope>
144108
</dependency>
109+
145110
<dependency>
146111
<groupId>org.noear</groupId>
147112
<artifactId>solon-view-jsp-jakarta</artifactId>

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/test/java/demo3013/Config.java‎

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

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/test/java/demo3013/WebApp.java‎

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

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/test/java/demo3013/controller/HelloworldController.java‎

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

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/test/java/demo3013/controller/HomeController.java‎

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

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/test/java/demo3013/dso/service/DemoService.java‎

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

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/test/java/demo3013/model/UserModel.java‎

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

‎solon-jakarta-projects/solon-server/solon-server-undertow-jakarta/src/test/java/demo3013/widget/FooterTag.java‎

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

0 commit comments

Comments
 (0)