This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a change to branch MNG-6401
in repository https://gitbox.apache.org/repos/asf/maven.git.


 discard f20312a  [MNG-6401] Cannot interpolate property in proxy port of 
settings.xml
     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
     new 5884f05  [MNG-6401] Cannot interpolate property in proxy port of 
settings.xml

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   (f20312a)
            \
             N -- N -- N   refs/heads/MNG-6401 (5884f05)

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:
 Jenkinsfile                                        |  2 +-
 .../multithreaded/ConcurrencyDependencyGraph.java  |  9 +--
 .../multithreaded/MultiThreadedBuilder.java        | 10 +--
 .../java/org/apache/maven/plugin/CacheUtils.java   | 53 ++++++++-------
 .../maven/project/DefaultProjectBuilder.java       | 15 +++--
 .../org/apache/maven/project/ProjectSorter.java    |  2 +-
 .../internal/ConcurrencyDependencyGraphTest.java   |  2 +-
 .../apache/maven/project/ProjectBuilderTest.java   | 42 ++++++++++++
 .../projects/basic-resolveDependencies.xml         | 15 +++++
 .../maven/model/building/DefaultModelBuilder.java  |  3 +-
 .../maven/model/building/FileModelSource.java      | 23 +++++++
 .../model/validation/DefaultModelValidator.java    | 10 ++-
 .../maven/model/building/FileModelSourceTest.java  | 75 ++++++++++++++++++++++
 .../validation/DefaultModelValidatorTest.java      | 10 +++
 ...ier.xml => bad-dependency-management-scope.xml} | 38 ++++++++++-
 pom.xml                                            |  3 +
 16 files changed, 270 insertions(+), 42 deletions(-)
 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%)

Reply via email to