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/01/27 03:49:13 UTC
[1/2] maven git commit: [MNG-5940] Change the maven-source-plugin jar
goal into jar-no-fork in Maven Super POM
Repository: maven
Updated Branches:
refs/heads/master 3e722d913 -> 2fb5fd5e6
[MNG-5940] Change the maven-source-plugin jar goal into jar-no-fork in Maven Super POM
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b3ed29d5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b3ed29d5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b3ed29d5
Branch: refs/heads/master
Commit: b3ed29d541f45604eaf24219d119377476e3bbfe
Parents: 3e722d9
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jan 27 02:56:28 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jan 27 02:56:28 2016 +0100
----------------------------------------------------------------------
.../src/main/resources/org/apache/maven/model/pom-4.0.0.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/b3ed29d5/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index d0f63d2..ae49e84 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -117,7 +117,7 @@ under the License.
<execution>
<id>attach-sources</id>
<goals>
- <goal>jar</goal>
+ <goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
[2/2] maven git commit: [MNG-5227] The 'optional' flag of a
dependency should be manageable.
Posted by sc...@apache.org.
[MNG-5227] The 'optional' flag of a dependency should be manageable.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2fb5fd5e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2fb5fd5e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2fb5fd5e
Branch: refs/heads/master
Commit: 2fb5fd5e6b7ebded597329d1e87e255fb368ba73
Parents: b3ed29d
Author: Christian Schulte <sc...@apache.org>
Authored: Wed Jan 27 03:46:11 2016 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Wed Jan 27 03:46:11 2016 +0100
----------------------------------------------------------------------
.../model/management/DefaultDependencyManagementInjector.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/2fb5fd5e/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 e611973..731cdd8 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,13 +82,6 @@ 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 )
{