diff --git a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java index 73cb97e385..c9835deb6a 100644 --- a/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java +++ b/api/maven-api-core/src/main/java/org/apache/maven/api/Session.java @@ -101,20 +101,6 @@ public interface Session { @Nonnull Path getRootDirectory(); - /** - * @deprecated use {@link #getRootDirectory()} instead - */ - @Nonnull - @Deprecated - Path getMultiModuleProjectDirectory(); - - /** - * @deprecated use {@link #getTopDirectory()} instead - */ - @Deprecated - @Nonnull - Path getExecutionRootDirectory(); - @Nonnull List getProjects(); diff --git a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java index 011710778d..a79aab6286 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java +++ b/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSession.java @@ -140,18 +140,6 @@ public class DefaultSession extends AbstractSession { return mavenSession.getStartTime().toInstant(); } - @Nonnull - @Override - public Path getMultiModuleProjectDirectory() { - return mavenSession.getRequest().getMultiModuleProjectDirectory().toPath(); - } - - @Nonnull - @Override - public Path getExecutionRootDirectory() { - return getTopDirectory(); - } - @Override public Path getRootDirectory() { return mavenSession.getRequest().getRootDirectory(); diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java index 530ed724ff..0eaa801c20 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java @@ -54,7 +54,7 @@ import org.codehaus.plexus.component.configurator.expression.TypeAwareExpression * settings {@link Session#getSettings()} * settings.* * basedir - * {@link Session#getExecutionRootDirectory()} or + * {@link Session#getTopDirectory()} or * System.getProperty( "user.dir" ) if null * mojoExecution the actual {@link MojoExecution} * mojo (since Maven 3)same as mojoExecution @@ -112,7 +112,7 @@ public class PluginParameterExpressionEvaluatorV4 implements TypeAwareExpression } if (basedir == null) { - basedir = session.getExecutionRootDirectory(); + basedir = session.getTopDirectory(); } if (basedir == null) {