diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml
index 720b84b2..719af6ab 100644
--- a/enforcer-rules/pom.xml
+++ b/enforcer-rules/pom.xml
@@ -64,7 +64,7 @@
org.apache.maven.shared
- maven-common-artifact-filters
+ maven-shared-utils
org.codehaus.plexus
@@ -107,11 +107,6 @@
junit-jupiter-api
test
-
- junit
- junit
- test
-
org.mockito
mockito-core
@@ -127,10 +122,6 @@
-
- org.apache.maven.resolver
- maven-resolver-util
-
org.apache.maven
diff --git a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java
index 42ad5933..38511880 100644
--- a/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java
+++ b/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/MockProject.java
@@ -52,7 +52,6 @@
import org.apache.maven.model.Scm;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
@@ -348,7 +347,8 @@ public File getBasedir()
{
if ( baseDir == null )
{
- baseDir = new File( PlexusTestCase.getBasedir() );
+ final String path = System.getProperty( "basedir" );
+ baseDir = null != path ? new File( path ) : new File( "" );
}
return baseDir;
}
diff --git a/maven-enforcer-extension/pom.xml b/maven-enforcer-extension/pom.xml
index 5ba08aa9..7dcf1ba5 100644
--- a/maven-enforcer-extension/pom.xml
+++ b/maven-enforcer-extension/pom.xml
@@ -53,11 +53,6 @@
maven-core
provided
-
- org.apache.maven.plugin-tools
- maven-plugin-annotations
- provided
-
org.apache.maven.plugins
maven-enforcer-plugin
diff --git a/maven-enforcer-plugin/pom.xml b/maven-enforcer-plugin/pom.xml
index 5c61f31f..8818d620 100644
--- a/maven-enforcer-plugin/pom.xml
+++ b/maven-enforcer-plugin/pom.xml
@@ -39,10 +39,6 @@
The Loving Iron Fist of Maven
-
- org.apache.maven
- maven-artifact
-
org.apache.maven
maven-plugin-api
@@ -51,10 +47,6 @@
org.apache.maven
maven-core
-
- org.codehaus.plexus
- plexus-utils
-
org.apache.maven.enforcer
enforcer-api
@@ -68,21 +60,11 @@
enforcer-rules
test-jar
-
- org.apache.maven.plugin-testing
- maven-plugin-testing-harness
- test
-
org.apache.maven.plugin-tools
maven-plugin-annotations
provided
-
- org.mockito
- mockito-core
- test
-
org.mockito
mockito-junit-jupiter
@@ -93,11 +75,6 @@
junit-jupiter-api
test
-
- junit
- junit
- test
-
diff --git a/pom.xml b/pom.xml
index defc8f32..521bcfb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,7 @@
3.1.1
enforcer-archives/enforcer-LATEST
8
+ 4.0.0
2021-07-26T21:04:56Z
@@ -127,23 +128,16 @@
5.8.1
test
-
-
- junit
- junit
- 4.13.2
- test
-
org.mockito
mockito-core
- 4.0.0
+ ${mockito.version}
test
org.mockito
mockito-junit-jupiter
- 4.0.0
+ ${mockito.version}
test
@@ -179,9 +173,9 @@
3.1.0
- org.apache.maven.resolver
- maven-resolver-util
- 1.6.1
+ org.apache.maven.shared
+ maven-shared-utils
+ 3.3.4
org.assertj
@@ -220,6 +214,11 @@
maven-jxr-plugin
3.1.1
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 3.0.0-M5
+