From b16d6bd4bd66984428d4dffe1850b316ec737f32 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 30 Apr 2022 11:16:41 +0800
Subject: [PATCH] maven plugin update

---
 .../modules/gen/module_cloud/web/pom.xml      | 12 +--
 parent/pom.xml                                | 84 ++++++++++---------
 web-api/pom.xml                               | 30 +++----
 web-fast/pom.xml                              | 14 +---
 web/pom.xml                                   | 20 ++---
 5 files changed, 62 insertions(+), 98 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
index 7f43586c..11adc86f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml
@@ -88,23 +88,13 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin> -->
 			
-			<!-- 打包插件, war包名称不带版本号 -->
+			<!-- war插件，war包名称不带版本号 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<!-- <packagingExcludes></packagingExcludes>
-					<warSourceExcludes></warSourceExcludes> -->
-					<webappDirectory>\${project.build.directory}/\${project.artifactId}</webappDirectory>
 					<warName>\${finalName}</warName>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
 				</configuration>
 			</plugin>
 			
diff --git a/parent/pom.xml b/parent/pom.xml
index 89e99c32..6a946b50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,53 +74,16 @@
 	
 		<plugins>
 		
-			<!-- Compiler 插件, 设定JDK版本 -->
+			<!-- compiler插件 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<showWarnings>true</showWarnings>
-<!-- 					<compilerArguments> -->
-<!-- 						<verbose /> 输出有关编译器正在执行的操作的消息 -->
-<!-- 						<bootclasspath>${JAVA_HOME}\jre\lib\rt.jar;${JAVA_HOME}\jre\lib\jce.jar</bootclasspath> -->
-<!-- 					</compilerArguments> -->
-				</configuration>
 			</plugin>
 				
-			<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
+			<!-- jar插件 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<!-- <encoding>${project.build.sourceEncoding}</encoding> -->
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<!-- <phase>prepare-package</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals> -->
-						<configuration>
-							<!-- <classesDirectory>${project.outputDirectory}</classesDirectory>
-							<finalName>${finalName}</finalName>
-							<outputDirectory>${project.build.directory}/${project.artifactId}/WEB-INF/lib</outputDirectory>
-							<includes>
-								<include>com/thinkgem/jeesite/**</include>
-							</includes> -->
-							<archive>
-								<manifest>
-									<!-- Add directory entries -->
-									<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-									<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-									<addClasspath>true</addClasspath>
-								</manifest>
-							</archive>
-						</configuration>
-					</execution>
-				</executions>
 			</plugin>
 			
 			<!-- resource插件 -->
@@ -146,8 +109,49 @@
 		<pluginManagement>
 		
 			<plugins>
+
+				<!-- compiler插件，设定JDK版本 -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<showWarnings>true</showWarnings>
+						<!-- <compilerArguments>
+							<verbose /> 输出有关编译器正在执行的操作的消息
+							<bootclasspath>${JAVA_HOME}\jre\lib\rt.jar;${JAVA_HOME}\jre\lib\jce.jar</bootclasspath>
+						</compilerArguments> -->
+					</configuration>
+				</plugin>
+
+				<!-- jar插件，配置manifest文件，加入lib包的jar依赖 -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<configuration>
+						<archive>
+							<addMavenDescriptor>false</addMavenDescriptor>
+						</archive>
+					</configuration>
+					<executions>
+						<execution>
+							<configuration>
+								<excludes>
+									<exclude>userfiles/**</exclude>
+								</excludes>
+                                <finalName>${project.artifactId}</finalName>
+								<archive>
+									<manifest>
+										<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+										<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+										<addClasspath>true</addClasspath>
+									</manifest>
+								</archive>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
 				
-				<!-- 打包插件, war包名称不带版本号 -->
+				<!-- war插件，war包名称不带版本号 -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
diff --git a/web-api/pom.xml b/web-api/pom.xml
index 7f152561..d49b14bb 100644
--- a/web-api/pom.xml
+++ b/web-api/pom.xml
@@ -41,27 +41,27 @@
 			<artifactId>jeesite-module-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		
+
 		<!-- 在线文档接口 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-module-swagger</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		
-		<!-- 内容管理模块
+
+		<!-- 内容管理模块 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-module-cms</artifactId>
 			<version>${project.parent.version}</version>
-		</dependency> -->
-		
-		<!-- 移动端模块
+		</dependency>
+
+		<!-- 移动端模块 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-module-app</artifactId>
 			<version>${project.parent.version}</version>
-		</dependency> -->
+		</dependency>
 		
 		<!-- 文件管理共享（标准版）
 		<dependency>
@@ -83,7 +83,7 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<scope>provided</scope>
 		</dependency> -->
-		
+
 	</dependencies>
 	
 	<build>
@@ -99,23 +99,13 @@
 					<includeSystemScope>true</includeSystemScope>
 				</configuration>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin> -->
-			
-			<!-- 打包插件, war包名称不带版本号 -->
+
+			<!-- war插件，war包名称不带版本号 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<!-- <packagingExcludes></packagingExcludes>
-					<warSourceExcludes></warSourceExcludes> -->
-					<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
 					<warName>${finalName}</warName>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
 				</configuration>
 			</plugin>
 			
diff --git a/web-fast/pom.xml b/web-fast/pom.xml
index 29fa10eb..b8793d8a 100644
--- a/web-fast/pom.xml
+++ b/web-fast/pom.xml
@@ -108,23 +108,13 @@
 					<includeSystemScope>true</includeSystemScope>
 				</configuration>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin> -->
-			
-			<!-- 打包插件, war包名称不带版本号 -->
+
+			<!-- war插件，war包名称不带版本号 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<!-- <packagingExcludes></packagingExcludes>
-					<warSourceExcludes></warSourceExcludes> -->
-					<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
 					<warName>${finalName}</warName>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
 				</configuration>
 			</plugin>
 			
diff --git a/web/pom.xml b/web/pom.xml
index 8ef02fc5..15af2260 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -41,21 +41,21 @@
 			<artifactId>jeesite-module-core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		
+
 		<!-- 在线文档接口 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-module-swagger</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		
+
 		<!-- 内容管理模块 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
 			<artifactId>jeesite-module-cms</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		
+
 		<!-- 移动端模块 -->
 		<dependency>
 			<groupId>com.jeesite</groupId>
@@ -99,23 +99,13 @@
 					<includeSystemScope>true</includeSystemScope>
 				</configuration>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-			</plugin> -->
-			
-			<!-- 打包插件, war包名称不带版本号 -->
+
+			<!-- war插件，war包名称不带版本号 -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
-					<!-- <packagingExcludes></packagingExcludes>
-					<warSourceExcludes></warSourceExcludes> -->
-					<webappDirectory>${project.build.directory}/${project.artifactId}</webappDirectory>
 					<warName>${finalName}</warName>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
 				</configuration>
 			</plugin>