You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2024/08/16 21:03:36 UTC
(maven) branch master updated: [MNG-8172] Fix site building (#1594)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 40e41153c2 [MNG-8172] Fix site building (#1594)
40e41153c2 is described below
commit 40e41153c258032aa2af2377e32194c263694fa6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Aug 16 23:03:30 2024 +0200
[MNG-8172] Fix site building (#1594)
---
.../impl/resolver/DefaultModelResolver.java | 33 +++++++++++++++++++++-
.../maven/project/DefaultProjectBuilder.java | 3 --
.../model/building/DefaultModelProcessor.java | 5 ----
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java
index a3e251294e..69883d8b25 100644
--- a/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java
+++ b/maven-api-impl/src/main/java/org/apache/maven/internal/impl/resolver/DefaultModelResolver.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.internal.impl.resolver;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
import java.util.Map;
@@ -33,6 +36,7 @@ import org.apache.maven.api.services.ArtifactResolverException;
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.api.services.Source;
import org.apache.maven.api.services.VersionRangeResolverException;
/**
@@ -74,7 +78,34 @@ public class DefaultModelResolver implements ModelResolver {
Map.Entry<org.apache.maven.api.Artifact, Path> resolved =
session.resolveArtifact(session.createArtifactCoordinate(groupId, artifactId, newVersion, "pom"));
- return ModelSource.fromPath(resolved.getValue(), groupId + ":" + artifactId + ":" + newVersion);
+ Path path = resolved.getValue();
+ String location = groupId + ":" + artifactId + ":" + newVersion;
+ return new ModelSource() {
+ @Override
+ public ModelSource resolve(ModelLocator modelLocator, String relative) {
+ return null;
+ }
+
+ @Override
+ public Path getPath() {
+ return null;
+ }
+
+ @Override
+ public InputStream openStream() throws IOException {
+ return Files.newInputStream(path);
+ }
+
+ @Override
+ public String getLocation() {
+ return location;
+ }
+
+ @Override
+ public Source resolve(String relative) {
+ return null;
+ }
+ };
} catch (VersionRangeResolverException | ArtifactResolverException e) {
throw new ModelResolverException(
e.getMessage() + " (remote repositories: "
diff --git a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index ddd26688bc..131c9a69d9 100644
--- a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -92,7 +92,6 @@ import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.internal.impl.InternalSession;
import org.apache.maven.internal.impl.resolver.DefaultModelCache;
import org.apache.maven.internal.impl.resolver.DefaultModelRepositoryHolder;
-import org.apache.maven.model.building.ArtifactModelSource;
import org.apache.maven.model.building.DefaultModelProblem;
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelSource2;
@@ -177,8 +176,6 @@ public class DefaultProjectBuilder implements ProjectBuilder {
static ModelSource toSource(org.apache.maven.model.building.ModelSource modelSource) {
if (modelSource instanceof FileModelSource fms) {
return ModelSource.fromPath(fms.getPath());
- } else if (modelSource instanceof ArtifactModelSource ams) {
- return ModelSource.fromPath(ams.getPath(), ams.toString());
} else {
return new ModelSource() {
@Override
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
index 32d9f2013e..f91d94112a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
@@ -37,7 +37,6 @@ import java.util.Optional;
import org.apache.maven.api.model.Model;
import org.apache.maven.api.spi.ModelParser;
import org.apache.maven.api.spi.ModelParserException;
-import org.apache.maven.building.Source;
import org.apache.maven.model.io.ModelParseException;
import org.apache.maven.model.io.ModelReader;
import org.apache.maven.model.locator.ModelLocator;
@@ -133,10 +132,6 @@ public class DefaultModelProcessor implements ModelProcessor {
protected org.apache.maven.api.model.Model read(
Path pomFile, InputStream input, Reader reader, Map<String, ?> options) throws IOException {
- Source source = (Source) options.get(ModelProcessor.SOURCE);
- if (pomFile == null && source instanceof org.apache.maven.building.FileSource) {
- pomFile = ((org.apache.maven.building.FileSource) source).getPath();
- }
if (pomFile != null) {
Path projectDirectory = pomFile.getParent();
List<ModelParserException> exceptions = new ArrayList<>();