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

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


 discard 2fd2863  [MNG-6672] Upgrade Maven Resolver to 1.4.0
    omit da05c25  Use properly quoted shell arguments with "$@"
    omit 8f1cac0  [MNG-6671] Upgrade Modello to 1.11
    omit 92b5191  Revert "Modello changes"
    omit 5035837  [MNG-6671] Upgrade Modello to 1.10.1
    omit 8aaeb8a  [MNG-6581] - Update to latest Modello plugin version
    omit aed5130  [MNG-6665] toolchain.xml file should support environment 
variables
    omit 01405a2  [MNG-6667] Enhance the error reporting when trying to build a 
modelVersion that the current Maven doesn't understand
    omit 275a971  Include Java 12 for testing
    omit 3495521  -DdeployAtEnd=true doesn't deploy anything
    omit a117168  oops fix branch name
    omit 8524e04  fix Jenkinsfile as it is script
    omit 660e745  Always deploy snapshot from master (#250)
     add 25ffca0  [MNG-6672] Upgrade Maven Resolver to 1.4.0

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   (2fd2863)
            \
             N -- N -- N   refs/heads/MNG-6672 (25ffca0)

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.

No new revisions were added by this update.

Summary of changes:
 Jenkinsfile                                        |  11 +-
 deploySite.sh                                      |   4 +-
 .../building/DefaultToolchainsBuilder.java         | 105 ++-------------
 .../toolchain/io/DefaultToolchainsWriter.java      |  54 --------
 .../maven/toolchain/io/ToolchainsWriter.java       |  48 -------
 .../project/DefaultMavenProjectBuilderTest.java    |  68 +---------
 .../building/DefaultToolchainsBuilderTest.java     | 150 ++++-----------------
 .../projects/future-model-version-pom.xml          |  25 ----
 .../projects/future-schema-model-version-pom.xml   |  24 ----
 .../resources/projects/past-model-version-pom.xml  |  26 ----
 .../StringSearchModelInterpolator.java             |   5 -
 .../model/validation/DefaultModelValidator.java    | 100 ++------------
 .../validation/DefaultModelValidatorTest.java      |   4 +-
 .../internal/DefaultVersionResolver.java           |  41 +++++-
 pom.xml                                            |   8 +-
 15 files changed, 96 insertions(+), 577 deletions(-)
 delete mode 100644 
maven-core/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
 delete mode 100644 
maven-core/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java
 delete mode 100644 
maven-core/src/test/resources/projects/future-model-version-pom.xml
 delete mode 100644 
maven-core/src/test/resources/projects/future-schema-model-version-pom.xml
 delete mode 100644 
maven-core/src/test/resources/projects/past-model-version-pom.xml

Reply via email to