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 2016/06/12 14:50:53 UTC
[1/2] maven git commit: [MNG-5227] The 'optional' flag of a
dependency should be manageable.
Repository: maven
Updated Branches:
refs/heads/master 644ac9c40 -> 335531865
[MNG-5227] The 'optional' flag of a dependency should be manageable.
This reverts commit 2fb5fd5e6b7ebded597329d1e87e255fb368ba73.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0931a8fe
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0931a8fe
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0931a8fe
Branch: refs/heads/master
Commit: 0931a8fe0aa43a95a34d7dacb5050df6746c1b55
Parents: 644ac9c
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Jun 12 16:46:43 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Jun 12 16:46:43 2016 +0200
----------------------------------------------------------------------
.../model/management/DefaultDependencyManagementInjector.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0931a8fe/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
index 731cdd8..e611973 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
@@ -82,6 +82,13 @@ public class DefaultDependencyManagementInjector
}
@Override
+ protected void mergeDependency_Optional( Dependency target, Dependency source, boolean sourceDominant,
+ Map<Object, Object> context )
+ {
+ // optional flag is not managed
+ }
+
+ @Override
protected void mergeDependency_Exclusions( Dependency target, Dependency source, boolean sourceDominant,
Map<Object, Object> context )
{
[2/2] maven git commit: [MNG-5967] Dependency updates.
Posted by sc...@apache.org.
[MNG-5967] Dependency updates.
o Downgraded to latest Aether release @Eclipse giving up on bugfixes already pushed to central.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/33553186
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/33553186
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/33553186
Branch: refs/heads/master
Commit: 3355318652081478c22b6085422578ab8eac7708
Parents: 0931a8f
Author: Christian Schulte <sc...@apache.org>
Authored: Sun Jun 12 16:48:43 2016 +0200
Committer: Christian Schulte <sc...@apache.org>
Committed: Sun Jun 12 16:48:43 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/33553186/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a9af928..4a22e9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.8.3</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <aetherVersion>1.1.0</aetherVersion>
+ <aetherVersion>1.0.2.v20150114</aetherVersion>
<!-- Upgrade of SLF4J blocked by SLF4J-370 (MNG-6023). -->
<!-- https://issues.apache.org/jira/browse/MNG-6023 -->
<!-- http://jira.qos.ch/browse/SLF4J-370 -->