Skip to content

Commit a6ec5b7

Browse files
noearnoear
committed
3.5.0-SNAPSHOT,调整结构 solon-server 替代 solon-boot
1 parent 08231b2 commit a6ec5b7

File tree

44 files changed

+36
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+36
-40
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>solon-jakarta-parent</artifactId>
10-
<version>3.4.3</version>
11-
<relativePath />
10+
<version>3.5.0-SNAPSHOT</version>
11+
<relativePath>../../solon-jakarta-parent/pom.xml</relativePath>
1212
</parent>
1313

1414
<groupId>org.noear</groupId>
@@ -23,7 +23,7 @@
2323

2424
<module>../../solon-jakarta-projects/solon-logging/solon-logging-logback-jakarta</module>
2525

26-
<module>../../solon-jakarta-projects/solon-render/solon-view-jsp-jakarta</module>
26+
<module>../../solon-jakarta-projects/solon-view/solon-view-jsp-jakarta</module>
2727

2828
<module>../../solon-jakarta-projects/solon-web/solon-web-servlet-jakarta</module>
2929
<module>../../solon-jakarta-projects/solon-web/solon-web-webservices-jakarta</module>

‎pom.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,13 @@
99
<version>dev</version>
1010
<packaging>pom</packaging>
1111

12-
<properties>
13-
<java.version>17</java.version>
14-
</properties>
15-
1612
<modules>
1713
<module>__release</module>
1814

19-
<module>solon-jakarta-projects/solon-boot/solon-boot-jetty-add-jsp-jakarta</module>
20-
<!-- <module>solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta</module>-->
21-
<module>solon-jakarta-projects/solon-boot/solon-boot-undertow-add-jsp-jakarta</module>
22-
<module>solon-jakarta-projects/solon-boot/solon-boot-undertow-jakarta</module>
15+
<module>solon-jakarta-projects/solon-server/solon-server-jetty-add-jsp-jakarta</module>
16+
<!-- <module>solon-jakarta-projects/solon-server/solon-server-jetty-jakarta</module>-->
17+
<module>solon-jakarta-projects/solon-server/solon-server-undertow-add-jsp-jakarta</module>
18+
<module>solon-jakarta-projects/solon-server/solon-server-undertow-jakarta</module>
2319

2420
</modules>
2521
</project>

‎solon-jakarta-parent/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>solon-parent</artifactId>
10-
<version>3.4.3</version>
10+
<version>3.5.0-SNAPSHOT</version>
1111
<relativePath/>
1212
</parent>
1313

1414
<artifactId>solon-jakarta-parent</artifactId>
15-
<version>3.4.3</version>
15+
<version>3.5.0-SNAPSHOT</version>
1616
<packaging>pom</packaging>
1717

1818
<name>${project.artifactId}</name>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>solon-jakarta-parent</artifactId>
10-
<version>3.4.3</version>
11-
<relativePath />
10+
<version>3.5.0-SNAPSHOT</version>
11+
<relativePath>../../../solon-jakarta-parent/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>hibernate-jakarta-solon-plugin</artifactId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>solon-jakarta-parent</artifactId>
10-
<version>3.4.3</version>
11-
<relativePath/>
10+
<version>3.5.0-SNAPSHOT</version>
11+
<relativePath>../../../solon-jakarta-parent/pom.xml</relativePath>
1212
</parent>
1313

1414
<artifactId>solon-logging-logback-jakarta</artifactId>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>solon-jakarta-parent</artifactId>
10-
<version>3.4.3</version>
11-
<relativePath />
10+
<version>3.5.0-SNAPSHOT</version>
11+
<relativePath>../../../solon-jakarta-parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>solon-boot-jetty-add-jsp-jakarta</artifactId>
14+
<artifactId>solon-server-jetty-add-jsp-jakarta</artifactId>
1515
<name>${project.artifactId}</name>
1616
<packaging>jar</packaging>
1717

solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta/pom.xml renamed to solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>solon-jakarta-parent</artifactId>
10-
<version>3.4.3</version>
11-
<relativePath />
10+
<version>3.5.0-SNAPSHOT</version>
11+
<relativePath>../../../solon-jakarta-parent/pom.xml</relativePath>
1212
</parent>
1313

14-
<artifactId>solon-boot-jetty-jakarta</artifactId>
14+
<artifactId>solon-server-jetty-jakarta</artifactId>
1515
<name>${project.artifactId}</name>
1616
<packaging>jar</packaging>
1717

@@ -20,7 +20,7 @@
2020
<dependencies>
2121
<dependency>
2222
<groupId>org.noear</groupId>
23-
<artifactId>solon-boot</artifactId>
23+
<artifactId>solon-server</artifactId>
2424
</dependency>
2525

2626
<dependency>

solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/HandlerHub.java renamed to solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/HandlerHub.java

File renamed without changes.

solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServer.java renamed to solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServer.java

File renamed without changes.

solon-jakarta-projects/solon-boot/solon-boot-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServerAddJsp.java renamed to solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServerAddJsp.java

File renamed without changes.

0 commit comments

Comments
 (0)