You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2019/05/17 20:41:09 UTC
[maven] branch MNG-6638 updated (9a5569a -> 04acc2b)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-6638
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 9a5569a [MNG-6638] - Prevent reparsing POMs in MavenMetadataSource
add 0940c7c [MNG-6405] Fix basedir in MavenProject.deepCopy (#225)
add 61d888c [MNG-6646] Upgrade maven-assembly-plugin to 3.1.1
add 763f76c [MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)"
add fdde73f Remove unused code that triggers Error Prone (#245)
add 80c6fe3 [MNG-6643] - Version comparison CLI does not work anymore
add baed5a2 [MNG-6629] - Make ID validation faster
add ebac165 [MNG-6630] - Make ComparableVersion faster
add 44ad1aa [MNG-6631] - Make DefaultArtifactVersion faster
add d34e8fb [MNG-6631] documented the performance intent
add 1e03388 [MNG-6632] - Remember artifact handlers after they've been used once
add 869b615 [MNG-6636] merge reports location tracking
add 5350ed8 [MNG-6644] don't fail if no input location tracking available
add 4ff24e3 [MNG-6643] Integration test
add 2760e3e (doc) - correct plural form of 'child'
add 3ac9718 [MNG-6655] Add support for "release" qualifier
add 1a18eb6 [MNG-6626] fix DefaultExceptionHandler NPE
add 6583012 [MNG-6069] Avoid (some) deprecated commons-cli methods
add ff8c5c8 MNG-6069: unittest with compact and spaced -D options
new 04acc2b [MNG-6638] - Prevent reparsing POMs in MavenMetadataSource
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9a5569a)
\
N -- N -- N refs/heads/MNG-6638 (04acc2b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
maven-artifact/pom.xml | 12 ++
.../artifact/versioning/ComparableVersion.java | 122 +++++++++++++++++++--
.../versioning/DefaultArtifactVersion.java | 91 +++++++++------
.../artifact/versioning/ComparableVersionIT.java | 93 ++++++++++++++++
.../artifact/versioning/ComparableVersionTest.java | 12 +-
.../manager/DefaultArtifactHandlerManager.java | 10 +-
.../maven/exception/DefaultExceptionHandler.java | 9 +-
.../project/DefaultProjectBuildingHelper.java | 6 +-
.../org/apache/maven/project/MavenProject.java | 3 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 53 ---------
.../exception/DefaultExceptionHandlerTest.java | 53 ++++++++-
.../org/apache/maven/plugin/PluginManagerTest.java | 22 ----
.../org/apache/maven/project/MavenProjectTest.java | 11 ++
.../main/java/org/apache/maven/cli/CLIManager.java | 78 ++++++-------
.../java/org/apache/maven/cli/CLIManagerTest.java | 31 ++++--
.../model/plugin/DefaultReportingConverter.java | 2 +-
.../model/validation/DefaultModelValidator.java | 53 +++++++--
.../org/apache/maven/model/merge/ModelMerger.java | 18 +++
maven-model/src/main/mdo/maven.mdo | 10 +-
pom.xml | 6 +
20 files changed, 491 insertions(+), 204 deletions(-)
create mode 100644 maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java
copy maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java => maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java (51%)
[maven] 01/01: [MNG-6638] - Prevent reparsing POMs in
MavenMetadataSource
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-6638
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 04acc2b8226f120dddbf9a26f634e11bd65d472a
Author: Stefan Oehme <st...@gmail.com>
AuthorDate: Sun Apr 14 13:47:05 2019 +0200
[MNG-6638] - Prevent reparsing POMs in MavenMetadataSource
If a dependency on another project is found, don't parse its
POM again, but instead use the model we already have in memory.
This saves a large amount of time and memory for builds that have
lots of subprojects and dependencies between them.
The approach was directly copied from DefaultArtifactDescriptorReader,
which does the same optimization.
---
.../project/artifact/MavenMetadataSource.java | 22 +++++++++++++++++++---
.../internal/DefaultArtifactDescriptorReader.java | 1 -
2 files changed, 19 insertions(+), 4 deletions(-)
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 2dc9372..d89d516 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
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -56,6 +57,7 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.Model;
import org.apache.maven.model.Relocation;
import org.apache.maven.model.building.ModelBuildingException;
import org.apache.maven.model.building.ModelBuildingRequest;
@@ -69,6 +71,7 @@ import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.properties.internal.EnvironmentUtils;
import org.apache.maven.properties.internal.SystemProperties;
+import org.apache.maven.repository.internal.MavenWorkspaceReader;
import org.apache.maven.repository.legacy.metadata.DefaultMetadataResolutionRequest;
import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
import org.codehaus.plexus.PlexusContainer;
@@ -78,6 +81,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.codehaus.plexus.logging.Logger;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.RepositoryPolicy;
+import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.transfer.ArtifactNotFoundException;
/**
@@ -175,9 +179,21 @@ public class MavenMetadataSource
Artifact relocatedArtifact = null;
- //TODO Not even sure this is really required as the project will be cached in the builder, we'll see this
- // is currently the biggest hotspot
- if ( artifact instanceof ArtifactWithDependencies )
+ final WorkspaceReader workspace = legacySupport.getRepositorySession().getWorkspaceReader();
+ Model model = null;
+ if ( workspace instanceof MavenWorkspaceReader )
+ {
+ model = ( (MavenWorkspaceReader) workspace ).findModel( RepositoryUtils.toArtifact( artifact ) );
+ }
+
+ if ( model != null )
+ {
+ pomArtifact = artifact;
+ dependencies = model.getDependencies();
+ DependencyManagement dependencyManagement = model.getDependencyManagement();
+ managedDependencies = dependencyManagement == null ? null : dependencyManagement.getDependencies();
+ }
+ else if ( artifact instanceof ArtifactWithDependencies )
{
pomArtifact = artifact;
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 4f464ea..586c83e 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,7 +257,6 @@ public class DefaultArtifactDescriptorReader
Model model;
- // hack: don't rebuild model if it was already loaded during reactor resolution
final WorkspaceReader workspace = session.getWorkspaceReader();
if ( workspace instanceof MavenWorkspaceReader )
{