Skip to content

Commit f88cbc8

Browse files
committed
优化结构
1 parent af8c0b6 commit f88cbc8

File tree

13 files changed

+43
-18
lines changed
  • __release/solon-jakarta-bundle1
  • 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

+43
-18
lines changed

__release/solon-jakarta-bundle1/pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath />
1212
</parent>
@@ -22,6 +22,8 @@
2222
</properties>
2323

2424
<modules>
25+
<module>../../solon-jakarta-parent</module>
26+
2527
<module>../../solon-jakarta-projects/solon-data/hibernate-jakarta-solon-plugin</module>
2628

2729
<module>../../solon-jakarta-projects/solon-logging/solon-logging-logback-jakarta</module>

pom.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<parent>
8-
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
10-
<version>3.4.3</version>
11-
<relativePath />
12-
</parent>
13-
7+
<groupId>org.noear</groupId>
148
<artifactId>solon-jakarta</artifactId>
9+
<version>dev</version>
1510
<packaging>pom</packaging>
1611

1712
<properties>

solon-jakarta-parent/pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.noear</groupId>
9+
<artifactId>solon-parent</artifactId>
10+
<version>3.4.3</version>
11+
<relativePath/>
12+
</parent>
13+
14+
<artifactId>solon-jakarta-parent</artifactId>
15+
<version>3.4.3</version>
16+
<packaging>pom</packaging>
17+
18+
<name>${project.artifactId}</name>
19+
20+
<properties>
21+
<java.version>17</java.version>
22+
</properties>
23+
24+
<dependencyManagement>
25+
<dependencies>
26+
</dependencies>
27+
</dependencyManagement>
28+
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath />
1212
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath />
1212
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath />
1212
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath />
1212
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath />
1212
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath/>
1212
</parent>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<parent>
88
<groupId>org.noear</groupId>
9-
<artifactId>solon-parent</artifactId>
9+
<artifactId>solon-jakarta-parent</artifactId>
1010
<version>3.4.3</version>
1111
<relativePath />
1212
</parent>

0 commit comments

Comments
 (0)