You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sc...@apache.org on 2015/12/12 20:31:57 UTC
maven git commit: [MNG-2199] Support version ranges in parent elements
Repository: maven
Updated Branches:
refs/heads/master 0ff45140a -> 8c863b01a
[MNG-2199] Support version ranges in parent elements
o Updated to write resolved parent version ranges into the effective model when not read locally using 'relativePath'.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8c863b01
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8c863b01
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8c863b01
Branch: refs/heads/master
Commit: 8c863b01af76d990b7650add5cb98efda4c83533
Parents: 0ff4514
Author: Christian Schulte <sc...@apache.org>
Authored: Sat Dec 12 20:28:56 2015 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Dec 12 20:28:56 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/model/building/DefaultModelBuilder.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8c863b01/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
----------------------------------------------------------------------
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 a6a8725..6e4d24f 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
@@ -983,7 +983,8 @@ public class DefaultModelBuilder
{
problems.setSource( childModel );
- Parent parent = childModel.getParent().clone();
+ // Note: The 'ModelResolver' will update the version property for any parent version ranges.
+ Parent parent = childModel.getParent();
String groupId = parent.getGroupId();
String artifactId = parent.getArtifactId();