Revert "remove antrun plugin and use maven-jar-plugin (#564)"

This reverts commit 3c0a2bb.
thulab · Jan 8, 2019 · 4f6ba6f · 4f6ba6f
1 parent 3c0a2bb
commit 4f6ba6f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 14 deletions.
diff --git a/iotdb-cli/pom.xml b/iotdb-cli/pom.xml
@@ -47,6 +47,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
 				<configuration>
 					<filesets>
 						<fileset>
@@ -62,6 +63,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
@@ -75,13 +77,30 @@
 					</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-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-surefire-plugin</artifactId>

diff --git a/iotdb/pom.xml b/iotdb/pom.xml
@@ -81,6 +81,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
 				<configuration>
 					<filesets>
 						<fileset>
@@ -110,6 +111,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.10</version>
 				<executions>
 					<execution>
 						<id>copy-dependencies</id>
@@ -123,13 +125,7 @@
 					</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>
@@ -144,6 +140,31 @@
 					</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>