This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch MNG-6169/MNG-6553 in repository https://gitbox.apache.org/repos/asf/maven.git.
discard f86a0cf [MNG-6553] Packaging 'war' binding plugin 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 add bb3ec5d [MNG-5995] Remove dependency to maven-compat (#185) add 7e3e545 [MNG-6573] Use Maven 3.6.0 for CI add 15c6471 [MNG-6558] ToolchainsBuildingResult event is not sent on EventSpy add b7249af Revert [MNG-6069] Migrate to non deprecated parts of Commons CLI add 8f9075d [MNG-6571] cache VersionRange instances, they are immutable add 6bd8bb9 [MNG-6571] forgot to put new instance in cache add 657fbb7 Revert "[MNG-6571] forgot to put new instance in cache" add 961746f [MNG-6571] separate caches for create from spec and version add 4decfcf [MNG-6591] Upgrade to Wagon 3.3.2 add c674bcf [MNG-6495] ModelResolver cannot be null add bd4a3a0 [MNG-6593] track input location for super-pom content add 9dd4732 Revert "[MNG-6548] Lifecycle plugin version upgrades" add 37676a2 [MNG-6599] use version from parent if necessary, like groupId add 4bec550 [MNG-6600] add inputlocation tracking for default lifecycle executions add 0b10fe7 [MNG-6597] add input location tracking for plugins configuration add 49c8f17 [MNG-6601] add input location tracking for m-site-p converted reports add f5a1374 [MNG-6572] use int or long instead of BigIntegers for little numbers in ComparableVersion add 0be2644 [MNG-6538] Upgrade maven-resolver to 1.3.3 add 5306cd0 [MNG-6506] [MNG-6543] Upgrade Plexus Classworlds to 2.6.0 add a7acfe7 [MNG-6611] Update animal-sniffer-maven-plugin to version 1.17 add 95401cf [MNG-6605] Unable to suppress download/upload messages (in interactive mode) add 0ba5753 [MNG-6618] adding org.slf4j.event in exported packages add d66c9c0 [maven-release-plugin] prepare release maven-3.6.1 add 5222f03 [maven-release-plugin] prepare for next development iteration add 55614d3 [MNG-6627] upgrade Plexus container to 2.0.0 for Reproducible Builds add 715d90b Update DOAP Information for new release. add 0940c7c [MNG-6405] Fix basedir in MavenProject.deepCopy (#225) add 61d888c [MNG-6646] Upgrade maven-assembly-plugin to 3.1.1 add 763f76c [MNG-6642] Revert "[MNG-5995] Remove dependency to maven-compat (#185)" add fdde73f Remove unused code that triggers Error Prone (#245) add 80c6fe3 [MNG-6643] - Version comparison CLI does not work anymore add baed5a2 [MNG-6629] - Make ID validation faster add ebac165 [MNG-6630] - Make ComparableVersion faster add 44ad1aa [MNG-6631] - Make DefaultArtifactVersion faster add d34e8fb [MNG-6631] documented the performance intent add 1e03388 [MNG-6632] - Remember artifact handlers after they've been used once add 869b615 [MNG-6636] merge reports location tracking add 5350ed8 [MNG-6644] don't fail if no input location tracking available add 4ff24e3 [MNG-6643] Integration test add 2760e3e (doc) - correct plural form of 'child' add 3ac9718 [MNG-6655] Add support for "release" qualifier add 1a18eb6 [MNG-6626] fix DefaultExceptionHandler NPE add 6583012 [MNG-6069] Avoid (some) deprecated commons-cli methods add ff8c5c8 MNG-6069: unittest with compact and spaced -D options new caa89e5 [MNG-6553] Packaging 'war' binding plugin upgrades 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 (f86a0cf) \ N -- N -- N refs/heads/MNG-6169/MNG-6553 (caa89e5) 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 | 8 +- apache-maven/README.txt | 2 +- apache-maven/pom.xml | 2 +- apache-maven/src/bin/mvn.cmd | 4 +- doap_Maven.rdf | 11 + maven-artifact/pom.xml | 14 +- .../org/apache/maven/artifact/ArtifactUtils.java | 2 +- .../artifact/versioning/ComparableVersion.java | 339 +++++++++++++++++-- .../versioning/DefaultArtifactVersion.java | 91 +++-- .../maven/artifact/versioning/VersionRange.java | 33 +- .../artifact/versioning/ComparableVersionIT.java | 93 ++++++ .../artifact/versioning/ComparableVersionTest.java | 94 ++++++ .../artifact/versioning/VersionRangeTest.java | 19 ++ maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 2 +- .../manager/DefaultArtifactHandlerManager.java | 10 +- .../apache/maven/bridge/MavenRepositorySystem.java | 100 +++++- .../maven/exception/DefaultExceptionHandler.java | 9 +- .../internal/DefaultLifecyclePluginAnalyzer.java | 22 +- .../plugin/DefaultLifecycleBindingsInjector.java | 14 +- .../maven/project/DefaultProjectBuilder.java | 367 ++++++++++++--------- .../org/apache/maven/project/MavenProject.java | 3 +- .../main/resources/META-INF/maven/extension.xml | 1 + .../main/resources/META-INF/plexus/components.xml | 6 +- .../resources/META-INF/plexus/default-bindings.xml | 4 +- .../maven/AbstractCoreMavenComponentTestCase.java | 53 --- .../exception/DefaultExceptionHandlerTest.java | 53 ++- .../org/apache/maven/plugin/PluginManagerTest.java | 22 -- .../org/apache/maven/project/MavenProjectTest.java | 11 + .../apache/maven/project/ProjectBuilderTest.java | 119 +++++++ .../resources/projects/artifactMissingVersion.xml | 34 ++ .../pom.xml => resources/projects/badPom.xml} | 10 +- maven-embedder/pom.xml | 2 +- .../main/java/org/apache/maven/cli/CLIManager.java | 79 ++--- .../main/java/org/apache/maven/cli/MavenCli.java | 8 +- .../java/org/apache/maven/cli/CLIManagerTest.java | 31 +- .../java/org/apache/maven/cli/MavenCliTest.java | 38 +++ maven-model-builder/pom.xml | 2 +- .../maven/model/building/ModelBuildingRequest.java | 4 +- .../maven/model/building/ModelProblemUtils.java | 4 + .../model/plugin/DefaultReportingConverter.java | 54 ++- .../model/superpom/DefaultSuperPomProvider.java | 11 +- .../model/validation/DefaultModelValidator.java | 53 ++- maven-model-builder/src/site/apt/index.apt | 4 +- maven-model/pom.xml | 3 +- .../org/apache/maven/model/merge/ModelMerger.java | 18 + maven-model/src/main/mdo/maven.mdo | 10 +- maven-plugin-api/pom.xml | 2 +- maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- maven-slf4j-provider/pom.xml | 2 +- pom.xml | 22 +- 56 files changed, 1463 insertions(+), 452 deletions(-) create mode 100644 maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java 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%) copy maven-compat/src/test/java/org/apache/maven/artifact/resolver/TestTransferListener.java => maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java (51%)