This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MODELTESTS_IMPROVEMENT
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard f65235d Added author.
discard 93ba172 Using displayName in Interface.
discard 38742a4 Removed all DisplayName annotations from test classes and
replaced with DisplayName generator.
discard c99d003 Removing code redundancy Using assertj, JUnit Jupiter
add 3949228 [MNG-6847] Explicit type can be replaced by the diamond
operator
add 9989e6a [MNG-6837] Simplify detection of the MAVEN_HOME and make it
fully qualified on Windows
add 838c196 [MNG-5587] When the build fails emit any errors without the
user having to specify -e or -X
add da5d8b8 [MNG-6850] Prevent printing the EXEC_DIR when it's just a
disk letter
add a6f113a Bump junit from 4.12 to 4.13
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
add d204f02 [MNG-6874] - Upgrade Maven Parent to 34
add 9e92a93 [MNG-6872] - Found CVEs in your dependencies - plexus-utils
(tests)
add 5cdb833 [MNG-5669] Fix infinitive loop in case pom.xml is being
updated during the process (e.g. maven-shade-plugin writing reduced-pom with
excluded dependencies)
add c548ce5 Adjust JDKs in Jenkinsfile
add 9f070e7 [MNG-6866] extract methods, apply SLA, introduce mass mojo
adding
new 61eab8b Removing code redundancy Using assertj, JUnit Jupiter
new d24d740 Removed all DisplayName annotations from test classes and
replaced with DisplayName generator.
new d8e4606 Using displayName in Interface.
new a3b2135 Added author.
new dd91c74 WIP - Fixed code issue.
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 (f65235d)
\
N -- N -- N refs/heads/MODELTESTS_IMPROVEMENT (dd91c74)
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 5 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 +-
apache-maven/src/bin/mvn.cmd | 12 +-
.../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 +-
.../MultipleArtifactsNotFoundException.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 6 +-
.../maven/artifact/versioning/VersionRange.java | 4 +-
.../maven/building/DefaultProblemCollector.java | 2 +-
.../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 | 14 +-
.../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 +---
.../apache/maven/DuplicateProjectException.java | 2 +-
.../main/java/org/apache/maven/ReactorReader.java | 8 +-
.../metadata/AbstractRepositoryMetadata.java | 3 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 8 +-
.../maven/classrealm/DefaultClassRealmManager.java | 5 +-
.../DefaultMavenExecutionRequestPopulator.java | 2 +-
.../execution/DefaultMavenExecutionResult.java | 4 +-
.../org/apache/maven/execution/ReactorManager.java | 19 +-
.../scope/internal/MojoExecutionScope.java | 47 ++--
.../graph/FilteredProjectDependencyGraph.java | 2 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 4 +-
.../internal/DefaultLifecycleMappingDelegate.java | 8 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 11 +-
.../lifecycle/internal/DependencyContext.java | 4 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 3 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 2 +-
.../lifecycle/internal/ReactorBuildStatus.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 15 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 2 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 36 ++-
.../plugin/internal/DefaultMavenPluginManager.java | 10 +-
.../PluginDependencyResolutionListener.java | 10 +-
.../version/PluginVersionResolutionException.java | 12 +-
.../maven/project/DefaultProjectBuilder.java | 12 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../org/apache/maven/project/ProjectSorter.java | 8 +-
.../apache/maven/project/ReactorModelCache.java | 78 ++++++-
.../artifact/DefaultMavenMetadataCache.java | 8 +-
.../maven/repository/ArtifactTransferEvent.java | 5 +-
.../maven/session/scope/internal/SessionScope.java | 47 ++--
.../maven/toolchain/DefaultToolchainManager.java | 2 +-
.../building/DefaultToolchainsBuilder.java | 17 +-
.../building/DefaultToolchainsBuildingResult.java | 2 +-
.../configuration/DefaultBeanConfiguratorTest.java | 20 +-
.../scope/internal/MojoExecutionScopeTest.java | 20 +-
.../lifecycle/internal/BuilderCommonTest.java | 3 +-
.../internal/LifecycleDependencyResolverTest.java | 10 +-
.../internal/stub/CompletionServiceStub.java | 2 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 2 +-
.../project/AbstractMavenProjectTestCase.java | 7 +-
.../project/DefaultMavenProjectBuilderTest.java | 6 +-
.../test/projects/project-builder/MNG-6723/pom.xml | 38 ++++
.../resources-project-builder/micromailer/pom.xml | 2 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 8 +-
.../java/org/apache/maven/cli/ResolveFile.java | 3 +-
.../transfer/AbstractMavenTransferListener.java | 2 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 2 +-
.../maven/model/building/ArtifactModelSource.java | 27 ++-
.../maven/model/building/DefaultModelBuilder.java | 242 +++++++++++++++------
.../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 +-
.../StringSearchModelInterpolatorTest.java | 20 +-
.../org/apache/maven/model/ActivationFileTest.java | 5 +
.../org/apache/maven/model/ActivationOSTest.java | 5 +
.../apache/maven/model/ActivationPropertyTest.java | 5 +
.../org/apache/maven/model/ActivationTest.java | 5 +
.../java/org/apache/maven/model/BuildTest.java | 5 +
.../org/apache/maven/model/CiManagementTest.java | 5 +
.../org/apache/maven/model/ContributorTest.java | 5 +
.../maven/model/DependencyManagementTest.java | 5 +
.../org/apache/maven/model/DependencyTest.java | 5 +
.../maven/model/DeploymentRepositoryTest.java | 5 +
.../java/org/apache/maven/model/DeveloperTest.java | 5 +
.../maven/model/DistributionManagementTest.java | 5 +
.../java/org/apache/maven/model/ExclusionTest.java | 5 +
.../java/org/apache/maven/model/ExtensionTest.java | 5 +
.../apache/maven/model/IssueManagementTest.java | 5 +
.../java/org/apache/maven/model/LicenseTest.java | 5 +
.../org/apache/maven/model/MailingListTest.java | 5 +
.../java/org/apache/maven/model/ModelTest.java | 5 +
.../org/apache/maven/model/ModelTestInterface.java | 18 +-
.../java/org/apache/maven/model/NotifierTest.java | 5 +
.../org/apache/maven/model/OrganizationTest.java | 5 +
.../java/org/apache/maven/model/ParentTest.java | 5 +
.../maven/model/PluginConfigurationTest.java | 5 +
.../apache/maven/model/PluginContainerTest.java | 5 +
.../apache/maven/model/PluginExecutionTest.java | 5 +
.../apache/maven/model/PluginManagementTest.java | 5 +
.../java/org/apache/maven/model/PluginTest.java | 5 +
.../org/apache/maven/model/PrerequisitesTest.java | 5 +
.../java/org/apache/maven/model/ProfileTest.java | 5 +
.../org/apache/maven/model/RelocationTest.java | 5 +
.../org/apache/maven/model/ReportPluginTest.java | 5 +
.../java/org/apache/maven/model/ReportSetTest.java | 5 +
.../java/org/apache/maven/model/ReportingTest.java | 5 +
.../apache/maven/model/RepositoryPolicyTest.java | 5 +
.../org/apache/maven/model/RepositoryTest.java | 5 +
.../java/org/apache/maven/model/ResourceTest.java | 5 +
.../test/java/org/apache/maven/model/ScmTest.java | 5 +
.../test/java/org/apache/maven/model/SiteTest.java | 5 +
.../maven/plugin/descriptor/PluginDescriptor.java | 10 +
.../plugin/descriptor/PluginDescriptorBuilder.java | 128 +++++++----
.../internal/DefaultArtifactDescriptorReader.java | 7 +-
.../repository/internal/DefaultModelResolver.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 2 +-
.../settings/building/DefaultSettingsBuilder.java | 17 +-
.../building/DefaultSettingsBuildingResult.java | 2 +-
.../building/DefaultSettingsProblemCollector.java | 2 +-
.../crypto/DefaultSettingsDecryptionResult.java | 6 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 10 +-
pom.xml | 6 +-
134 files changed, 1044 insertions(+), 656 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%)
