Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Make rootDirectory really mandatory" (#1800) 

This reverts commit 608a99fb08.

---

https://issues.apache.org/jira/browse/MNG-8302
This commit is contained in:
Guillaume Nodet 2024-10-16 16:22:26 +02:00 committed by GitHub
parent 9b9f720181
commit 1cff5947ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/maven-api-core/src/main/java/org/apache/maven/api/Session.java
View File

@ -158,6 +158,7 @@ public interface Session {
* Gets the root directory of the session, which is the root directory for the top directory project.
*
* @return the root directory, never {@code null}
* @throws IllegalStateException if the root directory could not be found
* @see #getTopDirectory()
* @see Project#getRootDirectory()
* @see Project#isRootProject()

25
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelBuilder.java
View File

@ -105,6 +105,7 @@ import org.apache.maven.api.services.model.PluginManagementInjector;
import org.apache.maven.api.services.model.ProfileActivationContext;
import org.apache.maven.api.services.model.ProfileInjector;
import org.apache.maven.api.services.model.ProfileSelector;
import org.apache.maven.api.services.model.RootLocator;
import org.apache.maven.api.services.xml.XmlReaderException;
import org.apache.maven.api.services.xml.XmlReaderRequest;
import org.apache.maven.api.spi.ModelParserException;
@ -631,7 +632,12 @@ public class DefaultModelBuilder implements ModelBuilder {
top = top.toAbsolutePath().normalize();
// Obtain the root directory, resolving it if necessary
Path rootDirectory = session.getRootDirectory();
Path rootDirectory;
try {
rootDirectory = session.getRootDirectory();
} catch (IllegalStateException e) {
rootDirectory = session.getService(RootLocator.class).findMandatoryRoot(top);
}
// Locate and normalize the root POM if it exists, fallback to top otherwise
Path root = modelProcessor.locateExistingPom(rootDirectory);
@ -1232,11 +1238,19 @@ public class DefaultModelBuilder implements ModelBuilder {
Model doReadFileModel() throws ModelBuilderException {
ModelSource modelSource = request.getSource();
Model model;
Path rootDirectory = request.getSession().getRootDirectory();
Path rootDirectory;
setSource(modelSource.getLocation());
logger.debug("Reading file model from " + modelSource.getLocation());
try {
boolean strict = request.getRequestType() == ModelBuilderRequest.RequestType.BUILD_POM;
try {
rootDirectory = request.getSession().getRootDirectory();
} catch (IllegalStateException ignore) {
rootDirectory = modelSource.getPath();
while (rootDirectory != null && !Files.isDirectory(rootDirectory)) {
rootDirectory = rootDirectory.getParent();
}
}
try (InputStream is = modelSource.openStream()) {
model = modelProcessor.read(XmlReaderRequest.builder()
.strict(strict)
@ -1647,7 +1661,12 @@ public class DefaultModelBuilder implements ModelBuilder {
return null;
}
Path rootDirectory = request.getSession().getRootDirectory();
Path rootDirectory;
try {
rootDirectory = request.getSession().getRootDirectory();
} catch (IllegalStateException e) {
rootDirectory = null;
}
if (request.getRequestType() == ModelBuilderRequest.RequestType.BUILD_POM && rootDirectory != null) {
Path sourcePath = importSource.getPath();
if (sourcePath != null && sourcePath.startsWith(rootDirectory)) {

6
maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/rootlocator/DefaultRootLocator.java
View File

@ -53,10 +53,10 @@ public class DefaultRootLocator implements RootLocator {
while (rootDirectory != null && !isRootDirectory(rootDirectory)) {
rootDirectory = rootDirectory.getParent();
}
Optional<Path> rdf = getMultiModuleProjectDirectory();
Optional<Path> rdf = getRootDirectoryFallback();
if (rootDirectory == null) {
rootDirectory = rdf.orElseThrow(() -> new IllegalStateException(getNoRootMessage()));
logger.warn(getNoRootMessage());
rootDirectory = rdf.orElseGet(() -> Paths.get("").toAbsolutePath());
} else {
if (rdf.isPresent() && !Objects.equals(rootDirectory, rdf.get())) {
logger.warn("Project root directory and multiModuleProjectDirectory are not aligned");
@ -75,7 +75,7 @@ public class DefaultRootLocator implements RootLocator {
return false;
}
protected Optional<Path> getMultiModuleProjectDirectory() {
protected Optional<Path> getRootDirectoryFallback() {
String mmpd = System.getProperty("maven.multiModuleProjectDirectory");
if (mmpd != null) {
return Optional.of(Paths.get(mmpd));

5
maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java
View File

@ -52,7 +52,6 @@ import org.apache.maven.api.services.PackagingRegistry;
import org.apache.maven.api.services.RepositoryFactory;
import org.apache.maven.api.services.SettingsBuilder;
import org.apache.maven.api.services.TypeRegistry;
import org.apache.maven.api.services.model.RootLocator;
import org.apache.maven.api.settings.Settings;
import org.apache.maven.api.spi.TypeProvider;
import org.apache.maven.di.Injector;
@ -156,12 +155,12 @@ public class ApiRunner {
@Override
public Path getTopDirectory() {
return Paths.get("");
return null;
}
@Override
public Path getRootDirectory() {
return getService(RootLocator.class).findMandatoryRoot(getTopDirectory());
throw new IllegalStateException();
}
@Override

3
maven-compat/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
View File

@ -90,7 +90,7 @@ public abstract class AbstractCoreMavenComponentTestCase {
}
protected MavenExecutionRequest createMavenExecutionRequest(File pom) throws Exception {
MavenExecutionRequest request = new DefaultMavenExecutionRequest(true)
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
.setPom(pom)
.setProjectPresent(true)
.setShowErrors(true)
@ -102,7 +102,6 @@ public abstract class AbstractCoreMavenComponentTestCase {
if (pom != null) {
request.setMultiModuleProjectDirectory(pom.getParentFile());
request.setRootDirectory(pom.getParentFile().toPath());
}
return request;

2
maven-compat/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
View File

@ -161,7 +161,7 @@ public abstract class AbstractMavenProjectTestCase {
session.setLocalRepositoryManager(new LegacyLocalRepositoryManager(localRepo));
request.setRepositorySession(session);
DefaultMavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest(true);
DefaultMavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest();
MavenSession msession =
new MavenSession(getContainer(), session, mavenExecutionRequest, new DefaultMavenExecutionResult());
DefaultSession iSession = new DefaultSession(

2
maven-compat/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
View File

@ -123,7 +123,7 @@ class LegacyRepositorySystemTest {
new LocalRepository(request.getLocalRepository().getBasedir());
session.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory().newInstance(session, localRepo));
LegacySupport legacySupport = container.lookup(LegacySupport.class);
DefaultMavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest(true);
DefaultMavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest();
MavenSession mavenSession =
new MavenSession(container, session, mavenExecutionRequest, new DefaultMavenExecutionResult());
legacySupport.setSession(mavenSession);

7
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.execution;
import java.io.File;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@ -173,12 +172,6 @@ public class DefaultMavenExecutionRequest implements MavenExecutionRequest {
public DefaultMavenExecutionRequest() {}
public DefaultMavenExecutionRequest(boolean withDefaultRoot) {
if (withDefaultRoot) {
setRootDirectory(Paths.get("").toAbsolutePath());
}
}
public static MavenExecutionRequest copy(MavenExecutionRequest original) {
DefaultMavenExecutionRequest copy = new DefaultMavenExecutionRequest();
copy.setLocalRepository(original.getLocalRepository());

4
maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
View File

@ -21,7 +21,6 @@ package org.apache.maven;
import javax.inject.Inject;
import java.io.File;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -91,8 +90,7 @@ public abstract class AbstractCoreMavenComponentTestCase {
protected MavenExecutionRequest createMavenExecutionRequest(File pom) throws Exception {
MavenExecutionRequest request = new DefaultMavenExecutionRequest()
.setRootDirectory(
pom != null ? pom.toPath().getParent() : Paths.get("").toAbsolutePath())
.setRootDirectory(pom != null ? pom.toPath().getParent() : null)
.setPom(pom)
.setProjectPresent(true)
.setShowErrors(true)

2
maven-core/src/test/java/org/apache/maven/MavenTestHelper.java
View File

@ -32,7 +32,7 @@ public class MavenTestHelper {
public static DefaultRepositorySystemSession createSession(
MavenRepositorySystem repositorySystem, PlexusContainer container) {
DefaultRepositorySystemSession repoSession = new DefaultRepositorySystemSession(h -> false);
DefaultMavenExecutionRequest request = new DefaultMavenExecutionRequest(true);
DefaultMavenExecutionRequest request = new DefaultMavenExecutionRequest();
MavenSession mavenSession = new MavenSession(repoSession, request, new DefaultMavenExecutionResult());
DefaultSession session =
new DefaultSession(mavenSession, null, null, repositorySystem, new DefaultLookup(container), null);

2
maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
View File

@ -119,7 +119,7 @@ class TestApi {
.get()
.withLocalRepositoryBaseDirectories(new File("target").toPath())
.build();
DefaultMavenExecutionRequest mer = new DefaultMavenExecutionRequest(true);
DefaultMavenExecutionRequest mer = new DefaultMavenExecutionRequest();
DefaultMavenExecutionResult meres = new DefaultMavenExecutionResult();
MavenSession ms = new MavenSession(rss, mer, meres);
DefaultSession session = new DefaultSession(

2
maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
View File

@ -164,7 +164,7 @@ public abstract class AbstractMavenProjectTestCase {
new DefaultSessionFactory(repoSystem, repositorySystem, new DefaultLookup(container), null);
MavenSession session = new MavenSession(
getContainer(), repoSession, new DefaultMavenExecutionRequest(true), new DefaultMavenExecutionResult());
getContainer(), repoSession, new DefaultMavenExecutionRequest(), new DefaultMavenExecutionResult());
session.setSession(defaultSessionFactory.newSession(session));
DefaultSession s = new DefaultSession(session, null, null, null, null, null);