[MNG-8141] Model Builder report issues during build (#1569)

And ArtifactDescriptorReader should not "toss away" but report WARNings (as in case of ERROR or FATAL MB throws). Part 1: port ArtifactDescriptorReader to not lose WARNs Part 2: make model validator report Profile ID duplications even in MIN level (as model WARNs) --- https://issues.apache.org/jira/browse/MNG-8141
apache · Jun 10, 2024 · bea3e72 · bea3e72
1 parent 33010af
commit bea3e72
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/model/DefaultModelValidator.java
@@ -328,7 328,22 @@ public void validateFileModel(Model m, ModelBuilderRequest request, ModelProblem
  }
  }
 
- if (request.getValidationLevel() >= ModelBuilderRequest.VALIDATION_LEVEL_MAVEN_2_0) {
  if (request.getValidationLevel() == ModelBuilderRequest.VALIDATION_LEVEL_MINIMAL) {
  // profiles: they are essential for proper model building (may contribute profiles, dependencies...)
  HashSet<String> minProfileIds = new HashSet<>();
  for (org.apache.maven.api.model.Profile profile : m.getProfiles()) {
  if (!minProfileIds.add(profile.getId())) {
  addViolation(
  problems,
  Severity.WARNING,
  Version.BASE,
  "profiles.profile.id",
  null,
  "Duplicate activation for profile " profile.getId(),
  profile);
  }
  }
  } else if (request.getValidationLevel() >= ModelBuilderRequest.VALIDATION_LEVEL_MAVEN_2_0) {
  Set<String> modules = new HashSet<>();
  for (int i = 0, n = m.getModules().size(); i < n; i ) {
  String module = m.getModules().get(i);

diff --git a/...rc/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java b/...rc/main/java/org/apache/maven/internal/impl/resolver/DefaultArtifactDescriptorReader.java
@@ -20,6 20,7 @@
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -31,12 32,14 @@
 import org.apache.maven.api.services.ModelBuilder;
 import org.apache.maven.api.services.ModelBuilderException;
 import org.apache.maven.api.services.ModelBuilderRequest;
 import org.apache.maven.api.services.ModelBuilderResult;
 import org.apache.maven.api.services.ModelProblem;
 import org.apache.maven.api.services.ModelRepositoryHolder;
 import org.apache.maven.api.services.ModelResolver;
 import org.apache.maven.api.services.ModelResolverException;
 import org.apache.maven.api.services.ModelSource;
 import org.apache.maven.internal.impl.InternalSession;
 import org.apache.maven.internal.impl.model.ModelProblemUtils;
 import org.eclipse.aether.RepositoryEvent;
 import org.eclipse.aether.RepositoryEvent.EventType;
 import org.eclipse.aether.RepositoryException;
@@ -62,6 65,8 @@
 import org.eclipse.aether.resolution.VersionResolutionException;
 import org.eclipse.aether.resolution.VersionResult;
 import org.eclipse.aether.transfer.ArtifactNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Default artifact descriptor reader.
@@ -77,6 82,7 @@ public class DefaultArtifactDescriptorReader implements ArtifactDescriptorReader
  private final ModelBuilder modelBuilder;
  private final Map<String, MavenArtifactRelocationSource> artifactRelocationSources;
  private final ArtifactDescriptorReaderDelegate delegate;
  private final Logger logger = LoggerFactory.getLogger(getClass());
 
  @Inject
  public DefaultArtifactDescriptorReader(
@@ -216,7 222,24 @@ private Model loadPom(
  .modelCache(DefaultModelCache.newInstance(session, false))
  .build();
 
- model = modelBuilder.build(modelRequest).getEffectiveModel();
  ModelBuilderResult modelResult = modelBuilder.build(modelRequest);
  // ModelBuildingEx is thrown only on FATAL and ERROR severities, but we still can have WARNs
  // that may lead to unexpected build failure, log them
  if (!modelResult.getProblems().isEmpty()) {
  List<ModelProblem> problems = modelResult.getProblems();
  logger.warn(
  "{} {} encountered while building the effective model for {}",
  problems.size(),
  (problems.size() == 1) ? "problem was" : "problems were",
  request.getArtifact());
  if (logger.isDebugEnabled()) {
  for (ModelProblem problem : problems) {
  logger.warn(
  "{} @ {}", problem.getMessage(), ModelProblemUtils.formatLocation(problem, null));
  }
  }
  }
  model = modelResult.getEffectiveModel();
  } catch (ModelBuilderException e) {
  for (ModelProblem problem : e.getResult().getProblems()) {
  if (problem.getException() instanceof ModelResolverException) {