! unify/improve pom format

- unify pom elements order: groupId, artifactId, version, packaging, name, url, etc - remove redundant version element in submodule - specify <packaging>jar</packaging> element explicitly in submodule - fix indentation
agmtopy · Jan 5, 2021 · 721043f · 721043f
1 parent beb2538
commit 721043f
Show file tree

Hide file tree

Showing 29 changed files with 79 additions and 82 deletions.
diff --git a/cola-archetypes/cola-archetype-service/pom.xml b/cola-archetypes/cola-archetype-service/pom.xml
@@ -7,10 +7,9 @@
     <artifactId>cola-framework-archetype-service</artifactId>
     <version>4.0.0</version>
     <packaging>jar</packaging>
-
     <name>cola-archetype-service</name>
-    <url>https://github.com/alibaba/COLA</url>
     <description>Cola framework archetype-service</description>
+    <url>https://github.com/alibaba/COLA</url>
 
     <distributionManagement>
         <snapshotRepository>

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
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${artifactId}</name>
 
 	<dependencies>
@@ -42,15 +42,15 @@
 	</dependencies>
 
 	<build>
-			<pluginManagement>
-					<plugins>
-							<plugin>
-								<artifactId>maven-deploy-plugin</artifactId>
-								<configuration>
-									<skip>true</skip>
-								</configuration>
-							</plugin>
-					</plugins>
-			</pluginManagement>
+		<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__-client/pom.xml b/...rchetype-service/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${parentArtifactId}-client</name>
 
 	<dependencies>

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
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${artifactId}</name>
 
 	<dependencies>
@@ -30,15 +30,15 @@
 	</dependencies>
 
 	<build>
-			<pluginManagement>
-					<plugins>
-							<plugin>
-								<artifactId>maven-deploy-plugin</artifactId>
-								<configuration>
-									<skip>true</skip>
-								</configuration>
-							</plugin>
-					</plugins>
-			</pluginManagement>
+		<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
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${artifactId}</name>
 
 	<dependencies>

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
@@ -4,15 +4,16 @@
 
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
-    <packaging>pom</packaging>
     <version>${version}</version>
+    <packaging>pom</packaging>
     <name>${artifactId}</name>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
         <mybatis-starter.version>1.3.1</mybatis-starter.version>
         <spring-boot.version>2.1.3.RELEASE</spring-boot.version>
         <cola.components.version>1.0.0</cola.components.version>

diff --git a/cola-archetypes/cola-archetype-web/pom.xml b/cola-archetypes/cola-archetype-web/pom.xml
@@ -6,10 +6,9 @@
   <artifactId>cola-framework-archetype-web</artifactId>
   <version>4.0.0</version>
   <packaging>maven-archetype</packaging>
-
   <name>cola-archetype-web</name>
-  <url>https://github.com/alibaba/COLA</url>
   <description>Cola framework archetype-web</description>
+  <url>https://github.com/alibaba/COLA</url>
 
   <distributionManagement>
     <snapshotRepository>

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
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
+    <packaging>jar</packaging>
     <name>${artifactId}</name>
 
     <dependencies>

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
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${artifactId}</name>
 
 	<dependencies>
@@ -42,15 +42,15 @@
 	</dependencies>
 
 	<build>
-			<pluginManagement>
-					<plugins>
-							<plugin>
-								<artifactId>maven-deploy-plugin</artifactId>
-								<configuration>
-									<skip>true</skip>
-								</configuration>
-							</plugin>
-					</plugins>
-			</pluginManagement>
+		<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__-client/pom.xml b/...la-archetype-web/src/main/resources/archetype-resources/__rootArtifactId__-client/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${parentArtifactId}-client</name>
 
 	<dependencies>

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
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${artifactId}</name>
 
 	<dependencies>
@@ -30,15 +30,15 @@
 	</dependencies>
 
 	<build>
-			<pluginManagement>
-					<plugins>
-							<plugin>
-								<artifactId>maven-deploy-plugin</artifactId>
-								<configuration>
-									<skip>true</skip>
-								</configuration>
-							</plugin>
-					</plugins>
-			</pluginManagement>
+		<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
@@ -9,7 +9,7 @@
 	</parent>
 
 	<artifactId>${artifactId}</artifactId>
-	<version>${version}</version>
+	<packaging>jar</packaging>
 	<name>${artifactId}</name>
 
 	<dependencies>

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
@@ -4,15 +4,16 @@
 
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
-    <packaging>pom</packaging>
     <version>${version}</version>
+    <packaging>pom</packaging>
     <name>${artifactId}</name>
 
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
         <mybatis-starter.version>1.3.1</mybatis-starter.version>
         <spring-boot.version>2.1.3.RELEASE</spring-boot.version>
         <cola.component.version>1.0.0</cola.component.version>

diff --git a/cola-archetypes/pom.xml b/cola-archetypes/pom.xml
@@ -4,8 +4,8 @@
 
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-archeytpes</artifactId>
-    <packaging>pom</packaging>
     <version>1.0.0</version>
+    <packaging>pom</packaging>
     <name>cola-archeytpes</name>
 
     <properties>

diff --git a/cola-components/archetypes/cola-normal-component-archetype/pom.xml b/cola-components/archetypes/cola-normal-component-archetype/pom.xml
@@ -6,7 +6,6 @@
     <artifactId>cola-normal-component-archetype</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
-
     <name>cola-normal-component-archetype</name>
     <description>COLA normal componet archetype</description>
 

diff --git a/cola-components/archetypes/cola-starter-component-archetype/pom.xml b/cola-components/archetypes/cola-starter-component-archetype/pom.xml
@@ -6,7 +6,6 @@
   <artifactId>cola-starter-component-archetype</artifactId>
   <version>1.0.0</version>
   <packaging>jar</packaging>
-
   <name>cola-starter-component-archetype</name>
 
   <build>

diff --git a/cola-components/cola-component-catchlog-starter/pom.xml b/cola-components/cola-component-catchlog-starter/pom.xml
@@ -2,11 +2,11 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>cola-component-catchlog-starter</name>
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-component-catchlog-starter</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
+    <name>cola-component-catchlog-starter</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/cola-components/cola-component-domain-starter/pom.xml b/cola-components/cola-component-domain-starter/pom.xml
@@ -2,11 +2,11 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>cola-component-domain-starter</name>
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-component-domain-starter</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
+    <name>cola-component-domain-starter</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/cola-components/cola-component-dto/pom.xml b/cola-components/cola-component-dto/pom.xml
@@ -2,11 +2,11 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>cola-component-dto</name>
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-component-dto</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
+    <name>cola-component-dto</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/cola-components/cola-component-exception/pom.xml b/cola-components/cola-component-exception/pom.xml
@@ -2,11 +2,11 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>cola-component-exception</name>
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-component-exception</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
+    <name>cola-component-exception</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/cola-components/cola-component-extension-starter/pom.xml b/cola-components/cola-component-extension-starter/pom.xml
@@ -2,11 +2,11 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>cola-component-extension-starter</name>
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-component-extension-starter</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
+    <name>cola-component-extension-starter</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/cola-components/cola-component-statemachine/pom.xml b/cola-components/cola-component-statemachine/pom.xml
@@ -6,10 +6,9 @@
     <artifactId>cola-component-statemachine</artifactId>
     <packaging>jar</packaging>
     <version>1.0.0</version>
-
     <name>Cola component statemachine</name>
-    <url>https://github.com/alibaba/COLA</url>
     <description>Cola component statemachine</description>
+    <url>https://github.com/alibaba/COLA</url>
 
     <distributionManagement>
         <snapshotRepository>

diff --git a/cola-components/cola-component-test-container/pom.xml b/cola-components/cola-component-test-container/pom.xml
@@ -2,11 +2,11 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <name>cola-component-test-container</name>
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-component-test-container</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
+    <name>cola-component-test-container</name>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/cola-components/pom.xml b/cola-components/pom.xml
@@ -4,8 +4,8 @@
 
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-components</artifactId>
-    <packaging>pom</packaging>
     <version>1.0.0</version>
+    <packaging>pom</packaging>
     <name>cola-components</name>
 
     <properties>