mthmulders commented on a change in pull request #373: URL: https://github.com/apache/maven/pull/373#discussion_r487231563
########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) Review comment: Should that be the SLF4J Logger + Factory? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: I found a `DefaultModelLocator` but its default implementation does exactly this: ```java return new File( projectDirectory, "pom.xml" ); ``` I found `PomFinder` but that's definitely doing something else. So maybe there's another class for this? Any hints for its name? ########## File path: maven-core/src/main/java/org/apache/maven/graph/MultiModuleCollectionStrategy.java ########## @@ -0,0 +1,181 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.model.Plugin; +import org.apache.maven.model.building.ModelProblem; +import org.apache.maven.plugin.PluginManagerException; +import org.apache.maven.plugin.PluginResolutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.project.ProjectBuildingResult; +import org.codehaus.plexus.logging.Logger; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.transfer.ArtifactNotFoundException; + +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Strategy for collecting Maven projects from the multi-module project root, even when executed in a submodule. + */ +@Named( "MultiModuleCollectionStrategy" ) +@Singleton +public class MultiModuleCollectionStrategy implements ProjectCollectionStrategy +{ + private final Logger logger; + private final ProjectCollector projectCollector; + + @Inject + public MultiModuleCollectionStrategy( Logger logger, ProjectCollector projectCollector ) + { + this.logger = logger; + this.projectCollector = projectCollector; + } + + @Override + public List<MavenProject> collectProjects( MavenExecutionRequest request ) throws ProjectBuildingException + { + File moduleProjectPomFile = getMultiModuleProjectPomFile( request ); + List<File> files = Collections.singletonList( moduleProjectPomFile.getAbsoluteFile() ); + try + { + List<MavenProject> projects = new ArrayList<>(); + projectCollector.collectProjects( projects, files, request ); + boolean isRequestedProjectCollected = isRequestedProjectCollected( request, projects ); + if ( isRequestedProjectCollected ) + { + return projects; + } + else + { + return Collections.emptyList(); + } + } + catch ( ProjectBuildingException e ) + { + boolean fallThrough = isModuleOutsideRequestScopeDependingOnPluginModule( request, e ); + + if ( fallThrough ) + { + return Collections.emptyList(); + } + + throw e; + } + } + + private File getMultiModuleProjectPomFile( MavenExecutionRequest request ) + { + if ( request.getPom().getParentFile().equals( request.getMultiModuleProjectDirectory() ) ) + { + return request.getPom(); + } + else + { + File multiModuleProjectPom = new File( request.getMultiModuleProjectDirectory(), "pom.xml" ); Review comment: Just to make sure I understand correctly: the `ModelLocator` interface is the one we need here? ########## File path: maven-core/src/main/java/org/apache/maven/graph/ProjectCollector.java ########## @@ -0,0 +1,37 @@ +package org.apache.maven.graph; + +/* + * 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. + */ + +import org.apache.maven.execution.MavenExecutionRequest; +import org.apache.maven.project.MavenProject; +import org.apache.maven.project.ProjectBuildingException; + +import java.io.File; +import java.util.List; + +/** + * Facade to collect projects for a given set of pom.xml files. + */ +public interface ProjectCollector +{ + String HINT = "projectCollector"; Review comment: It should, and it now is. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
