This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a change to branch MNG-6825 in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 7b83c78 WIP - Readded xml parts of plexus utils. - Implication need to rework modello. discard bb5349f WIP - Replaced StringUtils/FileUtils with maven-shared-utils counterpart. discard e03f8c8 WIP - Improved steps. discard 678ad41 WIP - Fixed test method names. discard 82d120f WIP - Improved Tests. discard 40bd586 WIP - Continued - Fixed Checkstyle issues. discard 380bb39 WIP - Removed commons-lang3. discard ef91cab WIP - Continued. discard 7609b62 WIP - Continued. discard ecfbf4c continued. discard 47731ab Added License Header. discard 470aec4 Second step. discard 7ec01c7 First step. add ce35eff [MNG-6853] - Don't box primitives where it's not needed add ff9bc4f [MNG-6852] Upgrade maven-source-plugin from 3.2.0 to 3.2.1 add ddb454a [MNG-6831] Replace Anonymous classes by lambdas add 1697e7a [MNG-6855] Simplify code add ace32fd [MNG-6855] Simplify code - computeIfAbsent() add e6c897e [MNG-6855] Simplify some code add 96e11e1 [MNG-6855] Remove redundant code add cdb2cd0 [MNG-6071] Normalize relative paths for working directory add 720e46d Revert "[MNG-5587] When the build fails emit any errors without the user having to specify -e or -X" add 45076f3 Improve license handling add 35658fd Run Integration Tests with Java 8, 11, 13 and 14 add 716cc1f [MNG-5669] same pom.xml is read multiple times add b0d2846 [MNG-6859] Build not reproducible when built from source release add d9bf929 [MNG-6562] added WARNING on default bindings plugins unlocked versions add 9ae008a use https://repository.a.o/ for Apache SNAPSHOT plugins add f2e9afd Refactor getLocalRepository() in tests by using the repositorySystem new 44933f8 First step. new 03d5f3a Second step. new 48574a3 Added License Header. new 92bd5f0 continued. new 58817ab WIP - Continued. new 1eac3af WIP - Continued. new 20faaa9 WIP - Removed commons-lang3. new 15bbc81 WIP - Continued - Fixed Checkstyle issues. new 106aa19 WIP - Improved Tests. new b514b62 WIP - Fixed test method names. new 8e5c326 WIP - Improved steps. new 453862f WIP - Replaced StringUtils/FileUtils with maven-shared-utils counterpart. new dab0a12 WIP - Readded xml parts of plexus utils. - Implication need to rework modello. new 4b104c6 Fixed. 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 (7b83c78) \ N -- N -- N refs/heads/MNG-6825 (4b104c6) 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 14 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 | 6 +- apache-maven/pom.xml | 8 +- .../main/appended-resources/META-INF/LICENSE.vm | 19 +- .../licenses/{ASL-2.0.txt => Apache-2.0.txt} | 0 apache-maven/src/main/assembly/component.xml | 1 + .../repository/ArtifactRepositoryPolicy.java | 4 +- .../artifact/versioning/ComparableVersion.java | 6 +- .../java/org/apache/maven/building/FileSource.java | 31 +++ .../org/apache/maven/building/StringSource.java | 33 ++- .../java/org/apache/maven/building/UrlSource.java | 32 ++- .../artifact/resolver/DefaultArtifactResolver.java | 12 +- .../maven/profiles/DefaultProfileManager.java | 19 +- .../java/org/apache/maven/project/ModelUtils.java | 8 +- .../DefaultModelInheritanceAssembler.java | 4 +- .../repository/legacy/LegacyRepositorySystem.java | 8 +- .../metadata/DefaultClasspathTransformation.java | 30 +-- .../maven/repository/metadata/MetadataGraph.java | 14 +- .../resolver/filter/AndArtifactFilterTest.java | 10 +- .../resolver/filter/OrArtifactFilterTest.java | 10 +- .../maven/artifact/testutils/TestFileManager.java | 10 +- .../maven/repository/legacy/StringWagon.java | 1 - .../resolver/DefaultArtifactCollectorTest.java | 20 +- maven-core/pom.xml | 37 +--- .../main/java/org/apache/maven/ReactorReader.java | 8 +- .../metadata/AbstractRepositoryMetadata.java | 3 +- .../apache/maven/bridge/MavenRepositorySystem.java | 8 +- .../maven/classrealm/DefaultClassRealmManager.java | 5 +- .../org/apache/maven/execution/ReactorManager.java | 19 +- .../scope/internal/MojoExecutionScope.java | 47 ++--- .../internal/DefaultLifecycleMappingDelegate.java | 8 +- .../lifecycle/internal/MojoDescriptorCreator.java | 2 +- .../multithreaded/MultiThreadedBuilder.java | 15 +- .../plugin/DefaultLifecycleBindingsInjector.java | 36 +++- .../PluginDependencyResolutionListener.java | 10 +- .../version/PluginVersionResolutionException.java | 12 +- .../org/apache/maven/project/ProjectSorter.java | 8 +- .../apache/maven/project/ReactorModelCache.java | 78 ++++++- .../maven/repository/ArtifactTransferEvent.java | 5 +- .../maven/session/scope/internal/SessionScope.java | 47 ++--- .../building/DefaultToolchainsBuilder.java | 17 +- .../configuration/DefaultBeanConfiguratorTest.java | 20 +- .../scope/internal/MojoExecutionScopeTest.java | 20 +- .../lifecycle/internal/BuilderCommonTest.java | 1 - .../internal/LifecycleDependencyResolverTest.java | 10 +- .../project/AbstractMavenProjectTestCase.java | 7 +- .../project/DefaultMavenProjectBuilderTest.java | 6 +- .../test/projects/project-builder/MNG-6723/pom.xml | 38 ++++ .../org/apache/maven/cli/CLIReportingUtils.java | 2 +- .../main/java/org/apache/maven/cli/MavenCli.java | 9 +- .../java/org/apache/maven/cli/ResolveFile.java | 3 +- .../maven/cli/event/ExecutionEventLogger.java | 1 + .../maven/model/building/ArtifactModelSource.java | 27 ++- .../maven/model/building/DefaultModelBuilder.java | 223 +++++++++++++++------ .../maven/model/building/FileModelSource.java | 9 +- .../model/building/ModelBuildingEventCatapult.java | 9 +- .../apache/maven/model/building/ModelCache.java | 29 +++ .../apache/maven/model/building/ModelCacheTag.java | 26 +++ .../StringSearchModelInterpolator.java | 32 ++- .../StringVisitorModelInterpolator.java | 32 ++- .../model/superpom/DefaultSuperPomProvider.java | 2 +- .../model/validation/DefaultModelValidator.java | 2 +- .../StringSearchModelInterpolatorTest.java | 20 +- .../internal/DefaultArtifactDescriptorReader.java | 7 +- .../repository/internal/DefaultModelResolver.java | 7 +- .../settings/building/DefaultSettingsBuilder.java | 17 +- .../java/org/slf4j/impl/MavenSimpleLogger.java | 10 +- pom.xml | 2 +- 67 files changed, 691 insertions(+), 531 deletions(-) rename apache-maven/src/main/appended-resources/licenses/{ASL-2.0.txt => Apache-2.0.txt} (100%) copy maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java => maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java (69%)