From 7eb214c9e149b4fc54a0d0e649c97cdfdff07559 Mon Sep 17 00:00:00 2001
From: Jone <linhz@yolipai.com>
Date: Thu, 12 Jul 2018 19:58:48 +0800
Subject: [PATCH] 调整 pom 结构，避免子项目因自定义插件而报错

---
 pom.xml | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
 1 file changed, 63 insertions(+), 67 deletions(-)

diff --git a/pom.xml b/pom.xml
index 42164c4..28ca22f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,69 @@
 						</execution>
 					</executions>
 				</plugin>
+
+
+				<!-- 拷贝依赖包插件 -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>copy</id>
+							<phase>process-resources</phase>
+							<goals>
+								<goal>copy-dependencies</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- 单元测试插件 -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<!-- 等效mvn test -Dmaven.surefire.debug
+                    <configuration>
+                    <debugForkedProcess>true</debugForkedProcess>
+                    </configuration>
+                     -->
+				</plugin>
+				<!-- 集成测试插件 -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-failsafe-plugin</artifactId>
+				</plugin>
+				<!-- 覆盖率统计插件 -->
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>0.7.9</version>
+					<configuration>
+						<append>true</append>
+					</configuration>
+					<executions>
+						<execution>
+							<id>agent-for-ut</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+						</execution>
+						<execution>
+							<id>agent-for-it</id>
+							<goals>
+								<goal>prepare-agent-integration</goal>
+							</goals>
+						</execution>
+						<execution>
+							<id>jacoco-site</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<!-- 性能测试，安全测试,docker发布插件，暂略 -->
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -175,73 +238,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			
-			
-
-
-			<!-- 拷贝依赖包插件 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>	
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- 单元测试插件 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>	
-				<!-- 等效mvn test -Dmaven.surefire.debug
-				<configuration>
-				<debugForkedProcess>true</debugForkedProcess>
-				</configuration>
-				 -->
-			</plugin>
-			<!-- 集成测试插件 -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-failsafe-plugin</artifactId>		
-			</plugin>
-			<!-- 覆盖率统计插件 -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.9</version>
-				<configuration>
-					<append>true</append>
-				</configuration>
-				<executions>
-					<execution>
-						<id>agent-for-ut</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>agent-for-it</id>
-						<goals>
-							<goal>prepare-agent-integration</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>jacoco-site</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<!-- 性能测试，安全测试,docker发布插件，暂略 -->
-			
-			
 		</plugins>
 	</build>
 
--
libgit2 0.21.4