From 13d2b48db2e1c472b5503bc875f95538e1e81fc0 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Sun, 26 Feb 2017 22:55:55 +0800
Subject: [PATCH] Fix pom.

---
 pom.xml | 74 ---------------------------------------------------------
 1 file changed, 74 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3898e5d5a..c3eb91467 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,78 +162,4 @@
             </plugin>
         </plugins>
     </build>
->>>>>>> feature/3.0
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>${compiler.version}</source>
-					<target>${compiler.version}</target>
-					<encoding>${project.build.sourceEncoding}</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>2.4.3</version>
-				<configuration>
-					<encoding>${project.build.sourceEncoding}</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>${docker.plugin.version}</version>
-				<configuration>
-					<skipDocker>true</skipDocker>
-				</configuration>
-			</plugin>
-			<plugin>
-				<!-- 源码插件 -->
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<!-- 发布时自动将源码同时发布的配置 -->
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-				<version>2.4</version>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.3</version>
-			</plugin>
-			<plugin>
-				<groupId>org.eluder.coveralls</groupId>
-				<artifactId>coveralls-maven-plugin</artifactId>
-				<version>4.1.0</version>
-				<configuration>
-					<repoToken>GGTAeHsfVql3x1BmTFaJvxC27f5sfcZNg</repoToken>
-				</configuration>
-			</plugin>
-			<!-- 覆盖率 -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<aggregate>true</aggregate>
-					<formats>
-						<format>xml</format>
-						<format>html</format>
-					</formats>
-					<instrumentation>
-					</instrumentation>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>