You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/07/02 15:50:53 UTC
[maven] branch master updated: Document hacks as such
This is an automated email from the ASF dual-hosted git repository.
michaelo 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 b551be7 Document hacks as such
b551be7 is described below
commit b551be7445d37e4ba99bf4b976f7c61d6ac52ed8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Jul 2 17:50:44 2021 +0200
Document hacks as such
---
.../main/java/org/apache/maven/project/artifact/MavenMetadataSource.java | 1 +
.../maven/repository/internal/DefaultArtifactDescriptorReader.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 00fbdc8..f0eefc2 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -182,6 +182,7 @@ public class MavenMetadataSource
Artifact relocatedArtifact = null;
+ // TODO hack: don't rebuild model if it was already loaded during reactor resolution
final WorkspaceReader workspace = legacySupport.getRepositorySession().getWorkspaceReader();
Model model = null;
if ( workspace instanceof MavenWorkspaceReader )
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
index d318395..eed6f60 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
@@ -257,6 +257,7 @@ public class DefaultArtifactDescriptorReader
Model model;
+ // TODO hack: don't rebuild model if it was already loaded during reactor resolution
final WorkspaceReader workspace = session.getWorkspaceReader();
if ( workspace instanceof MavenWorkspaceReader )
{