Update archetype struct

src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -5,16 +5,18 @@
         <requiredProperty key="groupId"/>
         <requiredProperty key="artifactId"/>
         <requiredProperty key="subModuleNamePrefix"/>
+        <requiredProperty key="gitignore">
+            <defaultValue>.gitignore</defaultValue>
+        </requiredProperty>
     </requiredProperties>
 
     <fileSets>
         <fileSet encoding="UTF-8" filtered="true">
             <directory/>
             <includes>
-                <include>.gitignore</include>
+                <include>__gitignore__</include>
                 <include>*.xml</include>
                 <include>*.properties</include>
-                <include>.gitkeep</include>
             </includes>
         </fileSet>
     </fileSets>
@@ -89,22 +91,6 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${subModuleNamePrefix}-service" dir="__subModuleNamePrefix__-service" name="${subModuleNamePrefix}-service">
-            <fileSets>
-                <fileSet filtered="true" encoding="UTF-8" packaged="true">
-                    <directory>src/main/java</directory>
-                    <includes>
-                        <include>**/*.java</include>
-                    </includes>
-                </fileSet>
-                <fileSet filtered="true" encoding="UTF-8">
-                    <directory/>
-                    <includes>
-                        <include>pom.xml</include>
-                    </includes>
-                </fileSet>
-            </fileSets>
-        </module>
         <module id="${subModuleNamePrefix}-facade" dir="__subModuleNamePrefix__-facade" name="${subModuleNamePrefix}-facade">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
@@ -121,7 +107,7 @@
                 </fileSet>
             </fileSets>
         </module>
-        <module id="${subModuleNamePrefix}-web" dir="__subModuleNamePrefix__-web" name="${subModuleNamePrefix}-web">
+        <module id="${subModuleNamePrefix}-service" dir="__subModuleNamePrefix__-service" name="${subModuleNamePrefix}-service">
             <fileSets>
                 <fileSet filtered="true" encoding="UTF-8" packaged="true">
                     <directory>src/main/java</directory>
@@ -171,5 +157,21 @@
                 </fileSet>
             </fileSets>
         </module>
+        <module id="${subModuleNamePrefix}-web" dir="__subModuleNamePrefix__-web" name="${subModuleNamePrefix}-web">
+            <fileSets>
+                <fileSet filtered="true" encoding="UTF-8" packaged="true">
+                    <directory>src/main/java</directory>
+                    <includes>
+                        <include>**/*.java</include>
+                    </includes>
+                </fileSet>
+                <fileSet filtered="true" encoding="UTF-8">
+                    <directory/>
+                    <includes>
+                        <include>pom.xml</include>
+                    </includes>
+                </fileSet>
+            </fileSets>
+        </module>
     </modules>
 </archetype-descriptor>
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-api-impl/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>

src/main/resources/archetype-resources/__subModuleNamePrefix__-api/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-api/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>

src/main/resources/archetype-resources/__subModuleNamePrefix__-common/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-common/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>

src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-dal/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>

src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-facade/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -22,6 +22,14 @@
             <groupId>${groupId}</groupId>
             <artifactId>${subModuleNamePrefix}-service</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.schbrain.framework</groupId>
+            <artifactId>cache-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.schbrain.framework</groupId>
+            <artifactId>dubbo-spring-boot-starter</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-service/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-service/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -18,26 +18,10 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.schbrain.common</groupId>
-            <artifactId>common-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
             <artifactId>${subModuleNamePrefix}-dal</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.schbrain.framework</groupId>
-            <artifactId>cache-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.schbrain.framework</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.schbrain.framework</groupId>
-            <artifactId>oss-spring-boot-starter</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-starter/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>

src/main/resources/archetype-resources/__subModuleNamePrefix__-web/.gitkeep

-Remove me after you add files in this module
\ No newline at end of file

src/main/resources/archetype-resources/__subModuleNamePrefix__-web/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>

src/main/resources/archetype-resources/pom.xml

@@ -27,6 +27,7 @@
         <module>${subModuleNamePrefix}-dal</module>
         <module>${subModuleNamePrefix}-facade</module>
         <module>${subModuleNamePrefix}-service</module>
+        <module>${subModuleNamePrefix}-starter</module>
         <module>${subModuleNamePrefix}-web</module>
     </modules>
 
@@ -54,25 +55,25 @@
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-service</artifactId>
+                <artifactId>${subModuleNamePrefix}-facade</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-facade</artifactId>
+                <artifactId>${subModuleNamePrefix}-service</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-web</artifactId>
+                <artifactId>${subModuleNamePrefix}-starter</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
-                <artifactId>${subModuleNamePrefix}-starter</artifactId>
+                <artifactId>${subModuleNamePrefix}-web</artifactId>
                 <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
-</project>
\ No newline at end of file
+</project>