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

[MNG-8012] Warn if in-reactor BOM import happens (#1434) 

This should be in fact prevented IMHO. Also, model builder missed File uses are corrected.

---

https://issues.apache.org/jira/browse/MNG-8012
This commit is contained in:
Tamas Cservenak 2024-03-01 18:27:21 +01:00 committed by GitHub
parent 9780ca1baf
commit 5029cc238c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View File

@ -25,7 +25,17 @@ import javax.inject.Singleton;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.*;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Properties;
import java.util.concurrent.Callable;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@ -1032,14 +1042,27 @@ public class DefaultModelBuilder implements ModelBuilder {
}
}
@Deprecated
@Override
public Result<? extends Model> buildRawModel(File pomFile, int validationLevel, boolean locationTracking) {
return buildRawModel(pomFile.toPath(), validationLevel, locationTracking, null);
}
@Override
public Result<? extends Model> buildRawModel(Path pomFile, int validationLevel, boolean locationTracking) {
return buildRawModel(pomFile, validationLevel, locationTracking, null);
}
@Deprecated
@Override
public Result<? extends Model> buildRawModel(
File pomFile, int validationLevel, boolean locationTracking, TransformerContext context) {
return buildRawModel(pomFile.toPath(), validationLevel, locationTracking, context);
}
@Override
public Result<? extends Model> buildRawModel(
File pomFile, int validationLevel, boolean locationTracking, TransformerContext context) {
Path pomFile, int validationLevel, boolean locationTracking, TransformerContext context) {
final ModelBuildingRequest request = new DefaultModelBuildingRequest()
.setValidationLevel(validationLevel)
.setLocationTracking(locationTracking)
@ -1050,7 +1073,7 @@ public class DefaultModelBuilder implements ModelBuilder {
try {
if (transformer != null && context != null) {
transformer.transform(pomFile.toPath(), context, model);
transformer.transform(pomFile, context, model);
}
} catch (TransformerException e) {
problems.add(
@ -1830,6 +1853,15 @@ public class DefaultModelBuilder implements ModelBuilder {
return null;
}
if (importSource instanceof FileModelSource && request.getRootDirectory() != null) {
Path sourcePath = ((FileModelSource) importSource).getPath();
if (sourcePath.startsWith(request.getRootDirectory())) {
problems.add(new ModelProblemCollectorRequest(Severity.WARNING, ModelProblem.Version.BASE)
.setMessage("BOM imports from within reactor should be avoided")
.setLocation(dependency.getLocation("")));
}
}
final ModelBuildingResult importResult;
try {
ModelBuildingRequest importRequest = new DefaultModelBuildingRequest();

21
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuilder.java
View File

@ -19,6 +19,7 @@
package org.apache.maven.model.building;
import java.io.File;
import java.nio.file.Path;
import org.apache.maven.model.Model;
@ -52,11 +53,31 @@ public interface ModelBuilder {
/**
* Performs only the part of {@link ModelBuilder#build(ModelBuildingRequest)} that loads the raw model
*
* @deprecated Use {@link #buildRawModel(Path, int, boolean)} instead.
*/
@Deprecated
Result<? extends Model> buildRawModel(File pomFile, int validationLevel, boolean locationTracking);
/**
* Performs only the part of {@link ModelBuilder#build(ModelBuildingRequest)} that loads the raw model
*
* @since 4.0.0
*/
Result<? extends Model> buildRawModel(Path pomFile, int validationLevel, boolean locationTracking);
/**
* @deprecated Use {@link #buildRawModel(Path, int, boolean, TransformerContext)} instead.
*/
@Deprecated
Result<? extends Model> buildRawModel(
File pomFile, int validationLevel, boolean locationTracking, TransformerContext context);
/**
* @since 4.0.0
*/
Result<? extends Model> buildRawModel(
Path pomFile, int validationLevel, boolean locationTracking, TransformerContext context);
TransformerContextBuilder newTransformerContextBuilder();
}