chore(pom): cleanup pom:

- cola-samples/craftsman - add missing `test` scope - reorder dependencies - remove unused dependencies - cola-archetypes - use `maven.deploy.skip` property to simplify `maven-deploy-plugin` config - reorder dependencies - remove unused dependencies
chenhuimin · Aug 2, 2022 · 56999f0 · 56999f0
1 parent ed0e277
commit 56999f0
Show file tree

Hide file tree

Showing 18 changed files with 72 additions and 145 deletions.
diff --git a/...a-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/...a-archetype-service/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
@@ -21,10 +21,12 @@
             <groupId>${groupId}</groupId>
             <artifactId>${rootArtifactId}-infrastructure</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba.cola</groupId>
             <artifactId>cola-component-catchlog-starter</artifactId>
         </dependency>
+
         <!-- JSR 303 Validation -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>
@@ -40,17 +42,4 @@
         </dependency>
         <!-- JSR 303 Validation End-->
     </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>
diff --git a/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
@@ -13,6 +13,11 @@
     <name>${artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-client</artifactId>
+        </dependency>
+
         <!-- COLA components -->
         <dependency>
             <groupId>com.alibaba.cola</groupId>
@@ -23,22 +28,5 @@
             <artifactId>cola-component-exception</artifactId>
         </dependency>
         <!-- COLA components End-->
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-client</artifactId>
-        </dependency>
     </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>
diff --git a/...-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml b/...-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml
@@ -17,6 +17,7 @@
             <groupId>${groupId}</groupId>
             <artifactId>${rootArtifactId}-domain</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>

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
@@ -1,5 +1,6 @@
 <?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>${groupId}</groupId>
@@ -13,6 +14,7 @@
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
 
         <cola.components.version>4.4.0-SNAPSHOT</cola.components.version>
 
@@ -43,16 +45,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!--COLA components-->
-            <dependency>
-                <groupId>com.alibaba.cola</groupId>
-                <artifactId>cola-components-bom</artifactId>
-                <version>${cola.components.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!--COLA components End-->
-
             <!--Project modules-->
             <dependency>
                 <groupId>${groupId}</groupId>
@@ -76,7 +68,13 @@
             </dependency>
             <!--Project modules End-->
 
-            <!--Spring Boot-->
+            <dependency>
+                <groupId>com.alibaba.cola</groupId>
+                <artifactId>cola-components-bom</artifactId>
+                <version>${cola.components.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -89,7 +87,6 @@
                 <artifactId>mybatis-spring-boot-starter</artifactId>
                 <version>${mybatis-starter.version}</version>
             </dependency>
-            <!--Spring Boot End-->
 
             <!--Validation API-->
             <!--
@@ -109,11 +106,6 @@
             <!--Validation API End -->
 
             <!-- Misc -->
-            <dependency>
-                <groupId>org.reflections</groupId>
-                <artifactId>reflections</artifactId>
-                <version>0.10.2</version>
-            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
@@ -144,10 +136,9 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
+                    <version>3.0.0</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/start/pom.xml b/cola-archetypes/cola-archetype-service/src/main/resources/archetype-resources/start/pom.xml
@@ -17,6 +17,7 @@
             <groupId>${groupId}</groupId>
             <artifactId>${rootArtifactId}-app</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>

diff --git a/...a-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-adapter/pom.xml b/...a-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-adapter/pom.xml
@@ -17,6 +17,7 @@
             <groupId>${groupId}</groupId>
             <artifactId>${rootArtifactId}-app</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -27,17 +28,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>
diff --git a/.../cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml b/.../cola-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-app/pom.xml
@@ -21,10 +21,12 @@
             <groupId>${groupId}</groupId>
             <artifactId>${rootArtifactId}-infrastructure</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba.cola</groupId>
             <artifactId>cola-component-catchlog-starter</artifactId>
         </dependency>
+
         <!-- JSR 303 Validation -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>
@@ -40,17 +42,4 @@
         </dependency>
         <!-- JSR 303 Validation End-->
     </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>
diff --git a/...la-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml b/...la-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-domain/pom.xml
@@ -13,6 +13,11 @@
     <name>${artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>${groupId}</groupId>
+            <artifactId>${rootArtifactId}-client</artifactId>
+        </dependency>
+
         <!-- COLA components -->
         <dependency>
             <groupId>com.alibaba.cola</groupId>
@@ -23,22 +28,5 @@
             <artifactId>cola-component-exception</artifactId>
         </dependency>
         <!-- COLA components End-->
-        <dependency>
-            <groupId>${groupId}</groupId>
-            <artifactId>${rootArtifactId}-client</artifactId>
-        </dependency>
     </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>
diff --git a/...type-web/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml b/...type-web/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml
@@ -17,6 +17,7 @@
             <groupId>${groupId}</groupId>
             <artifactId>${rootArtifactId}-domain</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>

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
@@ -1,5 +1,6 @@
 <?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>${groupId}</groupId>
@@ -13,6 +14,7 @@
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.deploy.skip>true</maven.deploy.skip>
 
         <cola.components.version>4.4.0-SNAPSHOT</cola.components.version>
 
@@ -44,16 +46,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!--COLA components-->
-            <dependency>
-                <groupId>com.alibaba.cola</groupId>
-                <artifactId>cola-components-bom</artifactId>
-                <version>${cola.components.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!--COLA components End-->
-
             <!--Project modules-->
             <dependency>
                 <groupId>${groupId}</groupId>
@@ -82,7 +74,13 @@
             </dependency>
             <!--Project modules End-->
 
-            <!--Spring Boot-->
+            <dependency>
+                <groupId>com.alibaba.cola</groupId>
+                <artifactId>cola-components-bom</artifactId>
+                <version>${cola.components.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -95,7 +93,6 @@
                 <artifactId>mybatis-spring-boot-starter</artifactId>
                 <version>${mybatis-starter.version}</version>
             </dependency>
-            <!--Spring Boot End-->
 
             <!--Validation API-->
             <!--
@@ -115,11 +112,6 @@
             <!--Validation API End -->
 
             <!-- Misc -->
-            <dependency>
-                <groupId>org.reflections</groupId>
-                <artifactId>reflections</artifactId>
-                <version>0.10.2</version>
-            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
@@ -149,11 +141,10 @@
                     <version>3.4.0</version>
                 </plugin>
                 <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
+                     <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.0.0</version>
                 </plugin>
+
                 <plugin>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/start/pom.xml b/cola-archetypes/cola-archetype-web/src/main/resources/archetype-resources/start/pom.xml
@@ -17,6 +17,7 @@
             <groupId>${groupId}</groupId>
             <artifactId>${rootArtifactId}-adapter</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>

diff --git a/cola-samples/craftsman/craftsman-adapter/pom.xml b/cola-samples/craftsman/craftsman-adapter/pom.xml
@@ -17,6 +17,7 @@
             <groupId>com.alibaba.craftsman</groupId>
             <artifactId>craftsman-app</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

diff --git a/cola-samples/craftsman/craftsman-app/pom.xml b/cola-samples/craftsman/craftsman-app/pom.xml
@@ -14,10 +14,6 @@
     <name>craftsman-app</name>
 
     <dependencies>
-        <dependency>
-            <groupId>com.alibaba.cola</groupId>
-            <artifactId>cola-component-catchlog-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.craftsman</groupId>
             <artifactId>craftsman-client</artifactId>
@@ -26,6 +22,12 @@
             <groupId>com.alibaba.craftsman</groupId>
             <artifactId>craftsman-infrastructure</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cola</groupId>
+            <artifactId>cola-component-catchlog-starter</artifactId>
+        </dependency>
+
         <!-- JSR 303 Validation -->
         <dependency>
             <groupId>org.hibernate.validator</groupId>

diff --git a/cola-samples/craftsman/craftsman-client/pom.xml b/cola-samples/craftsman/craftsman-client/pom.xml
@@ -17,6 +17,7 @@
             <groupId>com.alibaba.cola</groupId>
             <artifactId>cola-component-dto</artifactId>
         </dependency>
+
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>