This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch maven-clean-plugin-3.x
in repository https://gitbox.apache.org/repos/asf/maven-clean-plugin.git
The following commit(s) were added to refs/heads/maven-clean-plugin-3.x by this
push:
new 535492f Bump
org.apache.maven.plugin-testing:maven-plugin-testing-harness from 3.4.0 to
3.5.0 (#293)
535492f is described below
commit 535492fcbe74fdf259c6f9370769f33f89396a3b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Sun Jan 18 12:28:53 2026 +0100
Bump org.apache.maven.plugin-testing:maven-plugin-testing-harness from
3.4.0 to 3.5.0 (#293)
* Bump org.apache.maven.plugin-testing:maven-plugin-testing-harness
Bumps org.apache.maven.plugin-testing:maven-plugin-testing-harness from
3.4.0 to 3.5.0.
---
updated-dependencies:
- dependency-name:
org.apache.maven.plugin-testing:maven-plugin-testing-harness
dependency-version: 3.5.0
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Fix build
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Slawomir Jaranowski <[email protected]>
---
pom.xml | 8 +-
.../apache/maven/plugins/clean/CleanMojoTest.java | 89 +++++++++++-----------
.../resources/unit/basic-clean-test/plugin-pom.xml | 6 +-
.../unit/fileset-clean-test/plugin-pom.xml | 5 +-
.../unit/invalid-directory-test/plugin-pom.xml | 2 +-
.../resources/unit/locked-file-test/plugin-pom.xml | 2 +-
.../unit/missing-directory-test/plugin-pom.xml | 2 +-
.../unit/nested-clean-test/plugin-pom.xml | 6 +-
8 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/pom.xml b/pom.xml
index cded788..7e587a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.4.0</version>
+ <version>3.5.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -117,6 +117,12 @@ under the License.
<version>4.11.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.32</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java
b/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java
index 2b3cd43..704664d 100644
--- a/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/clean/CleanMojoTest.java
@@ -29,7 +29,9 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collections;
+import org.apache.maven.api.plugin.testing.Basedir;
import org.apache.maven.api.plugin.testing.InjectMojo;
+import org.apache.maven.api.plugin.testing.MojoParameter;
import org.apache.maven.api.plugin.testing.MojoTest;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.logging.SystemStreamLog;
@@ -39,7 +41,6 @@ import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
import static org.apache.maven.api.plugin.testing.MojoExtension.getBasedir;
-import static
org.apache.maven.api.plugin.testing.MojoExtension.setVariableValueToObject;
import static org.codehaus.plexus.util.IOUtil.copy;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -60,19 +61,14 @@ class CleanMojoTest {
* @throws Exception in case of an error.
*/
@Test
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/basic-clean-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/basic-clean-test")
void testBasicClean(CleanMojo mojo) throws Exception {
mojo.execute();
- assertFalse(
- checkExists(getBasedir() + "/target/test-classes/unit/" +
"basic-clean-test/buildDirectory"),
- "Directory exists");
- assertFalse(
- checkExists(getBasedir() +
"/target/test-classes/unit/basic-clean-test/" + "buildOutputDirectory"),
- "Directory exists");
- assertFalse(
- checkExists(getBasedir() +
"/target/test-classes/unit/basic-clean-test/" + "buildTestDirectory"),
- "Directory exists");
+ assertFalse(checkExists(getBasedir() + "/buildDirectory"), "Directory
exists");
+ assertFalse(checkExists(getBasedir() + "/buildOutputDirectory"),
"Directory exists");
+ assertFalse(checkExists(getBasedir() + "/buildTestDirectory"),
"Directory exists");
}
/**
@@ -81,13 +77,14 @@ class CleanMojoTest {
* @throws Exception in case of an error.
*/
@Test
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/nested-clean-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/nested-clean-test")
void testCleanNestedStructure(CleanMojo mojo) throws Exception {
mojo.execute();
- assertFalse(checkExists(getBasedir() +
"/target/test-classes/unit/nested-clean-test/target"));
- assertFalse(checkExists(getBasedir() +
"/target/test-classes/unit/nested-clean-test/target/classes"));
- assertFalse(checkExists(getBasedir() +
"/target/test-classes/unit/nested-clean-test/target/test-classes"));
+ assertFalse(checkExists(getBasedir() + "/target"));
+ assertFalse(checkExists(getBasedir() + "/target/classes"));
+ assertFalse(checkExists(getBasedir() + "/target/test-classes"));
}
/**
@@ -97,17 +94,15 @@ class CleanMojoTest {
* @throws Exception in case of an error.
*/
@Test
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/empty-clean-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/empty-clean-test")
void testCleanEmptyDirectories(CleanMojo mojo) throws Exception {
mojo.execute();
- assertTrue(checkExists(getBasedir() +
"/target/test-classes/unit/empty-clean-test/testDirectoryStructure"));
- assertTrue(checkExists(
- getBasedir() + "/target/test-classes/unit/empty-clean-test/" +
"testDirectoryStructure/file.txt"));
- assertTrue(checkExists(getBasedir() +
"/target/test-classes/unit/empty-clean-test/"
- + "testDirectoryStructure/outputDirectory"));
- assertTrue(checkExists(getBasedir() +
"/target/test-classes/unit/empty-clean-test/"
- + "testDirectoryStructure/outputDirectory/file.txt"));
+ assertTrue(checkExists(getBasedir() + "/testDirectoryStructure"));
+ assertTrue(checkExists(getBasedir() +
"/testDirectoryStructure/file.txt"));
+ assertTrue(checkExists(getBasedir() +
"/testDirectoryStructure/outputDirectory"));
+ assertTrue(checkExists(getBasedir() +
"/testDirectoryStructure/outputDirectory/file.txt"));
}
/**
@@ -116,25 +111,24 @@ class CleanMojoTest {
* @throws Exception in case of an error.
*/
@Test
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/fileset-clean-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/fileset-clean-test")
void testFilesetsClean(CleanMojo mojo) throws Exception {
mojo.execute();
// fileset 1
- assertTrue(checkExists(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target"));
- assertTrue(checkExists(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target/classes"));
- assertFalse(checkExists(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target/test-classes"));
- assertTrue(checkExists(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target/subdir"));
- assertFalse(checkExists(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target/classes/file.txt"));
- assertTrue(checkEmpty(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target/classes"));
- assertFalse(checkEmpty(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target/subdir"));
- assertTrue(checkExists(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/target/subdir/file.txt"));
+ assertTrue(checkExists(getBasedir() + "/target"));
+ assertTrue(checkExists(getBasedir() + "/target/classes"));
+ assertFalse(checkExists(getBasedir() + "/target/test-classes"));
+ assertTrue(checkExists(getBasedir() + "/target/subdir"));
+ assertFalse(checkExists(getBasedir() + "/target/classes/file.txt"));
+ assertTrue(checkEmpty(getBasedir() + "/target/classes"));
+ assertFalse(checkEmpty(getBasedir() + "/target/subdir"));
+ assertTrue(checkExists(getBasedir() + "/target/subdir/file.txt"));
// fileset 2
- assertTrue(
- checkExists(getBasedir() +
"/target/test-classes/unit/fileset-clean-test/" + "buildOutputDirectory"));
- assertFalse(checkExists(
- getBasedir() + "/target/test-classes/unit/fileset-clean-test/"
+ "buildOutputDirectory/file.txt"));
+ assertTrue(checkExists(getBasedir() + "/buildOutputDirectory"));
+ assertFalse(checkExists(getBasedir() +
"/buildOutputDirectory/file.txt"));
}
/**
@@ -143,9 +137,11 @@ class CleanMojoTest {
* @throws Exception in case of an error.
*/
@Test
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/invalid-directory-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/invalid-directory-test")
void testCleanInvalidDirectory(CleanMojo mojo) throws Exception {
- assertThrows(MojoExecutionException.class, mojo::execute);
+ Exception exception = assertThrows(MojoExecutionException.class,
mojo::execute);
+ assertTrue(exception.getMessage().contains("Failed to clean project:
Invalid base directory"));
}
/**
@@ -154,11 +150,12 @@ class CleanMojoTest {
* @throws Exception in case of an error.
*/
@Test
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/missing-directory-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/missing-directory-test")
void testMissingDirectory(CleanMojo mojo) throws Exception {
mojo.execute();
- assertFalse(checkExists(getBasedir() +
"/target/test-classes/unit/missing-directory-test/does-not-exist"));
+ assertFalse(checkExists(getBasedir() + "/does-not-exist"));
}
/**
@@ -171,9 +168,10 @@ class CleanMojoTest {
*/
@Test
@EnabledOnOs(OS.WINDOWS)
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/locked-file-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/locked-file-test")
void testCleanLockedFile(CleanMojo mojo) throws Exception {
- File f = new File(getBasedir(),
"target/test-classes/unit/locked-file-test/buildDirectory/file.txt");
+ File f = new File(getBasedir(), "/buildDirectory/file.txt");
try (FileChannel channel = new RandomAccessFile(f, "rw").getChannel();
FileLock ignored = channel.lock()) {
mojo.execute();
@@ -193,12 +191,13 @@ class CleanMojoTest {
*/
@Test
@EnabledOnOs(OS.WINDOWS)
- @InjectMojo(goal = "clean", pom =
"classpath:/unit/locked-file-test/plugin-pom.xml")
+ @InjectMojo(goal = "clean", pom = "plugin-pom.xml")
+ @Basedir("/unit/locked-file-test")
+ @MojoParameter(name = "failOnError", value = "false")
void testCleanLockedFileWithNoError(CleanMojo mojo) throws Exception {
- setVariableValueToObject(mojo, "failOnError", Boolean.FALSE);
assertNotNull(mojo);
- File f = new File(getBasedir(),
"target/test-classes/unit/locked-file-test/buildDirectory/file.txt");
+ File f = new File(getBasedir(), "/buildDirectory/file.txt");
try (FileChannel channel = new RandomAccessFile(f, "rw").getChannel();
FileLock ignored = channel.lock()) {
mojo.execute();
diff --git a/src/test/resources/unit/basic-clean-test/plugin-pom.xml
b/src/test/resources/unit/basic-clean-test/plugin-pom.xml
index 38a6000..82e6fd1 100644
--- a/src/test/resources/unit/basic-clean-test/plugin-pom.xml
+++ b/src/test/resources/unit/basic-clean-test/plugin-pom.xml
@@ -23,9 +23,9 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
-
<directory>${basedir}/target/test-classes/unit/basic-clean-test/buildDirectory</directory>
-
<outputDirectory>${basedir}/target/test-classes/unit/basic-clean-test/buildOutputDirectory</outputDirectory>
-
<testOutputDirectory>${basedir}/target/test-classes/unit/basic-clean-test/buildTestDirectory</testOutputDirectory>
+ <directory>${basedir}/buildDirectory</directory>
+ <outputDirectory>${basedir}/buildOutputDirectory</outputDirectory>
+
<testOutputDirectory>${basedir}/buildTestDirectory</testOutputDirectory>
<verbose>true</verbose>
<failOnError>true</failOnError>
</configuration>
diff --git a/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
b/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
index 5cd3ab3..231a11f 100644
--- a/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
+++ b/src/test/resources/unit/fileset-clean-test/plugin-pom.xml
@@ -25,7 +25,7 @@
<configuration>
<filesets>
<fileset>
-
<directory>${basedir}/target/test-classes/unit/fileset-clean-test/target</directory>
+ <directory>${basedir}/target</directory>
<includes>
<include>**/file.txt</include>
<include>**/test-classes/**</include>
@@ -35,7 +35,7 @@
</excludes>
</fileset>
<fileset>
-
<directory>${basedir}/target/test-classes/unit/fileset-clean-test/buildOutputDirectory</directory>
+ <directory>${basedir}/buildOutputDirectory</directory>
<includes>
<include>**</include>
</includes>
@@ -46,6 +46,7 @@
</filesets>
<verbose>true</verbose>
<failOnError>true</failOnError>
+ <excludeDefaultDirectories>true</excludeDefaultDirectories>
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/invalid-directory-test/plugin-pom.xml
b/src/test/resources/unit/invalid-directory-test/plugin-pom.xml
index b562122..314f70b 100644
--- a/src/test/resources/unit/invalid-directory-test/plugin-pom.xml
+++ b/src/test/resources/unit/invalid-directory-test/plugin-pom.xml
@@ -23,7 +23,7 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
-
<directory>${basedir}/target/test-classes/unit/invalid-directory-test/this-is-a-file</directory>
+ <directory>${basedir}/this-is-a-file</directory>
<verbose>true</verbose>
<failOnError>true</failOnError>
</configuration>
diff --git a/src/test/resources/unit/locked-file-test/plugin-pom.xml
b/src/test/resources/unit/locked-file-test/plugin-pom.xml
index 4101091..21e07ab 100644
--- a/src/test/resources/unit/locked-file-test/plugin-pom.xml
+++ b/src/test/resources/unit/locked-file-test/plugin-pom.xml
@@ -23,7 +23,7 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
-
<directory>${basedir}/target/test-classes/unit/locked-file-test/buildDirectory</directory>
+ <directory>${basedir}/buildDirectory</directory>
<verbose>true</verbose>
<failOnError>true</failOnError>
</configuration>
diff --git a/src/test/resources/unit/missing-directory-test/plugin-pom.xml
b/src/test/resources/unit/missing-directory-test/plugin-pom.xml
index 15b3923..9abea71 100644
--- a/src/test/resources/unit/missing-directory-test/plugin-pom.xml
+++ b/src/test/resources/unit/missing-directory-test/plugin-pom.xml
@@ -23,7 +23,7 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
-
<directory>${basedir}/target/test-classes/unit/missing-clean-test/does-not-exist</directory>
+ <directory>${basedir}/does-not-exist</directory>
<verbose>true</verbose>
<failOnError>true</failOnError>
</configuration>
diff --git a/src/test/resources/unit/nested-clean-test/plugin-pom.xml
b/src/test/resources/unit/nested-clean-test/plugin-pom.xml
index 790d14d..9e94884 100644
--- a/src/test/resources/unit/nested-clean-test/plugin-pom.xml
+++ b/src/test/resources/unit/nested-clean-test/plugin-pom.xml
@@ -23,9 +23,9 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
-
<directory>${basedir}/target/test-classes/unit/nested-clean-test/target</directory>
-
<outputDirectory>${basedir}/target/test-classes/unit/nested-clean-test/target/classes</outputDirectory>
-
<testOutputDirectory>${basedir}/target/test-classes/unit/nested-clean-test/target/test-classes</testOutputDirectory>
+ <directory>${basedir}/target</directory>
+ <outputDirectory>${basedir}/target/classes</outputDirectory>
+
<testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory>
<verbose>true</verbose>
<failOnError>true</failOnError>
</configuration>
