From c30c14d0967e427048db645c72e9773ed6e71730 Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Mon, 28 Jun 2021 21:54:26 +0200 Subject: [PATCH] [MSHADE-326] Remove bad workspace cache which caused problems in maven-shade-plugin. --- .../internal/DefaultArtifactDescriptorReader.java | 12 ------------ 1 file changed, 12 deletions(-) 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 eed6f6071efa..b4bfe81819b0 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 @@ -52,7 +52,6 @@ import org.eclipse.aether.impl.RepositoryEventDispatcher; import org.eclipse.aether.impl.VersionRangeResolver; import org.eclipse.aether.impl.VersionResolver; -import org.eclipse.aether.repository.WorkspaceReader; import org.eclipse.aether.repository.WorkspaceRepository; import org.eclipse.aether.resolution.ArtifactDescriptorException; import org.eclipse.aether.resolution.ArtifactDescriptorPolicy; @@ -257,17 +256,6 @@ private Model loadPom( RepositorySystemSession session, ArtifactDescriptorReques 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 ) - { - model = ( (MavenWorkspaceReader) workspace ).findModel( pomArtifact ); - if ( model != null ) - { - return model; - } - } - try { ModelBuildingRequest modelRequest = new DefaultModelBuildingRequest();