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/01/23 23:56:54 UTC
[maven] branch MNG-5227 updated (787cbb6 -> 6502f98)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-5227
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 787cbb6 [MNG-5227] The 'optional' flag of a dependency should be manageable
add 9f07b03 [MNG-6261] - using File apis to compare
add e4e33f7 [MNG-6261] Relative parent POM resolution failing in 3.5.0 with complex multimodule builds
add 732e7de [MNG-6529] ProjectBuilder.build(List<Project> ...) honor request.isResolveDependency
add c6bdafe [MNG-5965] Parallel build multiplies work if multiple goals are given
add 6c4c2e3 Change to keep only 5 artifacts on master and on branches only 1 artifact.
add c7ab987 [MNG-6544] Replace CacheUtils#{eq,hash} with Objects
add 71128cb spelling: vertices
add 9c94626 [MNG-6213] Validate scope in dependencyManagement
add 391a111 [MNG-6526] Upgrade to Wagon 3.3.1
add eab62f1 [MNG-6520] Update namespaces for maven-assembly to 2.0.0
add 33e4f20 [MNG-6548] Lifecycle plugin version upgrades
add d9facde [MNG-6530] Introduce system property to disable global model cache
add a939654 [MNG-6256] Surround parameter of echo command with double quotes
add 8e5ecf0 fixed link (that goes to implementation in maven-core)
add 375cd7b [MNG-6559] Fix mailing list URL (#230)
add fdf5d92 renamed variables for better understanding
add 396291b [MNG-6069] Migrate to non deprecated parts of Commons CLI (#153)
add 2928dc6 refactoring: extracted initParent() method
add 049b7a7 refactoring: reduced try/catch scope
add ae1c32a [MNG-6533] Test: ProjectBuildingException miss reference to MavenProject
add 8b7055f [MNG-6533] Prefer passing the interim project in ProjectBuildingResult
add 27332cf [MNG-6533] ProjectBuilder report ModelProblem instead of Exception
add 24c762d [MNG-6533] catch InvalidArtifactRTException runtime exception
new 6502f98 [MNG-5227] The 'optional' flag of a dependency should be manageable
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 (787cbb6)
\
N -- N -- N refs/heads/MNG-5227 (6502f98)
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:
CONTRIBUTING.md | 4 +-
Jenkinsfile | 2 +-
apache-maven/README.txt | 2 +-
apache-maven/src/bin/mvn.cmd | 4 +-
apache-maven/src/main/assembly/bin.xml | 4 +-
apache-maven/src/main/assembly/component.xml | 4 +-
apache-maven/src/main/assembly/dir.xml | 4 +-
apache-maven/src/main/assembly/src.xml | 4 +-
.../multithreaded/ConcurrencyDependencyGraph.java | 9 +-
.../multithreaded/MultiThreadedBuilder.java | 10 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 14 +-
.../java/org/apache/maven/plugin/CacheUtils.java | 53 +--
.../maven/project/DefaultProjectBuilder.java | 382 ++++++++++++---------
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../main/resources/META-INF/plexus/components.xml | 6 +-
.../internal/ConcurrencyDependencyGraphTest.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 161 +++++++++
.../resources/projects/artifactMissingVersion.xml | 34 ++
.../pom.xml => resources/projects/badPom.xml} | 10 +-
.../projects/basic-resolveDependencies.xml | 15 +
.../main/java/org/apache/maven/cli/CLIManager.java | 124 ++++---
.../main/java/org/apache/maven/cli/MavenCli.java | 50 +--
.../java/org/apache/maven/cli/MavenCliTest.java | 4 +-
.../maven/model/building/DefaultModelBuilder.java | 3 +-
.../maven/model/building/FileModelSource.java | 23 ++
.../model/validation/DefaultModelValidator.java | 10 +-
maven-model-builder/src/site/apt/index.apt | 4 +-
.../maven/model/building/FileModelSourceTest.java | 75 ++++
.../validation/DefaultModelValidatorTest.java | 10 +
...ier.xml => bad-dependency-management-scope.xml} | 38 +-
pom.xml | 15 +-
31 files changed, 760 insertions(+), 322 deletions(-)
create mode 100644 maven-core/src/test/resources/projects/artifactMissingVersion.xml
copy maven-core/src/test/{projects/default-maven/cyclic-reference/pom.xml => resources/projects/badPom.xml} (53%)
create mode 100644 maven-core/src/test/resources/projects/basic-resolveDependencies.xml
create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
copy maven-model-builder/src/test/resources/poms/validation/{bad-import-scope-classifier.xml => bad-dependency-management-scope.xml} (53%)
[maven] 01/01: [MNG-5227] The 'optional' flag of a dependency
should be manageable
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-5227
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 6502f98f5eda21862277c047fb675336a0f26b89
Author: Christian Schulte <sc...@apache.org>
AuthorDate: Wed Jan 27 03:46:11 2016 +0100
[MNG-5227] The 'optional' flag of a dependency should be manageable
Updated to add missing management of the optional flag to the ModelBuilder.
The Maven Resolver has been managing the optional flag for years. This just
adds the missing parts to the ModelBuilder to make optional flag management
consistent when building the effective model no matter if resolved or if
built.
---
.../model/management/DefaultDependencyManagementInjector.java | 7 -------
1 file changed, 7 deletions(-)
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 4547407..510c4cc 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
@@ -86,13 +86,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 )
{