This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7177
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 55b4df6 [MNG-7177] Upgrade Maven Shared Utils to 3.3.4
add 94612f9 [MNG-7060] Let build fail fast in case any maven-gpg-plugin
goal is called
add 6e82d87 [MNG-7064] Use HTTPS for schema location in global
settings.xml
add a2d29b2 [MNG-7065] Ugrade global settings.xml to 1.1.0
add 2201698 Apply consistent log argument quoting for sigle- and
multi-valued args
add a6d5e86 Use consistent static final loggers
add e1e2c65 Fix Javadoc errors
add a0c1bf3 Fix checkstyle error
add b877445 [MNG-6909] Convert to JSR330 in tests - maven-core
add 0e34b35 [MNG-6909] Convert to JSR330 in tests - maven-compat
add b7510d6 [MNG-6909] Convert to JSR330 - use sisu plugin
add 9166805 [MNG-6967] Improve the command line output from
maven-artifact. - Clearly separate version from tokens in command line output.
add eb43b9b Fix Checkstyle violation.
add 83dc690 [MNG-7071] Remove the profiles.xml warning, since the
functionality is ignored since Maven 3.
add bb916d0 [MNG-7035] Migrate unit tests to Unit 5
add ceb08cf Test for empty locations and avoid printing them
add 8df10f9 Test for empty value and avoid needless space
add 8defd16 [MNG-7051] Optionally skip non-existing profiles and break on
missing required profiles.
add 1e575a2 [MNG-7068] Active dependency management for Google Guice/Guava
add eae3074 [MNG-7029] Remove super POM release profile
add ab20190 Update ant from 1.10.8 to 1.10.9 in /maven-wrapper
add 48fc108 [MNG-7077] Use JUnit 5 extension
add f820b41 [MNG-7095] Fix resume for parallel builds
add 619973b [MNG-7063] Infinite loop using Shade plugin and JUnit 5
dependency
add 84a1ff2 [MNG-7063] Add unittest to ensure rereading a pom won't
return the cached Model
add 441cf73 improve documentation
add 9b5b8d4 extract AbstractMavenLifecycleParticipant dispatch methods
add a515fbe [MNG-7035] remove duplicate dependency (causing warning on
build)
add 8ceb6c6 [MNG-7063] Infinite loop using Shade plugin and JUnit 5
dependency
add d740200 [MNG-7107] relax profile id validation, different from
coordinate id
add b23116d [MNG-6114] Elements from the global settings should be
ordered before elements from the user settings
add a242c1a [MNG-6471] Parallel builder should use the module name as
thread name
add c3dba0e [MNG-6113] Rename the 'Central Repository' to 'Maven Central
Repository' in the 4.0.0 super POM
add 0e75baa improve and fix javadoc
add 9643ac6 [MNG-7051] When an optional profile could not be found, an
info message should be thrown instead of a warning.
add ad24f59 [MNG-7051] Return unmodifiable profile lists
add aa90370 [MNG-7110] Different behavior of extensions restore
configuration of importRequest
add 9e19b57 [MNG-7111] Deadlock when reading pom
add a5c68f7 Revert "[MNG-7046] Revert MNG-5639 and make repo config
static only"
add d5f77a3 [MNG-6399] - Lift JDK minimum to JDK 8
add d87a1f5 [MNG-7119] Upgrade Maven Wagon to 3.4.3
add 612dfdd [MNG-3220] fix doc: dependencyManagement import require scope
import
add acd61cc use Maven Resolver 1.6.2
add 3b21386 [MNG-7116] add support for mirrorOf external:http:*
add 28b4ea9 [MNG-7117] add support for blocked mirror
add 6712567 [MNG-7118] block HTTP repositories by default
add 1e19805 [MNG-6075] Increase the model validation level to the next
minor level version
add 3e65637 [MNG-6808] Provide Maven BOM
add a028346 [MNG-7102] The child modules of excluded projects are now
excluded as well, making the behavior consistent with MNG-6981.
add c3cf294 [MNG-6511] Optional project selection
add 1ab29f5 [MNG-7128] keep blocked attribute from mirrors in artifact
repositories
add c4cd93d [MNG-7102] Exclude all children of aggregators, even if the
aggregator was already removed from the reactor.
add 276c6a8 [MNG-7127] fix MavenCliTest.testStyleColors test in JDK 16
add 7c742c2 [MNG-7112] Do not select child modules when --non-recursive
is given.
add b6461a5 [MNG-6806] fix typo
add 4612956 [MNG-6806] use ${project.version} to avoid rewriting on
release
add 87cd496 [MNG-6656] add reference documentation on build/consumer
transformers
add 22954a0 [MNG-6656] rename maven-xml module to maven-model-transform
add aa6b88c Maven 3.8.1 released
add e25cf17 [MNG-6656] move to o.a.m.model.transform + .sax
add 1b6caed [MNG-6656] rename build+consumer filters to
buildToRaw+rawToConsumer
add 9decf53 [MNG-6806] configure site for BOM reference documentation
add 521c4c2 Run GitHub actions integration tests with Java 16 (#456)
add b79d708 [MNG-6806] improve documentation
add 86b96bf fix SCM url
add 2e51e10 update staging site to https://maven.apache.org/ref/4-LATEST
add c4df060 fix javadoc
add a88d3f0 [MNG-7136] update Maven 4 dependencies schema
add da34c1e [MNG-7136] crop image to fit content
add 53dead3 [MNG-7136] add forgotten maven-slf4j-wrapper
add 1524af8 [MNG-5937] init site for Maven Wrapper reference documentation
add 57b006f [MNG-7035] add menu
add 9c631ab Extend mvn -h for various features of Maven 4
add b08e4d2 [MNG-6917] add wrapper lifecycle to reference documentation
add d6e70e2 [MNG-6917] Update maven-wrapper-plugin to 3.0.2
add f4009a1 Run GitHub actions integration tests with Java 17-ea (#466)
add 1a65351 Revert "[MNG-6772] Prevent Super POM central entry from
overriding"
add 32cdc2e [MNG-7090] mvnDebug does not work on Java 11+ Submitted by:
Guillaume Dufour
add 9ba84aa [MNG-7149] Introduce MAVEN_DEBUG_ADDRESS in mvnDebug scripts
add 83e3664 [MNG-6294] Convert MavenPluginValidator into a JSR 330
component
add 195fb62 [MNG-7079] Upgrade to jansi 2.2.0 and mave-shared-utils 3.3.4
add 5d6c6e2 [MNG-6915] Format help according to the terminal width
add 59c5466 [MNG-7080] Add a --color option to simplify color support
add 3e91767 [MNG-7032] Evaluate --help and --version after configuring
the logging/color
add fc806a2 [MNG-7151] Upgrade Maven Resolver to 1.7.0
add 3fabb63 [MNG-6802] Fix bug in FileProfileActivator (#347)
add a202308 [MNG-6915] Adapt the logging width to the terminal width,
including sensible limits.
add 5c45b3f [MNG-7117] update link to settings xsd for version 1.2.0
add 12f3e7e Remove maven-test-support in favor of plexus-testing
add ab95197 Fix Checkstyle reported issues with maven-shared-resources 3
add 706826e Upgrade Checkstyle Plugin to 3.1.2/Checkstyle to 8.41.1
add 371faf7 [MNG-7165] Upgrade JAnsi to 2.3.3
add f5d19f4 Run Maven ITs with more JDKs
add 6b56fc8 [MNG-7175] Upgrade Maven Resolver to 1.7.1
add 6bed162 [MNG-7172] Remove expansion of Jansi native libraries
add 73e00ed [MNG-6843] Parallel build fails due to missing JAR artifacts
in compilePath
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 (55b4df6)
\
N -- N -- N refs/heads/MNG-7177 (73e00ed)
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:
.github/workflows/maven.yml | 2 +-
Jenkinsfile | 2 +-
README.md | 4 +-
apache-maven/README.txt | 12 +-
apache-maven/pom.xml | 16 -
apache-maven/src/assembly/maven/bin/mvnDebug | 9 +-
apache-maven/src/assembly/maven/bin/mvnDebug.cmd | 23 +-
apache-maven/src/assembly/maven/component.xml | 8 -
apache-maven/src/assembly/maven/conf/settings.xml | 11 +-
.../src/assembly/maven/lib/jansi-native/README.txt | 7 -
apache-maven/src/assembly/shared/mvnlauncher | 2 +-
apache-maven/src/assembly/shared/mvnlauncher.cmd | 2 +-
apache-maven/src/assembly/shared/mvnwDebug | 9 +-
apache-maven/src/assembly/shared/mvnwDebug.cmd | 23 +-
.../main/appended-resources/META-INF/LICENSE.vm | 2 +-
.../unrecognized-javax.annotation-api-1.3.2.txt | 759 +++++++++++++++++++++
.../apache/maven/settings/GlobalSettingsTest.java | 12 +-
doap_Maven.rdf | 9 +
.../artifact/repository/ArtifactRepository.java | 6 +
.../artifact/versioning/ComparableVersion.java | 3 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 8 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 23 +-
.../artifact/versioning/ComparableVersionIT.java | 12 +-
.../artifact/versioning/ComparableVersionTest.java | 41 +-
.../versioning/DefaultArtifactVersionTest.java | 62 +-
.../artifact/versioning/VersionRangeTest.java | 655 +++++++++---------
maven-bom/pom.xml | 149 ++++
.../cli.apt.vm => maven-bom/src/site/apt/index.apt | 9 +-
{maven-core => maven-bom}/src/site/site.xml | 23 +-
.../org/apache/maven/building/DefaultProblem.java | 8 +-
.../building/DefaultProblemCollectorTest.java | 7 +-
.../apache/maven/building/DefaultProblemTest.java | 8 +-
.../org/apache/maven/building/FileSourceTest.java | 22 +-
.../building/ProblemCollectorFactoryTest.java | 8 +-
.../apache/maven/building/StringSourceTest.java | 6 +-
.../org/apache/maven/building/UrlSourceTest.java | 22 +-
maven-compat/pom.xml | 5 +
.../repository/DefaultArtifactRepository.java | 12 +
.../maven/repository/DefaultMirrorSelector.java | 53 +-
.../repository/legacy/LegacyRepositorySystem.java | 5 +
.../AbstractArtifactComponentTestCase.java | 104 ++-
.../artifact/deployer/ArtifactDeployerTest.java | 17 +-
.../deployer/SimpleArtifactMetadataSource.java | 13 +-
.../factory/DefaultArtifactFactoryTest.java | 25 +-
.../artifact/installer/ArtifactInstallerTest.java | 15 +-
.../artifact/metadata/TestMetadataSource.java | 11 +-
.../repository/MavenArtifactRepositoryTest.java | 7 +-
.../resolver/ArtifactResolutionExceptionTest.java | 6 +-
.../artifact/resolver/ArtifactResolverTest.java | 59 +-
.../resolver/DefaultArtifactResolverTest.java | 33 +-
.../resolver/filter/AndArtifactFilterTest.java | 8 +-
.../resolver/filter/FilterHashEqualsTest.java | 6 +-
.../resolver/filter/OrArtifactFilterTest.java | 8 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 10 +-
.../maven/artifact/testutils/TestFileManager.java | 11 +-
.../transform/TransformationManagerTest.java | 34 +-
.../manager/DefaultProfileManagerTest.java | 37 +-
.../project/AbstractMavenProjectTestCase.java | 54 +-
.../maven/project/ClasspathArtifactResolver.java | 7 +-
.../org/apache/maven/project/ModelUtilsTest.java | 30 +-
.../apache/maven/project/ProjectClasspathTest.java | 66 +-
.../apache/maven/project/TestArtifactResolver.java | 16 +-
.../maven/project/TestMavenRepositorySystem.java | 14 +-
.../apache/maven/project/TestProjectBuilder.java | 7 +-
.../AbstractProjectInheritanceTestCase.java | 2 +
.../inheritance/t00/ProjectInheritanceTest.java | 4 +
.../inheritance/t01/ProjectInheritanceTest.java | 4 +
.../inheritance/t02/ProjectInheritanceTest.java | 45 +-
.../inheritance/t03/ProjectInheritanceTest.java | 4 +
.../inheritance/t04/ProjectInheritanceTest.java | 16 +-
.../inheritance/t05/ProjectInheritanceTest.java | 14 +-
.../inheritance/t06/ProjectInheritanceTest.java | 16 +-
.../inheritance/t07/ProjectInheritanceTest.java | 19 +-
.../inheritance/t08/ProjectInheritanceTest.java | 15 +-
.../inheritance/t09/ProjectInheritanceTest.java | 36 +-
.../inheritance/t10/ProjectInheritanceTest.java | 18 +-
.../inheritance/t11/ProjectInheritanceTest.java | 9 +-
.../inheritance/t12/ProjectInheritanceTest.java | 7 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 5 +
.../project/path/DefaultPathTranslatorTest.java | 7 +-
.../repository/DefaultMirrorSelectorTest.java | 11 +-
.../repository/LegacyRepositorySystemTest.java | 53 +-
.../maven/repository/MirrorProcessorTest.java | 42 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 26 +-
.../repository/legacy/DefaultWagonManagerTest.java | 188 ++---
.../legacy/LegacyRepositorySystemTest.java | 40 +-
.../maven/repository/legacy/PerLookupWagon.java | 6 +-
.../maven/repository/legacy/StringWagon.java | 8 +-
.../org/apache/maven/repository/legacy/WagonA.java | 9 +-
.../org/apache/maven/repository/legacy/WagonB.java | 9 +-
.../org/apache/maven/repository/legacy/WagonC.java | 9 +-
.../resolver/DefaultArtifactCollectorTest.java | 285 ++++----
.../conflict/AbstractConflictResolverTest.java | 56 +-
.../conflict/FarthestConflictResolverTest.java | 5 +
.../conflict/NearestConflictResolverTest.java | 5 +
.../conflict/NewestConflictResolverTest.java | 5 +
.../conflict/OldestConflictResolverTest.java | 5 +
.../DefaultClasspathTransformationTest.java | 51 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 29 +-
.../metadata/DefaultGraphConflictResolverTest.java | 97 ++-
.../repository/metadata/TestMetadataSource.java | 17 +-
maven-core/pom.xml | 29 +-
.../main/java/org/apache/maven/DefaultMaven.java | 191 ++++--
...xception.java => MissingProfilesException.java} | 11 +-
.../java/org/apache/maven/RepositoryUtils.java | 1 +
.../repository/LegacyLocalRepositoryManager.java | 9 +
.../repository/MavenArtifactRepository.java | 14 +
.../apache/maven/bridge/MavenRepositorySystem.java | 55 +-
.../maven/exception/DefaultExceptionHandler.java | 5 +-
.../apache/maven/execution/ActivationSettings.java | 60 +-
.../maven/execution/BuildResumptionAnalyzer.java | 2 +-
.../maven/execution/BuildResumptionData.java | 35 +-
.../execution/BuildResumptionDataRepository.java | 6 +-
.../execution/DefaultBuildResumptionAnalyzer.java | 130 +---
.../DefaultBuildResumptionDataRepository.java | 35 +-
.../execution/DefaultMavenExecutionRequest.java | 73 +-
.../maven/execution/MavenExecutionRequest.java | 58 ++
.../apache/maven/execution/ProfileActivation.java | 171 +++++
.../apache/maven/execution/ProjectActivation.java | 207 ++++++
.../apache/maven/graph/DefaultGraphBuilder.java | 104 ++-
.../aether/ConsumerModelSourceTransformer.java | 2 +-
.../DefaultRepositorySystemSessionFactory.java | 4 +-
.../lifecycle/internal/builder/BuilderCommon.java | 22 +-
.../multithreaded/MultiThreadedBuilder.java | 21 +-
.../plugin/internal/DefaultMavenPluginManager.java | 13 +-
.../DefaultMavenPluginValidator.java} | 46 +-
.../plugin/internal/MavenPluginValidator.java | 12 +-
.../maven/project/DefaultProjectBuilder.java | 73 +-
.../org/apache/maven/project/MavenProject.java | 67 +-
.../maven/project/ProjectBuildingException.java | 8 +-
.../apache/maven/project/ProjectModelResolver.java | 7 +-
.../apache/maven/project/ReactorModelCache.java | 160 -----
.../project/collector/DefaultProjectsSelector.java | 7 +-
.../collector/MultiModuleCollectionStrategy.java | 14 +-
.../collector/ProjectCollectionStrategy.java | 2 +-
.../DefaultConsumerPomXMLFilterFactory.java | 6 +-
.../main/resources/META-INF/plexus/components.xml | 2 +-
maven-core/src/site/apt/index.apt | 2 +-
maven-core/src/site/apt/lifecycles.apt.vm | 8 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 54 +-
.../java/org/apache/maven/DefaultMavenTest.java | 54 +-
.../maven/MavenLifecycleParticipantTest.java | 16 +-
.../src/test/java/org/apache/maven/MavenTest.java | 30 +-
.../maven/ProjectDependenciesResolverTest.java | 32 +-
.../artifact/handler/ArtifactHandlerTest.java | 31 +-
.../filter/ExclusionArtifactFilterTest.java | 8 +-
.../configuration/DefaultBeanConfiguratorTest.java | 21 +-
.../exception/DefaultExceptionHandlerTest.java | 4 +-
.../DefaultBuildResumptionAnalyzerTest.java | 25 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 35 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 26 +-
.../maven/execution/DefaultMavenExecutionTest.java | 8 +-
.../scope/internal/MojoExecutionScopeTest.java | 20 +-
.../maven/graph/DefaultGraphBuilderTest.java | 270 ++++++--
.../graph/DefaultProjectDependencyGraphTest.java | 17 +-
.../aether/ConsumerModelSourceTransformerTest.java | 2 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 52 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 50 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 98 ++-
.../maven/lifecycle/MavenExecutionPlanTest.java | 12 +-
.../internal/BuildListCalculatorTest.java | 13 +-
.../lifecycle/internal/BuilderCommonTest.java | 14 +-
.../internal/ConcurrencyDependencyGraphTest.java | 17 +-
.../internal/LifecycleDependencyResolverTest.java | 18 +-
.../LifecycleExecutionPlanCalculatorTest.java | 4 +
.../LifecycleTaskSegmentCalculatorImplTest.java | 13 +-
.../lifecycle/internal/PhaseRecorderTest.java | 9 +-
.../lifecycle/internal/ProjectBuildListTest.java | 6 +-
.../ConcurrencyDependencyGraphTest.java | 11 +-
.../multithreaded/ThreadOutputMuxerTest.java | 33 +-
.../stub/ProjectDependencyGraphStubTest.java | 24 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 8 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 38 +-
.../maven/plugin/PluginParameterExceptionTest.java | 8 +-
.../PluginParameterExpressionEvaluatorTest.java | 61 +-
.../plugin/internal/DefaultLegacySupportTest.java | 9 +-
.../plugin/internal/MavenPluginValidatorTest.java | 105 +++
.../project/AbstractMavenProjectTestCase.java | 50 +-
.../project/DefaultMavenProjectBuilderTest.java | 285 ++++----
.../project/ExtensionDescriptorBuilderTest.java | 29 +-
.../org/apache/maven/project/MavenProjectTest.java | 59 +-
.../apache/maven/project/PomConstructionTest.java | 272 +++++---
.../apache/maven/project/ProjectBuilderTest.java | 60 +-
.../maven/project/ProjectModelResolverTest.java | 125 ++--
.../apache/maven/project/ProjectSorterTest.java | 20 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 17 +-
.../artifact/DefaultProjectArtifactsCacheTest.java | 15 +-
.../project/artifact/MavenMetadataSourceTest.java | 67 +-
.../canonical/CanonicalProjectBuilderTest.java | 5 +
.../internal/DefaultRuntimeInformationTest.java | 72 +-
.../settings/PomConstructionWithSettingsTest.java | 47 +-
.../apache/maven/settings/SettingsUtilsTest.java | 10 +-
.../DefaultToolchainManagerPrivateTest.java | 8 +-
.../toolchain/DefaultToolchainManagerTest.java | 8 +-
.../maven/toolchain/DefaultToolchainTest.java | 12 +-
.../toolchain/RequirementMatcherFactoryTest.java | 14 +-
.../building/DefaultToolchainsBuilderTest.java | 10 +-
.../building/ToolchainsBuildingExceptionTest.java | 4 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 4 +-
.../test-pom-and-settings-interpolation/pom.xml | 4 +-
.../org/apache/maven/execution/resume.properties | 3 +-
...pom-resolves-from-property-based-repository.xml | 31 +
.../pom.xml => resources/projects/reread/pom1.xml} | 6 +-
.../pom.xml => resources/projects/reread/pom2.xml} | 7 +-
maven-embedder/pom.xml | 30 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 24 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 186 ++---
.../SettingsXmlConfigurationProcessor.java | 16 +-
.../maven/cli/event/ExecutionEventLogger.java | 49 +-
.../maven/cli/logging/BaseSlf4jConfiguration.java | 6 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 8 +-
maven-embedder/src/site/apt/index.apt.vm | 4 +
.../maven/cli/CLIManagerDocumentationTest.java | 9 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 10 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 6 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 4 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 193 +++---
.../maven/cli/event/ExecutionEventLoggerTest.java | 60 +-
.../maven/cli/transfer/FileSizeFormatTest.java | 17 +-
maven-model-builder/pom.xml | 16 +-
.../java/org/apache/maven/feature/Features.java | 10 +-
.../building/AbstractModelSourceTransformer.java | 6 +-
.../building/BuildModelSourceTransformer.java | 10 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 8 +-
.../maven/model/building/DefaultModelBuilder.java | 743 ++++++++------------
.../model/building/DefaultModelBuilderFactory.java | 10 +-
.../building/DefaultModelBuildingRequest.java | 1 +
.../maven/model/building/DefaultModelProblem.java | 7 +-
.../model/building/DefaultTransformerContext.java | 68 +-
.../maven/model/building/FileToRawModelMerger.java | 190 ++++++
.../model/building/ModelBuildingException.java | 8 +-
.../maven/model/building/ModelBuildingRequest.java | 2 +-
.../apache/maven/model/building/ModelCache.java | 56 ++
.../apache/maven/model/building/ModelProblem.java | 3 +-
.../ProfileActivationFilePathInterpolator.java | 103 +++
.../profile/activation/FileProfileActivator.java | 66 +-
.../model/validation/DefaultModelValidator.java | 116 +++-
.../resources/org/apache/maven/model/pom-4.0.0.xml | 54 +-
maven-model-builder/src/site/apt/index.apt | 2 +-
.../model/building/ComplexActivationTest.java | 10 +-
.../building/DefaultModelBuilderFactoryTest.java | 41 +-
.../model/building/DefaultModelBuilderTest.java | 6 +-
.../maven/model/building/FileModelSourceTest.java | 12 +-
.../model/building/FileToRawModelMergerTest.java | 9 +-
.../model/building/SimpleProblemCollector.java | 1 -
.../DefaultInheritanceAssemblerTest.java | 73 +-
.../AbstractModelInterpolatorTest.java | 42 +-
.../interpolation/MavenBuildTimestampTest.java | 8 +-
.../StringSearchModelInterpolatorTest.java | 37 +-
.../StringVisitorModelInterpolatorTest.java | 9 +-
.../maven/model/merge/MavenModelMergerTest.java | 8 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 6 +-
.../activation/AbstractProfileActivatorTest.java | 24 +-
.../activation/FileProfileActivatorTest.java | 131 ++++
.../activation/JdkVersionProfileActivatorTest.java | 8 +
.../activation/PropertyProfileActivatorTest.java | 11 +
.../validation/DefaultModelValidatorTest.java | 183 +++--
...-ids-pom.xml => invalid-coordinate-ids-pom.xml} | 0
.../poms/validation/invalid-profile-ids.xml | 43 +-
{maven-xml => maven-model-transform}/pom.xml | 9 +-
.../model/transform}/AbstractEventXMLFilter.java | 9 +-
.../model/transform/BuildToRawPomXMLFilter.java | 13 +-
.../transform/BuildToRawPomXMLFilterFactory.java | 18 +-
.../transform/BuildToRawPomXMLFilterListener.java | 6 +-
.../model/transform}/CiFriendlyXMLFilter.java | 3 +-
.../maven/model/transform}/DependencyKey.java | 2 +-
.../maven/model/transform}/FastForwardFilter.java | 3 +-
.../maven/model/transform}/ModulesXMLFilter.java | 4 +-
.../maven/model/transform}/ParentXMLFilter.java | 4 +-
.../model/transform/RawToConsumerPomXMLFilter.java | 12 +-
.../RawToConsumerPomXMLFilterFactory.java | 15 +-
.../transform}/ReactorDependencyXMLFilter.java | 4 +-
.../model/transform}/RelativePathXMLFilter.java | 4 +-
.../maven/model/transform}/RelativeProject.java | 2 +-
.../model/transform/sax}/AbstractSAXFilter.java | 2 +-
.../model/transform/sax}/CommentRenormalizer.java | 2 +-
.../maven/model/transform/sax}/Factories.java | 7 +-
.../maven/model/transform}/sax/SAXEvent.java | 2 +-
.../model/transform}/sax/SAXEventFactory.java | 2 +-
.../maven/model/transform}/sax/SAXEventUtils.java | 2 +-
maven-model-transform/src/site/apt/index.apt | 73 ++
.../src/site/site.xml | 0
.../model/transform}/AbstractXMLFilterTests.java | 16 +-
.../model/transform}/CiFriendlyXMLFilterTest.java | 12 +-
.../model/transform}/ConsumerPomXMLFilterTest.java | 26 +-
.../model/transform}/ModulesXMLFilterTest.java | 28 +-
.../model/transform}/ParentXMLFilterTest.java | 39 +-
.../transform}/ReactorDependencyXMLFilterTest.java | 24 +-
.../transform}/RelativePathXMLFilterTest.java | 17 +-
.../model/transform}/sax/ChainedFilterTest.java | 6 +-
.../transform/sax}/CommentRenormalizerTest.java | 40 +-
.../model/transform}/sax/SAXEventUtilsTest.java | 8 +-
.../org/apache/maven/model/ActivationFileTest.java | 11 +-
.../org/apache/maven/model/ActivationOSTest.java | 11 +-
.../apache/maven/model/ActivationPropertyTest.java | 11 +-
.../org/apache/maven/model/ActivationTest.java | 11 +-
.../java/org/apache/maven/model/BuildTest.java | 11 +-
.../org/apache/maven/model/CiManagementTest.java | 11 +-
.../org/apache/maven/model/ContributorTest.java | 11 +-
.../maven/model/DependencyManagementTest.java | 11 +-
.../org/apache/maven/model/DependencyTest.java | 11 +-
.../maven/model/DeploymentRepositoryTest.java | 11 +-
.../java/org/apache/maven/model/DeveloperTest.java | 11 +-
.../maven/model/DistributionManagementTest.java | 11 +-
.../java/org/apache/maven/model/ExclusionTest.java | 11 +-
.../java/org/apache/maven/model/ExtensionTest.java | 11 +-
.../apache/maven/model/IssueManagementTest.java | 11 +-
.../java/org/apache/maven/model/LicenseTest.java | 11 +-
.../org/apache/maven/model/MailingListTest.java | 11 +-
.../java/org/apache/maven/model/ModelTest.java | 11 +-
.../java/org/apache/maven/model/NotifierTest.java | 11 +-
.../org/apache/maven/model/OrganizationTest.java | 11 +-
.../java/org/apache/maven/model/ParentTest.java | 11 +-
.../maven/model/PluginConfigurationTest.java | 11 +-
.../apache/maven/model/PluginContainerTest.java | 11 +-
.../apache/maven/model/PluginExecutionTest.java | 11 +-
.../apache/maven/model/PluginManagementTest.java | 11 +-
.../java/org/apache/maven/model/PluginTest.java | 11 +-
.../org/apache/maven/model/PrerequisitesTest.java | 11 +-
.../java/org/apache/maven/model/ProfileTest.java | 11 +-
.../org/apache/maven/model/RelocationTest.java | 11 +-
.../org/apache/maven/model/ReportPluginTest.java | 11 +-
.../java/org/apache/maven/model/ReportSetTest.java | 11 +-
.../java/org/apache/maven/model/ReportingTest.java | 11 +-
.../apache/maven/model/RepositoryPolicyTest.java | 11 +-
.../org/apache/maven/model/RepositoryTest.java | 11 +-
.../java/org/apache/maven/model/ResourceTest.java | 11 +-
.../test/java/org/apache/maven/model/ScmTest.java | 11 +-
.../test/java/org/apache/maven/model/SiteTest.java | 11 +-
.../apache/maven/model/merge/ModelMergerTest.java | 5 +-
.../descriptor/PluginDescriptorBuilderTest.java | 6 +-
maven-resolver-provider/pom.xml | 19 +
.../repository/internal/DefaultModelCache.java | 153 ++++-
.../repository/internal/DefaultModelResolver.java | 6 +-
.../internal/DefaultVersionRangeResolver.java | 2 +-
.../internal/DefaultVersionResolver.java | 2 +-
.../repository/internal/MavenAetherModule.java | 80 ---
.../internal/MavenRepositorySystemUtils.java | 2 +
.../internal/AbstractRepositoryTestCase.java | 41 +-
.../DefaultArtifactDescriptorReaderTest.java | 17 +-
.../internal/DefaultModelResolverTest.java | 121 ++--
.../internal/DefaultVersionResolverTest.java | 30 +-
.../internal/MavenRepositorySystemUtilsTest.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 17 +-
.../repository/internal/RepositorySystemTest.java | 20 +-
.../settings/building/DefaultSettingsProblem.java | 7 +-
.../building/SettingsBuildingException.java | 8 +-
.../maven/settings/merge/MavenSettingsMerger.java | 5 +-
.../DefaultSettingsBuilderFactoryTest.java | 6 +-
.../validation/DefaultSettingsValidatorTest.java | 31 +-
maven-settings/pom.xml | 2 +-
maven-settings/src/main/mdo/settings.mdo | 13 +
maven-settings/src/site/apt/index.apt | 2 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 20 +-
maven-slf4j-wrapper/pom.xml | 5 +
.../maven/logwrapper/LogLevelRecorderTest.java | 10 +-
maven-wrapper/pom.xml | 3 +-
.../src/site/apt/index.apt | 8 +-
.../src/site/site.xml | 0
.../org/apache/maven/wrapper/DownloaderTest.java | 19 +-
.../org/apache/maven/wrapper/InstallerTest.java | 24 +-
.../apache/maven/wrapper/PathAssemblerTest.java | 15 +-
.../apache/maven/wrapper/WrapperExecutorTest.java | 115 ++--
pom.xml | 166 +++--
src/site/resources/images/maven-deps.png | Bin 104566 -> 160957 bytes
src/site/xdoc/index.xml | 73 +-
src/site/xdoc/maven-deps.odg | Bin 19887 -> 22491 bytes
367 files changed, 7651 insertions(+), 4999 deletions(-)
delete mode 100644 apache-maven/src/assembly/maven/lib/jansi-native/README.txt
create mode 100644
apache-maven/src/main/appended-resources/licenses/unrecognized-javax.annotation-api-1.3.2.txt
create mode 100644 maven-bom/pom.xml
copy maven-embedder/src/site/apt/cli.apt.vm =>
maven-bom/src/site/apt/index.apt (79%)
copy {maven-core => maven-bom}/src/site/site.xml (73%)
copy
maven-core/src/main/java/org/apache/maven/{lifecycle/internal/builder/BuilderNotFoundException.java
=> MissingProfilesException.java} (75%)
copy
maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Requirement.java
=> maven-core/src/main/java/org/apache/maven/execution/ActivationSettings.java
(50%)
create mode 100644
maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
create mode 100644
maven-core/src/main/java/org/apache/maven/execution/ProjectActivation.java
rename
maven-core/src/main/java/org/apache/maven/plugin/{MavenPluginValidator.java =>
internal/DefaultMavenPluginValidator.java} (64%)
copy
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
=>
maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginValidator.java
(75%)
delete mode 100644
maven-core/src/main/java/org/apache/maven/project/ReactorModelCache.java
create mode 100644
maven-core/src/test/java/org/apache/maven/plugin/internal/MavenPluginValidatorTest.java
create mode 100644
maven-core/src/test/resources/projects/import-scope-pom-resolves-from-property-based-repository.xml
copy
maven-core/src/test/{resources-project-builder/system-property-interpolation/pom.xml
=> resources/projects/reread/pom1.xml} (91%)
copy
maven-core/src/test/{resources-project-builder/system-property-interpolation/pom.xml
=> resources/projects/reread/pom2.xml} (91%)
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/building/FileToRawModelMerger.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.java
create mode 100644
maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/FileProfileActivatorTest.java
rename
maven-model-builder/src/test/resources/poms/validation/{invalid-ids-pom.xml =>
invalid-coordinate-ids-pom.xml} (100%)
copy maven-core/src/test/resources-project-builder/multiple-repos/pom.xml =>
maven-model-builder/src/test/resources/poms/validation/invalid-profile-ids.xml
(60%)
rename {maven-xml => maven-model-transform}/pom.xml (85%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/AbstractEventXMLFilter.java
(97%)
rename
maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java
=>
maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilter.java
(81%)
rename
maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterFactory.java
=>
maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterFactory.java
(88%)
rename
maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilterListener.java
=>
maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterListener.java
(86%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/CiFriendlyXMLFilter.java
(97%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/DependencyKey.java
(97%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/FastForwardFilter.java
(97%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/ModulesXMLFilter.java
(96%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/ParentXMLFilter.java
(98%)
rename
maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java
=>
maven-model-transform/src/main/java/org/apache/maven/model/transform/RawToConsumerPomXMLFilter.java
(80%)
rename
maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilterFactory.java
=>
maven-model-transform/src/main/java/org/apache/maven/model/transform/RawToConsumerPomXMLFilterFactory.java
(74%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/ReactorDependencyXMLFilter.java
(98%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/RelativePathXMLFilter.java
(96%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/RelativeProject.java
(97%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/main/java/org/apache/maven/model/transform/sax}/AbstractSAXFilter.java
(98%)
rename {maven-xml/src/main/java/org/apache/maven/xml/sax/ext =>
maven-model-transform/src/main/java/org/apache/maven/model/transform/sax}/CommentRenormalizer.java
(98%)
rename {maven-xml/src/main/java/org/apache/maven/xml =>
maven-model-transform/src/main/java/org/apache/maven/model/transform/sax}/Factories.java
(93%)
rename {maven-xml/src/main/java/org/apache/maven/xml =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/sax/SAXEvent.java
(95%)
rename {maven-xml/src/main/java/org/apache/maven/xml =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/sax/SAXEventFactory.java
(98%)
rename {maven-xml/src/main/java/org/apache/maven/xml =>
maven-model-transform/src/main/java/org/apache/maven/model/transform}/sax/SAXEventUtils.java
(96%)
create mode 100644 maven-model-transform/src/site/apt/index.apt
copy {maven-slf4j-wrapper => maven-model-transform}/src/site/site.xml (100%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/AbstractXMLFilterTests.java
(94%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/CiFriendlyXMLFilterTest.java
(88%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/ConsumerPomXMLFilterTest.java
(93%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/ModulesXMLFilterTest.java
(86%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/ParentXMLFilterTest.java
(90%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/ReactorDependencyXMLFilterTest.java
(91%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/filter =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/RelativePathXMLFilterTest.java
(93%)
rename {maven-xml/src/test/java/org/apache/maven/xml =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/sax/ChainedFilterTest.java
(96%)
rename {maven-xml/src/test/java/org/apache/maven/xml/sax/ext =>
maven-model-transform/src/test/java/org/apache/maven/model/transform/sax}/CommentRenormalizerTest.java
(68%)
rename {maven-xml/src/test/java/org/apache/maven/xml =>
maven-model-transform/src/test/java/org/apache/maven/model/transform}/sax/SAXEventUtilsTest.java
(88%)
delete mode 100644
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenAetherModule.java
copy maven-embedder/src/site/apt/cli.apt.vm =>
maven-wrapper/src/site/apt/index.apt (84%)
copy {maven-slf4j-wrapper => maven-wrapper}/src/site/site.xml (100%)
