From 09481ce2cfd7b0f2d29f739f8c07152abe97d767 Mon Sep 17 00:00:00 2001
From: MyXOF <xuyi556677@163.com>
Date: Tue, 8 Jan 2019 15:00:12 +0800
Subject: [PATCH 1/3] remove antrun plugin and use maven-jar-plugin

---
 iotdb-cli/pom.xml | 33 +++++++--------------------------
 iotdb/pom.xml     | 35 +++++++----------------------------
 2 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/iotdb-cli/pom.xml b/iotdb-cli/pom.xml
index 11ad2cec4..ddf062600 100644
--- a/iotdb-cli/pom.xml
+++ b/iotdb-cli/pom.xml
@@ -47,7 +47,6 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
 				<configuration>
 					<filesets>
 						<fileset>
@@ -63,7 +62,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
@@ -77,30 +75,13 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<id>copy-native-libraries</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								
-								<copy todir="${project.basedir}/cli/lib">
-									<fileset dir="${project.basedir}/target/">
-										<include name="*.jar" />
-									</fileset>
-								</copy>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+		    <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-jar-plugin</artifactId>
+		        <configuration>
+		            <outputDirectory>${project.basedir}/cli/lib</outputDirectory>
+		        </configuration>
+		    </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/iotdb/pom.xml b/iotdb/pom.xml
index 0b7310130..b9fa712bc 100644
--- a/iotdb/pom.xml
+++ b/iotdb/pom.xml
@@ -81,7 +81,6 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.1.0</version>
 				<configuration>
 					<filesets>
 						<fileset>
@@ -111,7 +110,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
@@ -125,7 +123,13 @@
 					</execution>
 				</executions>
 			</plugin>
-
+		    <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-jar-plugin</artifactId>
+		        <configuration>
+		            <outputDirectory>${project.basedir}/iotdb/lib</outputDirectory>
+		        </configuration>
+		    </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -140,31 +144,6 @@
 					</includes>
 				</configuration>
 			</plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<id>copy-native-libraries</id>
-						<phase>package</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<copy todir="${project.basedir}/iotdb/lib">
-									<fileset dir="${project.basedir}/target/">
-										<include name="*.jar" />
-									</fileset>
-								</copy>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
 			<!-- Might require this in Eclipse -->
 			<!--plugin>
 				<groupId>org.codehaus.mojo</groupId>

From 73908e145e31879e45b251c2126595d46ad60fea Mon Sep 17 00:00:00 2001
From: MyXOF <xuyi556677@163.com>
Date: Tue, 8 Jan 2019 17:39:57 +0800
Subject: [PATCH 2/3] replace antlr plugin with antlr-time

---
 iotdb/pom.xml                                     | 15 ++++++++++++---
 .../cn/edu/tsinghua/iotdb/sql/parse/ASTNode.java  |  4 +---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/iotdb/pom.xml b/iotdb/pom.xml
index b9fa712bc..40ba33a3f 100644
--- a/iotdb/pom.xml
+++ b/iotdb/pom.xml
@@ -15,6 +15,7 @@
 
 	<properties>
 		<antlr3.version>3.5.2</antlr3.version>
+		<common.lang3.version>3.8.1</common.lang3.version>
 		<iotdb.test.skip>false</iotdb.test.skip>
 		<it.test.includes>**/*Test.java</it.test.includes>
 		<it.test.excludes>**/NoTest.java</it.test.excludes>
@@ -70,10 +71,17 @@
 			<artifactId>commons-collections4</artifactId>
 			<version>${commons.collections4}</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.antlr/antlr-runtime -->
 		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>antlr3-maven-plugin</artifactId>
-			<version>${antlr3.version}</version>
+		    <groupId>org.antlr</groupId>
+		    <artifactId>antlr-runtime</artifactId>
+		    <version>${antlr3.version}</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+		<dependency>
+		    <groupId>org.apache.commons</groupId>
+		    <artifactId>commons-lang3</artifactId>
+		    <version>${common.lang3.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -94,6 +102,7 @@
 				</configuration>
 			</plugin>
 
+
 			<plugin>
 				<groupId>org.antlr</groupId>
 				<artifactId>antlr3-maven-plugin</artifactId>
diff --git a/iotdb/src/main/java/cn/edu/tsinghua/iotdb/sql/parse/ASTNode.java b/iotdb/src/main/java/cn/edu/tsinghua/iotdb/sql/parse/ASTNode.java
index 817988e08..e740691c2 100644
--- a/iotdb/src/main/java/cn/edu/tsinghua/iotdb/sql/parse/ASTNode.java
+++ b/iotdb/src/main/java/cn/edu/tsinghua/iotdb/sql/parse/ASTNode.java
@@ -10,9 +10,7 @@
 import org.antlr.runtime.Token;
 import org.antlr.runtime.tree.CommonTree;
 import org.antlr.runtime.tree.Tree;
-
-import org.codehaus.plexus.util.StringUtils;
-
+import org.apache.commons.lang3.StringUtils;;
 
 public class ASTNode extends CommonTree implements Node, Serializable {
 	private static final long serialVersionUID = 1L;

From 7708e3b938c1f0c01687cbcf84147709210e9dcf Mon Sep 17 00:00:00 2001
From: MyXOF <xuyi556677@163.com>
Date: Tue, 8 Jan 2019 18:02:35 +0800
Subject: [PATCH 3/3] remove useless dependency

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

diff --git a/pom.xml b/pom.xml
index f18b42dbf..b8dda9396 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,11 +84,6 @@
 	</dependencyManagement>
 
 	<dependencies>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>