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 2017/01/31 21:35:41 UTC
[16/18] maven git commit: [MNG-5935] Optional true getting lost in
managed dependencies when transitive
[MNG-5935] Optional true getting lost in managed dependencies when transitive
Updated to correctly map the optional flag of Maven model dependencies to
Aether dependencies. Prior to this change all managed dependencies implicitly
had the optional flag set to 'false' leading to Aether managing that flag to
'false' on all managed dependencies when transitive.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/828d7ae2
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/828d7ae2
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/828d7ae2
Branch: refs/heads/DEPMGMT-IT
Commit: 828d7ae25c81a1602b1dc9a49e1ffabc726d393f
Parents: 065a146
Author: Christian Schulte <sc...@apache.org>
Authored: Thu Feb 11 08:45:19 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Tue Jan 31 22:34:34 2017 +0100
----------------------------------------------------------------------
.../repository/internal/ArtifactDescriptorReaderDelegate.java | 6 +++++-
.../src/main/java/org/apache/maven/RepositoryUtils.java | 7 ++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/828d7ae2/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
----------------------------------------------------------------------
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
index 2395b36..184c327 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/ArtifactDescriptorReaderDelegate.java
@@ -124,7 +124,11 @@ public class ArtifactDescriptorReaderDelegate
exclusions.add( convert( exclusion ) );
}
- Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions );
+ Dependency result = new Dependency( artifact, dependency.getScope(),
+ dependency.getOptional() != null
+ ? dependency.isOptional()
+ : null,
+ exclusions );
return result;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/828d7ae2/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index 86eab4e..52442b7 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -316,7 +316,12 @@ public class RepositoryUtils
exclusions.add( toExclusion( exclusion ) );
}
- Dependency result = new Dependency( artifact, dependency.getScope(), dependency.isOptional(), exclusions );
+ Dependency result = new Dependency( artifact,
+ dependency.getScope(),
+ dependency.getOptional() != null
+ ? dependency.isOptional()
+ : null,
+ exclusions );
return result;
}