Skip to content

Commit 08231b2

Browse files
noearnoear
committed
优化结构
1 parent f88cbc8 commit 08231b2

File tree

13 files changed

+46
-57
lines changed
  • __release/solon-jakarta-bundle1
  • pom.xml
  • solon-jakarta-parent
  • solon-jakarta-projects
    • solon-boot
      • solon-boot-jetty-add-jsp-jakarta
      • solon-boot-jetty-jakarta
      • solon-boot-undertow-add-jsp-jakarta
      • solon-boot-undertow-jakarta
    • solon-data/hibernate-jakarta-solon-plugin
    • solon-logging/solon-logging-logback-jakarta
    • solon-render/solon-view-jsp-jakarta
    • solon-web_old/solon.web.servlet.jakarta
    • solon-web

13 files changed

+46
-57
lines changed

‎__release/solon-jakarta-bundle1/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
<name>${project.artifactId}</name>
1717
<packaging>pom</packaging>
1818

19-
20-
<properties>
21-
<java.version>17</java.version>
22-
</properties>
23-
2419
<modules>
2520
<module>../../solon-jakarta-parent</module>
2621

@@ -31,9 +26,7 @@
3126
<module>../../solon-jakarta-projects/solon-render/solon-view-jsp-jakarta</module>
3227

3328
<module>../../solon-jakarta-projects/solon-web/solon-web-servlet-jakarta</module>
34-
3529
<module>../../solon-jakarta-projects/solon-web/solon-web-webservices-jakarta</module>
36-
3730
<module>../../solon-jakarta-projects/solon-web_old/solon.web.servlet.jakarta</module>
3831
</modules>
3932
</project>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>org.noear</groupId>
8-
<artifactId>solon-jakarta</artifactId>
8+
<artifactId>solon-jakarta-framework</artifactId>
99
<version>dev</version>
1010
<packaging>pom</packaging>
1111

‎solon-jakarta-parent/pom.xml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,55 @@
1919

2020
<properties>
2121
<java.version>17</java.version>
22+
23+
<jakarta.logback.version>1.5.18</jakarta.logback.version>
24+
<jakarta.servlet.version>6.1.0</jakarta.servlet.version>
25+
26+
<cxf.version>4.1.2</cxf.version>
27+
28+
<jetty.version>12.0.14</jetty.version>
29+
<jetty-servlet.version>11.0.24</jetty-servlet.version>
30+
<jetty-servlet-jstl.version>10.0.24</jetty-servlet-jstl.version>
2231
</properties>
2332

2433
<dependencyManagement>
2534
<dependencies>
35+
<dependency>
36+
<groupId>org.noear</groupId>
37+
<artifactId>hibernate-jakarta-solon-plugin</artifactId>
38+
<version>${project.version}</version>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>org.noear</groupId>
43+
<artifactId>solon-logging-logback-jakarta</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>org.noear</groupId>
49+
<artifactId>solon-view-jsp-jakarta</artifactId>
50+
<version>${project.version}</version>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>org.noear</groupId>
55+
<artifactId>solon-web-servlet-jakarta</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
58+
59+
<dependency>
60+
<groupId>org.noear</groupId>
61+
<artifactId>solon-web-webservices-jakarta</artifactId>
62+
<version>${project.version}</version>
63+
</dependency>
64+
65+
<!-- old -->
66+
<dependency>
67+
<groupId>org.noear</groupId>
68+
<artifactId>solon.web.servlet.jakarta</artifactId>
69+
<version>${project.version}</version>
70+
</dependency>
2671
</dependencies>
2772
</dependencyManagement>
2873
</project>

‎solon-jakarta-projects/solon-boot/solon-boot-jetty-add-jsp-jakarta/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717

1818
<description>Java project for solon</description>
1919

20-
<properties>
21-
<java.version>17</java.version>
22-
<jetty.version>12.0.14</jetty.version>
23-
<jetty-servlet.version>11.0.24</jetty-servlet.version>
24-
<jetty-servlet-jstl.version>10.0.24</jetty-servlet-jstl.version>
25-
</properties>
26-
2720
<dependencies>
2821
<dependency>
2922
<groupId>javax.servlet</groupId>

‎solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717

1818
<description>Java project for solon</description>
1919

20-
<properties>
21-
<java.version>17</java.version>
22-
<jetty.version>12.0.14</jetty.version>
23-
<jetty-servlet.version>11.0.24</jetty-servlet.version>
24-
<jetty-servlet-jstl.version>10.0.24</jetty-servlet-jstl.version>
25-
</properties>
26-
2720
<dependencies>
2821
<dependency>
2922
<groupId>org.noear</groupId>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
<description>Java project for solon</description>
1919

20-
<properties>
21-
<java.version>17</java.version>
22-
</properties>
23-
2420
<dependencies>
2521

2622
<dependency>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
<description>Java project for solon</description>
1919

20-
<properties>
21-
<java.version>17</java.version>
22-
</properties>
23-
2420
<dependencies>
2521
<dependency>
2622
<groupId>org.noear</groupId>

‎solon-jakarta-projects/solon-data/hibernate-jakarta-solon-plugin/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717

1818
<description>Java project for solon</description>
1919

20-
<properties>
21-
<java.version>17</java.version>
22-
</properties>
23-
2420
<dependencies>
2521
<dependency>
2622
<groupId>org.noear</groupId>

‎solon-jakarta-projects/solon-logging/solon-logging-logback-jakarta/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
<name>${project.artifactId}</name>
1616
<packaging>jar</packaging>
1717

18-
<properties>
19-
<java.version>17</java.version>
20-
<jakarta.logback.version>1.5.18</jakarta.logback.version>
21-
</properties>
22-
2318
<dependencies>
2419
<!-- 提高深度优先级 -->
2520
<dependency>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
<name>${project.artifactId}</name>
1616
<packaging>jar</packaging>
1717

18-
<properties>
19-
<java.version>17</java.version>
20-
<jakarta.servlet.version>6.1.0</jakarta.servlet.version>
21-
</properties>
22-
2318
<dependencies>
2419
<dependency>
2520
<groupId>org.noear</groupId>

0 commit comments

Comments
 (0)