! improve archetype: use project.version instead of hard-code version

hn8530 · Jan 9, 2021 · 2ac8c6b · 2ac8c6b
1 parent 5015dce
commit 2ac8c6b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/pom.xml
@@ -55,22 +55,22 @@
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-client</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-app</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-domain</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-infrastructure</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <!--Project modules End-->
             <!--Spring Boot-->

diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/pom.xml
@@ -57,27 +57,27 @@
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-adapter</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-client</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-app</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-domain</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>${groupId}</groupId>
                 <artifactId>${rootArtifactId}-infrastructure</artifactId>
-                <version>${version}</version>
+                <version>${project.version}</version>
             </dependency>
             <!--Project modules End-->
             <!--Spring Boot-->

diff --git a/scripts/integration-test.sh b/scripts/integration-test.sh
@@ -56,7 +56,9 @@ cleanMavenInstallOfColaInMavenLocalRepository
     readonly artifactId=demo-service
 
     MVN archetype:generate \
-        -DgroupId=com.alibaba.cola.demo.archetype-service -DartifactId="$artifactId" -Dversion=1.0.0-SNAPSHOT \
+        -DgroupId=com.alibaba.cola.demo.archetype-service \
+        -DartifactId="$artifactId" \
+        -Dversion=1.0.0-SNAPSHOT \
         -Dpackage=com.alibaba.cola.demo.service \
         -DarchetypeGroupId=com.alibaba.cola \
         -DarchetypeArtifactId=cola-framework-archetype-service \
@@ -86,7 +88,9 @@ cleanMavenInstallOfColaInMavenLocalRepository
     readonly artifactId=demo-web
 
     MVN archetype:generate \
-        -DgroupId=com.alibaba.cola.demo.archetype-web -DartifactId="$artifactId" -Dversion=1.0.0-SNAPSHOT \
+        -DgroupId=com.alibaba.cola.demo.archetype-web \
+        -DartifactId="$artifactId" \
+        -Dversion=1.0.0-SNAPSHOT \
         -Dpackage=com.alibaba.cola.demo.web \
         -DarchetypeGroupId=com.alibaba.cola \
         -DarchetypeArtifactId=cola-framework-archetype-web \