Merge pull request alibaba#151 from oldratlee/improve/maven-build

improve maven build stability and unify pom format
imlhx · Jan 4, 2021 · 6351eb7 · 6351eb7
2 parents aad7b7a + 5d5b313
commit 6351eb7
Show file tree

Hide file tree

Showing 34 changed files with 212 additions and 58 deletions.
diff --git a/cola-archetypes/cola-archetype-service/pom.xml b/cola-archetypes/cola-archetype-service/pom.xml
@@ -2,6 +2,7 @@
 <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>
+
     <groupId>com.alibaba.cola</groupId>
     <artifactId>cola-framework-archetype-service</artifactId>
     <version>4.0.0</version>
@@ -44,6 +45,12 @@
         </developer>
     </developers>
 
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
     <build>
         <extensions>
             <extension>
@@ -74,15 +81,15 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
+                <version>3.8.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${artifactId}</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>${groupId}</groupId>

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
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${parentArtifactId}-client</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>

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
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${artifactId}</name>
+
 	<dependencies>
 		<!-- COLA components -->
 		<dependency>

diff --git a/...-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml b/...-service/src/main/resources/archetype-resources/__rootArtifactId__-infrastructure/pom.xml
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${artifactId}</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>${groupId}</groupId>

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,7 +1,7 @@
 <?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">
-
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <packaging>pom</packaging>
@@ -11,7 +11,6 @@
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <java.version>1.8</java.version>
         <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>
@@ -142,6 +141,16 @@
                     <artifactId>maven-source-plugin</artifactId>
                     <version>3.0.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <configuration>

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
@@ -1,14 +1,13 @@
 <?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">
-
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>
         <artifactId>${rootArtifactId}</artifactId>
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <packaging>jar</packaging>
     <name>${artifactId}</name>

diff --git a/cola-archetypes/cola-archetype-web/pom.xml b/cola-archetypes/cola-archetype-web/pom.xml
@@ -1,6 +1,7 @@
 <?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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>com.alibaba.cola</groupId>
   <artifactId>cola-framework-archetype-web</artifactId>
   <version>4.0.0</version>
@@ -43,6 +44,12 @@
     </developer>
   </developers>
 
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
     <extensions>
       <extension>
@@ -73,15 +80,15 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.2.0</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
+        <version>3.8.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

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
@@ -7,9 +7,11 @@
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
+
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
     <name>${artifactId}</name>
+
     <dependencies>
         <dependency>
             <groupId>${groupId}</groupId>

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
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${artifactId}</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>${groupId}</groupId>

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
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${parentArtifactId}-client</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.alibaba.cola</groupId>

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
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${artifactId}</name>
+
 	<dependencies>
 		<!-- COLA components -->
 		<dependency>

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
@@ -7,9 +7,11 @@
 		<version>${version}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
 	<name>${artifactId}</name>
+
 	<dependencies>
 		<dependency>
 			<groupId>${groupId}</groupId>

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,7 +1,7 @@
 <?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">
-
     <modelVersion>4.0.0</modelVersion>
+
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <packaging>pom</packaging>
@@ -11,7 +11,6 @@
     <properties>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-        <java.version>1.8</java.version>
         <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>
@@ -149,6 +148,16 @@
                     <artifactId>maven-source-plugin</artifactId>
                     <version>3.0.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.2.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <configuration>

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
@@ -1,14 +1,13 @@
 <?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">
-
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>${groupId}</groupId>
         <artifactId>${rootArtifactId}</artifactId>
         <version>${version}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <artifactId>${artifactId}</artifactId>
     <packaging>jar</packaging>
     <name>${artifactId}</name>

diff --git a/cola-archetypes/pom.xml b/cola-archetypes/pom.xml
@@ -1,18 +1,17 @@
 <?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>com.alibaba.cola</groupId>
     <artifactId>cola-archeytpes</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0</version>
     <name>cola-archeytpes</name>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <modules>

diff --git a/cola-components/archetypes/cola-normal-component-archetype/pom.xml b/cola-components/archetypes/cola-normal-component-archetype/pom.xml
@@ -1,6 +1,5 @@
 <?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/xsd/maven-4.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>com.alibaba.cola</groupId>

diff --git a/...archetypes/cola-normal-component-archetype/src/main/resources/archetype-resources/pom.xml b/...archetypes/cola-normal-component-archetype/src/main/resources/archetype-resources/pom.xml
@@ -9,9 +9,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
@@ -30,6 +30,5 @@
             <scope>provided</scope>
         </dependency>
 
-
     </dependencies>
 </project>
diff --git a/...rchetypes/cola-starter-component-archetype/src/main/resources/archetype-resources/pom.xml b/...rchetypes/cola-starter-component-archetype/src/main/resources/archetype-resources/pom.xml
@@ -9,9 +9,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.boot.version>2.2.6.RELEASE</spring.boot.version>
     </properties>
 

diff --git a/cola-components/cola-component-catchlog-starter/pom.xml b/cola-components/cola-component-catchlog-starter/pom.xml
@@ -9,9 +9,9 @@
     <packaging>jar</packaging>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.boot.version>2.2.6.RELEASE</spring.boot.version>
         <cola.version>1.0.0</cola.version>
     </properties>
@@ -84,4 +84,18 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.2.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>