diff --git a/src/it/fast-delete/invoker.properties b/src/it/fast-delete/invoker.properties new file mode 100644 index 0000000..808c49e --- /dev/null +++ b/src/it/fast-delete/invoker.properties @@ -0,0 +1,18 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.goals = install clean -Dorg.slf4j.simpleLogger.showThreadName=true -X -e diff --git a/src/it/fast-delete/pom.xml b/src/it/fast-delete/pom.xml new file mode 100644 index 0000000..9203056 --- /dev/null +++ b/src/it/fast-delete/pom.xml @@ -0,0 +1,52 @@ + + + + + + 4.0.0 + + test + fast-delete + 1.0-SNAPSHOT + + Fast delete + Check that fast delete is invoked. + + + UTF-8 + + + + + + org.apache.maven.plugins + maven-clean-plugin + @project.version@ + + true + ${project.basedir}${file.separator}.fastdir + + + + + + diff --git a/src/it/fast-delete/verify.groovy b/src/it/fast-delete/verify.groovy new file mode 100644 index 0000000..59f5940 --- /dev/null +++ b/src/it/fast-delete/verify.groovy @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +File buildLog = new File(basedir, 'build.log') +return buildLog.text.contains('mvn-background-cleaner') diff --git a/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java b/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java index 3dff361..afc0df4 100644 --- a/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java +++ b/src/main/java/org/apache/maven/plugins/clean/CleanMojo.java @@ -258,8 +258,17 @@ public void execute() throws MojoExecutionException { if (fileset.getDirectory() == null) { throw new MojoExecutionException("Missing base directory for " + fileset); } - GlobSelector selector = new GlobSelector( - fileset.getIncludes(), fileset.getExcludes(), fileset.isUseDefaultExcludes()); + final String[] includes = fileset.getIncludes(); + final String[] excludes = fileset.getExcludes(); + final boolean useDefaultExcludes = fileset.isUseDefaultExcludes(); + final GlobSelector selector; + if ((includes != null && includes.length != 0) + || (excludes != null && excludes.length != 0) + || useDefaultExcludes) { + selector = new GlobSelector(includes, excludes, useDefaultExcludes); + } else { + selector = null; + } cleaner.delete( fileset.getDirectory(), selector, fileset.isFollowSymlinks(), failOnError, retryOnError); } diff --git a/src/site/apt/examples/delete_additional_files.apt.vm b/src/site/apt/examples/delete_additional_files.apt.vm index 40e5bf6..84ed079 100644 --- a/src/site/apt/examples/delete_additional_files.apt.vm +++ b/src/site/apt/examples/delete_additional_files.apt.vm @@ -73,3 +73,6 @@ Delete Additional Files Not Exposed to Maven You could also define file set rules in a parent POM. In this case, the clean plugin adds the subproject basedir to the defined relative path. + + <> The <<>> delete method will not work for any <<>> which defines any <<>> + or <<>>, or sets <<>> to <<>>, or sets <<>> to <<>>. \ No newline at end of file