Merge branch '1.10_release_4.0.x' into 1.10_release_4.1.x

Author: gituser

pom.xml

@@ -149,24 +149,19 @@
                 </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>clean-plugins</id>
-                        <!-- here the phase you need -->
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <delete dir="plugins"></delete>
-                                <delete dir="sqlplugins"></delete>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${basedir}/plugins</directory>
+                        </fileset>
+                        <fileset>
+                            <directory>${basedir}/sqlplugins</directory>
+                        </fileset>
+                    </filesets>
+                </configuration>
             </plugin>
         </plugins>
     </build>