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/04/12 12:31:37 UTC
[maven] branch MNG-4463 updated (c965cad -> 2b2791e)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-4463
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard c965cad [MNG-4463] Dependency management import should support version ranges.
add 95401cf [MNG-6605] Unable to suppress download/upload messages (in interactive mode)
add 0ba5753 [MNG-6618] adding org.slf4j.event in exported packages
add d66c9c0 [maven-release-plugin] prepare release maven-3.6.1
add 5222f03 [maven-release-plugin] prepare for next development iteration
add 55614d3 [MNG-6627] upgrade Plexus container to 2.0.0 for Reproducible Builds
new 2b2791e [MNG-4463] Dependency management import should support version ranges.
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 (c965cad)
\
N -- N -- N refs/heads/MNG-4463 (2b2791e)
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:
apache-maven/pom.xml | 2 +-
maven-artifact/pom.xml | 2 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 2 +-
maven-core/pom.xml | 2 +-
maven-core/src/main/resources/META-INF/maven/extension.xml | 1 +
maven-embedder/pom.xml | 2 +-
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java | 3 +++
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 +-
maven-model-builder/pom.xml | 2 +-
maven-model/pom.xml | 2 +-
maven-plugin-api/pom.xml | 2 +-
maven-repository-metadata/pom.xml | 2 +-
maven-resolver-provider/pom.xml | 2 +-
maven-settings-builder/pom.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-slf4j-provider/pom.xml | 2 +-
pom.xml | 6 +++---
18 files changed, 22 insertions(+), 18 deletions(-)
[maven] 01/01: [MNG-4463] Dependency management import should
support version ranges.
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-4463
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2b2791ef9e3f151ff6992b1c517e340b27894cb2
Author: Christian Schulte <sc...@apache.org>
AuthorDate: Sat Jan 30 19:17:34 2016 +0100
[MNG-4463] Dependency management import should support version ranges.
Closes #64 without merging. ITs are pending to be committed.
---
.../maven/model/building/DefaultModelBuilder.java | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 8714611..0c5885a 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1254,7 +1254,25 @@ public class DefaultModelBuilder
final ModelSource importSource;
try
{
- importSource = modelResolver.resolveModel( groupId, artifactId, version );
+ dependency = dependency.clone();
+ importSource = modelResolver.resolveModel( dependency );
+ final String resolvedId =
+ dependency.getGroupId() + ':' + dependency.getArtifactId() + ':' + dependency.getVersion();
+
+ if ( !imported.equals( resolvedId ) && importIds.contains( resolvedId ) )
+ {
+ // A version range has been resolved to a cycle.
+ String message = "The dependencies of type=pom and with scope=import form a cycle: ";
+ for ( String modelId : importIds )
+ {
+ message += modelId + " -> ";
+ }
+ message += resolvedId;
+ problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).
+ setMessage( message ) );
+
+ continue;
+ }
}
catch ( UnresolvableModelException e )
{