This is an automated email from the ASF dual-hosted git repository.
elharo pushed a change to branch io
in repository https://gitbox.apache.org/repos/asf/maven.git
from b5fcceaafa Merge branch 'master' into io
add bec19ec41d replace deprecated methods that don't properly handle
encoding (#1033)
add 1ffd68b802 [MNG-7720] Wrong build order of forked projects (#1040)
add ea21d6f6fc [MNG-7666] update documentation
add 909c2cdf57 [MNG-7553] put documentation in reference site
add 1922e01831 [MNG-7710] Upgrade plexus-utils to 3.5.1 (#1042)
add 10128b4484 Remove references to Xpp3DomBuilder and use XmlNodeBuilder
instead (#1045)
add bb02d120a1 Fix callee closing streams and readers instead of callers
(#1043)
add 93a0ecfd2d Additional XmlNode tests from plexus-utils (#994)
add dc8ec4c973 Fix mutable api in PluginContainer (#1019)
add 116ca6a3ad [MNG-7709] Regression in configuration merge (#1023)
add 57d5587cf8 [MNG-7727] Remove MavenProfilesBuilder and
DefaultMavenProfilesBuilder (#1044)
add 2d85d13ee8 MNG-7724 don't warn about unsupported SLF4J configs; no one
cares (#1051)
add 31cc44f1cf [MNG-7723] Upgrade to Maven Resolver 1.9.7 (#1046)
add 993d863743 remove unused class (#1049)
add 696cf37dc7 update a few URLs (#1052)
add 9d851eea68 [MNG-7678] Settings (v3) and Settings.Builder() cannot
unset a non-null field (#983)
add e9e0a51738 [MNG-7725] Update surefire to 3.0.0 in default binding
add 814af33e67 Update DOAP with Maven 3.8.8 release
add ade97d5a69 [MNG-7697] Fix assembly which should not include
plexus-utils-3.5.0 (#1057)
add 26d10a4bf9 [maven-release-plugin] prepare release maven-4.0.0-alpha-5
add 8052c720e7 [maven-release-plugin] prepare for next development
iteration
add f071094f34 Update DOAP with Maven 3.9.1 release
add 703f814e34 [MNG-6825] Replace FileUtils with Commons IO (#1067)
add cadeab53f6 MNG-7738 don't dump raw stack traces to System.err (#1064)
add 2788849c37 Switch version to 4.0.0 for @since tags (#1068)
add ae933fe68d [MNG-7720] Simplify code (#1063)
add 54afd174ef remove unused branches in fake (#1069)
add 38ba581634 correct comment (#1074)
add b2b04d2e92 [MNG-7749] Upgrade animal-sniffer from 1.21 to 1.23
add 8421a36592 [MNG-6825] Replace StringUtils (#1078)
add 26056b9b20 [MNG-7756] The degree of concurrency does not support "2."
as a factor
add b2ee29e03e [MNG-6825] Get rid of commons-lang
add 53b6473237 [MNG-7754] Improvement and extension of plugin validation
(#1079)
add 328ea1be31 [MNG-7750] Ensure no unwanted interpolation in plugins from
profiles. (#1076)
add 432bd7af3a [MNG-7741] Track missing files, plugin and parent pom
dependencies (#1058)
add b7a3d85713 Simplify logger creation leveraging Map.computeIfAbsent
add d7d8544669 [MNG-7765] - Minimum Build Requirement is wrong
add c49c4e0b18 [MNG-7451] - Remove public modifier from test methods /
test classes
add 5c750eacb4 [MNG-7766] - Migrate to use mockito-bom 4.11.0
add 0a67219271 [MNG-7753] Upgrade resolver to 1.9.8 (was 1.9.7).
add 9e51a8fe95 [MNG-7763] Provide UTF-8 as a default value for
project.build.sourceEncoding and project.reporting.outputEncoding (#1085)
add 2db7c85b64 [MNG-7038] Introduce public properties to point to the root
and top directories of (multi-module) project (#1061)
add 81231b8865 [MNG-7707] Skip consumer pom artifact transformation when
no pom is available (fixes #1060)
add 8b8f2c3ddd [MNG-7767] Tone down plugin validator (#1092)
add bec53b34e3 [MNG-7038] Fixes for topDirectory (#1100)
add 9b6d263bdb [MNG-7769] Update Resolver to 1.9.10 (#1102)
add a1fa3eb534 [MNG-6303] Interpolate all arguments using system and user
supplied properties (#1062)
add 56674cdc90 [MNG-7778] - Include suppressed exceptions when logging
failures (#1103)
add a8319821a9 [MNG-6829] Replace any StringUtils#isEmpty(String) and
#isNotEmpty(String) (#1104)
add a56f201991 Update DOAP
add 97a565e313 MNG for Jira auto-link
add b76e78072a [MNG-7785] Clean usage of SessionData (#1094)
add 59342ce249 [MNG-7743] Make the build work on JDK 20 (#1065)
add 2bbdd9788e Prefer Java standard library to Plexus util (#1015)
add 7fe9499361 [MNG-7783] Profile source point to file instead of to
module (#1110)
add d826b575ac [MNG-7784] Fix compatibility for SuperPomProvider (#1109)
add a90950155c [MNG-7786] Fix plugin validation misleading message (#1112)
add 11d97e64e7 [MNG-7787] Introduce new options for plugin validation
report (#1113)
add 099a3f346c [MNG-7788] Plugin Validation Report logged before summary
(#1114)
add 3f0f165242 [MNG-7786] Fix plugin validation misleading message
add 29c0a95b0b [MNG-7780] DefaultArtifact.equals throws
NullPointerException if o.version is null (#1108)
add 8f19d9ae28 [MNG-7639] Add unit test for
DefaultRepositorySystemSessionFactory#newRepositorySession (#1096)
add a27086a6f5 Fix bad javadoc
add 12ccaacf63 [MNG-7789] Dependency validation rules used wrong data
(#1115)
add 6f136ef4d2 [MNG-7789] Cleanup
add 46807790f6 [MNG-7791] Split validation issues by "locality" aspect
(#1122)
add 34685bbc2d [MNG-7587] Upgrade to sisu 0.9.0.M2 (#1119)
add ba3d3516eb [MNG-7796] Be lenient when using toRealPath (#1130)
add 26ee15a47e Fix possible NPE
add 8552ac3fea [MNG-7797] Return BRIEF mode (#1132)
add b430e7d826 [MNG-7799] Plugin validation may falsely report there are
issues (#1136)
add b2953c52d5 [MNG-7795] IllegalArgumentException: 'other' has different
root during plugin validation (#1133)
add 84e133df7c [MNG-7585] Remove duplicate classes (#1135)
add c124554316 [MNG-7698] Support comments in maven.config (#1134)
add e08c95a673 [MNG-7655] Switch to plexus-utils / plexus-xml 4 (#1093)
add ea1a280714 [MNG-7604] Removal of pom.* interpolation makes some older
plugins defunct (#1137)
add 124033bc04 [MNG-7548] Kill off "legacy" repository metadata support
(#1138)
add c79a7a0272 [MNG-7740] Remove old temporary consumer*pom files from
buildDir (#1117)
add 8b652a8b3e Fix code style for code generated by velocity templates
(#1146)
add ac0bc5541e [MNG-7338] Automatically activate batch-mode and make
output quiet when running in CI. (#869)
add be3625d190 [MNG-7790] Update lifecycle plugins (#1154)
add 56ee6a878d [MNG-7751] Provide a way to inject XmlNode into plugins
(#1071)
add 973b1b9684 [MNG-7806] Plugins verification - remove used in module(s)
report
add 898e4e4b3c Simplify code (#1156)
add ce1bb6fb19 Fix description of maven-xml-impl module
add 6ee2c5c442 [MNG-5987] document goals execution order
add 4f8648af7b [MNG-7790] Update lifecycle plugins, take 2 (#1163)
add 00d350eaca Update build plugind (#1166)
add 967d8fc19c [MNG-7794][MNG-7809] Deprecate RepositorySystem and make
maven-compat optional (#1150)
add a2d435b74a Get rid of maven-shared-utils (#1158)
add 8b0bf378b8 [MNG-5600] Dependency management import should support
exclusions. (#1155)
add 09e58d188c [MNG-7811] Plugins verification - reporting improvements
add c9f0c237e0 [MNG-7816] Bump parent pom from 39 to 40 (#1170)
add 5ebbb8ff50 [MNG-7764] Small code improvements (#1088)
add bf6b0387a9 [MNG-7800] Bump maven-resolver from 1.9.10 to 1.9.11 (#1171)
add 45721a4c9b Fix possible NPE
add edeff8643e [MNG-7800] Update resolver to 1.9.12 (#1177)
add e6303aae32 [MNG-5659] Provide project-specific settings located in
${session.rootdir}/.mvn/settings.xml by default (#1059)
add 0a8491c329 [MNG-7814] Use location tracking for settings (#1164)
add 229b31b626 [MNG-4645] Move Central repo definition out of Maven's core
so it can be more easily changed (#1139)
add fb612f5dbc [MNG-6112] Make central update policy coherent (#1142)
add c5f9b74f28 [MNG-7805] Make the modelVersion optional when using build
pom (#1148)
add 441ba71b04 [MNG-7632] Regression: combine.children breaks when
combining executions (#1168)
add c080f64d46 update logging documentation
add e3529c9582 [MNG-7714] Fixed a scenario in version sorting where sp1 is
less than final (#1099)
add c9ba8bc4bf [MNG-7800] Update resolver to 1.9.13 (#1181)
add 764a9ca0be [MNG-7823] Improve plugin validation level parsing (#1182)
add a3f0f12fab [maven-release-plugin] prepare release maven-4.0.0-alpha-6
add a279289bc3 [maven-release-plugin] prepare for next development
iteration
add 09b0436828 Fix javadoc for MessageUtils and Style
add 776563528b [MNG-7824] Bump plexus-xml from 4.0.0 to 4.0.1 (#1184)
add dbfcfd5eb3 [MNG-7228] MavenProject.getOriginalModel returns
interpolated parts (#1183)
add bf699a388c [maven-release-plugin] prepare release maven-4.0.0-alpha-7
add 5b540821f2 [maven-release-plugin] prepare for next development
iteration
add 00e1793550 Update doap_Maven.rdf with recent releases
add e39142b77a [MNG-7830] Switch from plexus-xml to stax / woodstox (#1185)
add 08e996bb28 Fix search for topDirectory when using -f / --file
add 08979553f2 Prefer Files.newInputStream
add 8f45d51bd6 Prefer using String.isEmpty over String.length()>0
add 97774578fb Add missing maven artifacts to BOM
add 567df8dea8 Use correct order in javadoc
add 6b3989ce5b Use model processor when locating the root pom when using
-f/--file
add 7563949f71 [MNG-7834] Fix NullPointerException in flatten-maven-plugin
add 9b12ccdeb0 Rename Type#getName() to getId() and improve javadoc (#1198)
add 41e6760143 Do not generate empty files for InputLocation and
InputSource
add bf56599e7b Bump guava from 30.1-jre to 32.0.1-jre (#1191)
add 1a714351ef remove pointless string concatenation (#1201)
add fbc945b366 Rename argument (#1202)
add 4a5b6c5f2b Trivial fixes to the generated stax readers (#1204)
add 36db1e35ca [MNG-7846] Break out of endless loop (#1206)
add 857a5e129a [MNG-7847] Upgrade resolver to 1.9.14
add bcfea094c0 [MNG-7848] Add s390x pipeline to Jenkins CI
add 83e8bd826e Update DOAP for Apache Maven 3.9.4
add 059e3c5914 Fix dependabot alerts (#1214)
add 65b5031be8 [MNG-7848] Change the notification recipients in s390x
pipeline (#1213)
add eff2fbf2a9 [MNG-7848] Remove `Configure deploy` stage from s390x
pipeline (#1216)
add e7feeb6ff0 Fix codestyle in model code snippets (#1203)
add 421a23ad27 Improve API doc for ArtifactHandler (#1193)
add c08b221264 [MNG-6401] Support interpolation of the proxy port in
settings.xml (#1194)
add 8a88c45a2d [MNG-7863] don't email on s390 failures. The regular
results are enough. (#1218)
add f2593b97ef [MNG-7862] The ModelLocator should always be used when
locating pom.xml (#1217)
add 7d66d19f8b [MNG-7822] Add support for TRACE logging level (with style
"bold,magenta") (#1215)
add b0170a612b [MNG-7851] Improve error message when modelVersion is 4.0
(#1219)
add 22ae75a304 [MNG-7843] Allow glob patterns in dependency exclusions
(#1200)
add 98ec2eb1c8 [MNG-7861] Remove artifacts which should be kept hidden
(#1221)
add 64b32c0bb4 [MNG-7871] Fix location tracking (#1222)
add 9dd7b01a89 [MNG-7856] Maven Resolver Provider ctor and other minor
code changes (#1223)
add 60781caa06 Fix javadoc issues.
add 06938249a7 [MNG-7792] Use a standalone asm version (#1126)
add c0b8a769b3 [MNG-7864] Disable broken s390x jenkins (#1225)
add 0b3246381d Remove useless @author tags (#1226)
add 05a76bc427 Deprecate all classes in maven-compat (#1227)
add 1c050eee7b [MNG-7870] Undeprecate G level metadata (#1224)
add 0ea8879eea [MNG-7874] Use name constants instead of free string
literals (#1229)
add e2fc256118 Minor improvements to v4 api ToolchainsBuilder (#1234)
add a27f614511 Remove unused method in generated xml writers
add c245ed48de Fix stax writer to generate nicer XML
add f0a6239162 Use XMLConstants
add 8d91fc8c15 Do not build location information if not needed
add dde369b6fc [MNG-7810] Provide a SPI for the v4 api
add 7d6f90e8d0 Move Features to api (#1232)
add e71d2d7167 Improve o.a.m.api.services.Source interface (#1236)
add 46fd5e9586 Add ModelLocator#locateExistingPom to abstract a bit more
(#1237)
add 45075233c7 [MNG-7876] Add model version analysis and downgrade (#1235)
add 25488f9231 [MNG-7875] colorize transfer messages
add c6380108b1 [MNG-7877] Attach the build POM and simplify build/consumer
implementation (#1240)
add 838cda7db0 Resolve circular dependencies for project
org.apache.maven:maven-xml-impl (#1228)
add ce8fc3a31c [MNG-7878] Extend test for ConsumerPom and modules in
plugin configuration
add 34b0591f03 [MNG-7820] Remove dependency on plexus-utils StringUtils /
FileUtils (#1243)
add 9378676b80 [MNG-7889] Preserve MetadataXpp3Reader/Writer for Maven 3
compatible
add 1eae6684e3 [MNG-7881] Expose the rootDirectory for model processing
(#1245)
add 0c37cff681 [MNG-7820] Get rid of plexus-utils Os class (#1249)
add e91cee9a2d [MNG-7820] Get rid of plexus-utils DAG class (#1250)
add fd4493580a [MNG-7820] Get rid of plexus-utils introspection classes
(#1251)
add 89d3ac90d1 Make DefaultInheritanceAssembler#merger field final and
reorder fields correctly
add d5a8e33617 Make DefaultModelBuildingListener#project field final
add 1865c9c6fd Fix bad version in test poms
add 59a8d90397 Add a o.a.maven.api.services.Source#resolve method
add eb20034763 Simplify ReactorModelPool and use a concurrent map
add aefa9599fb Avoid usage of XmlStreamReader (#1256)
add dd2f1214d6 [MNG-7891] Support configuration for extensions (#1252)
add f24266eb64 [MNG-7836] Support alternative syntaxes for POMs (#1197)
add 10487d7b5d [MNG-7820] Get rid of plexus-utils (#1255)
add dec90acf24 [MNG-7866] Improvements to the logging API usage (technical
debt) (#1220)
add 6bf55cfc11 [MNG-7879] Add a bom packaging (#1242)
add 35022a3616 Fix newlines and indentation in ModelBuildingException
message (#1257)
add 23754274ff merge to master
add ea02b66326 merge to master
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 2 +
.github/workflows/maven.yml | 16 +-
.github/workflows/maven_build_itself.yml | 2 +-
README.md | 2 +-
apache-maven/pom.xml | 7 +-
apache-maven/src/assembly/maven/conf/settings.xml | 33 +-
.../licenses/unrecognized-asm-9.5.txt | 27 +
.../licenses/unrecognized-stax2-api-4.2.1.txt | 3 +
.../apache/maven/settings/GlobalSettingsTest.java | 18 +-
api/maven-api-core/pom.xml | 10 +-
.../main/java/org/apache/maven/api/Artifact.java | 6 +-
.../org/apache/maven/api/ArtifactCoordinate.java | 2 +-
.../main/java/org/apache/maven/api/Dependency.java | 4 +-
.../org/apache/maven/api/DependencyCoordinate.java | 2 +-
.../src/main/java/org/apache/maven/api/Event.java | 2 +-
.../main/java/org/apache/maven/api/EventType.java | 2 +-
.../main/java/org/apache/maven/api/Exclusion.java | 2 +-
.../java/org/apache/maven/api/JavaToolchain.java | 2 +-
.../main/java/org/apache/maven/api/Listener.java | 2 +-
.../java/org/apache/maven/api/LocalRepository.java | 2 +-
.../java/org/apache/maven/api/MetadataStorage.java | 2 +-
.../src/main/java/org/apache/maven/api/Node.java | 2 +-
.../java/org/apache/maven/api/NodeVisitor.java | 2 +-
.../main/java/org/apache/maven/api/Project.java | 39 +-
.../main/java/org/apache/maven/api/Repository.java | 7 +-
.../java/org/apache/maven/api/ResolutionScope.java | 2 +-
.../src/main/java/org/apache/maven/api/Scope.java | 2 +-
.../main/java/org/apache/maven/api/Session.java | 33 +-
.../java/org/apache/maven/api/SessionData.java | 2 +-
.../main/java/org/apache/maven/api/Toolchain.java | 2 +-
.../src/main/java/org/apache/maven/api/Type.java | 51 +-
.../main/java/org/apache/maven/api/Version.java | 2 +-
.../java/org/apache/maven/api/VersionRange.java | 2 +-
.../org/apache/maven/api/feature/Features.java | 80 ++
.../main/java/org/apache/maven/api/plugin/Log.java | 2 +-
.../java/org/apache/maven/api/plugin/Mojo.java | 2 +-
.../org/apache/maven/api/plugin/MojoException.java | 2 +-
.../maven/api/plugin/annotations/Component.java | 2 +-
.../maven/api/plugin/annotations/Execute.java | 2 +-
.../plugin/annotations/InstantiationStrategy.java | 2 +-
.../api/plugin/annotations/LifecyclePhase.java | 2 +-
.../apache/maven/api/plugin/annotations/Mojo.java | 2 +-
.../maven/api/plugin/annotations/Parameter.java | 2 +-
.../api/services/ArtifactCoordinateFactory.java | 2 +-
.../services/ArtifactCoordinateFactoryRequest.java | 2 +-
.../maven/api/services/ArtifactDeployer.java | 2 +-
.../api/services/ArtifactDeployerException.java | 2 +-
.../api/services/ArtifactDeployerRequest.java | 2 +-
.../apache/maven/api/services/ArtifactFactory.java | 2 +-
.../maven/api/services/ArtifactFactoryRequest.java | 2 +-
.../maven/api/services/ArtifactInstaller.java | 2 +-
.../api/services/ArtifactInstallerException.java | 2 +-
.../api/services/ArtifactInstallerRequest.java | 2 +-
.../apache/maven/api/services/ArtifactManager.java | 2 +-
.../maven/api/services/ArtifactResolver.java | 2 +-
.../api/services/ArtifactResolverException.java | 2 +-
.../api/services/ArtifactResolverRequest.java | 2 +-
.../maven/api/services/ArtifactResolverResult.java | 2 +-
.../org/apache/maven/api/services/BaseRequest.java | 2 +-
.../apache/maven/api/services/BuilderProblem.java | 4 +-
.../maven/api/services/DependencyCollector.java | 2 +-
.../api/services/DependencyCollectorException.java | 2 +-
.../api/services/DependencyCollectorRequest.java | 2 +-
.../api/services/DependencyCollectorResult.java | 2 +-
.../api/services/DependencyCoordinateFactory.java | 2 +-
.../DependencyCoordinateFactoryRequest.java | 4 +-
.../maven/api/services/LocalRepositoryManager.java | 2 +-
.../apache/maven/api/services/LookupException.java | 2 +-
.../apache/maven/api/services/MavenException.java | 2 +-
.../apache/maven/api/services/MessageBuilder.java | 63 +-
.../maven/api/services/MessageBuilderFactory.java | 2 +-
.../apache/maven/api/services/ProjectBuilder.java | 2 +-
.../api/services/ProjectBuilderException.java | 2 +-
.../maven/api/services/ProjectBuilderRequest.java | 2 +-
.../maven/api/services/ProjectBuilderResult.java | 2 +-
.../apache/maven/api/services/ProjectManager.java | 2 +-
.../org/apache/maven/api/services/Prompter.java | 2 +-
.../maven/api/services/PrompterException.java | 2 +-
.../maven/api/services/RepositoryFactory.java | 2 +-
.../apache/maven/api/services/SettingsBuilder.java | 35 +-
.../api/services/SettingsBuilderException.java | 2 +-
.../maven/api/services/SettingsBuilderRequest.java | 76 +-
.../java/org/apache/maven/api/services/Source.java | 59 +-
.../maven/api/services}/SuperPomProvider.java | 16 +-
.../maven/api/services/ToolchainFactory.java | 2 +-
.../maven/api/services/ToolchainManager.java | 2 +-
.../api/services/ToolchainManagerException.java | 2 +-
.../maven/api/services/ToolchainsBuilder.java | 20 +-
.../api/services/ToolchainsBuilderException.java | 2 +-
.../org/apache/maven/api/services/Transport.java | 2 +-
.../maven/api/services/TransportProvider.java | 2 +-
.../api/services/TransportProviderException.java | 2 +-
.../apache/maven/api/services/TypeRegistry.java | 2 +-
.../apache/maven/api/services/VersionParser.java | 2 +-
.../maven/api/services/VersionParserException.java | 2 +-
.../maven/api/services/xml/ModelXmlFactory.java | 2 +-
.../maven/api/services/xml/SettingsXmlFactory.java | 2 +-
.../api/services/xml/ToolchainsXmlFactory.java | 2 +-
.../apache/maven/api/services/xml/XmlFactory.java | 2 +-
.../maven/api/services/xml/XmlReaderException.java | 2 +-
.../maven/api/services/xml/XmlReaderRequest.java | 2 +-
.../maven/api/services/xml/XmlWriterException.java | 2 +-
.../maven/api/services/xml/XmlWriterRequest.java | 2 +-
api/maven-api-meta/pom.xml | 2 +-
.../org/apache/maven/api/annotations/Consumer.java | 2 +-
.../apache/maven/api/annotations/Experimental.java | 2 +-
.../apache/maven/api/annotations/Generated.java | 2 +-
.../apache/maven/api/annotations/Immutable.java | 2 +-
.../org/apache/maven/api/annotations/Nonnull.java | 2 +-
.../maven/api/annotations/NotThreadSafe.java | 2 +-
.../org/apache/maven/api/annotations/Nullable.java | 2 +-
.../org/apache/maven/api/annotations/Provider.java | 2 +-
.../apache/maven/api/annotations/ThreadSafe.java | 2 +-
.../apache/maven/api/annotations/package-info.java | 2 +-
api/maven-api-model/pom.xml | 24 +-
.../maven/api/model/ImmutableCollections.java | 605 ---------
.../org/apache/maven/api/model/InputLocation.java | 4 +-
.../org/apache/maven/api/model/InputSource.java | 43 +
api/maven-api-model/src/main/mdo/maven.mdo | 143 ++-
api/maven-api-settings/pom.xml | 19 +-
.../maven/api/settings/ImmutableCollections.java | 605 ---------
.../apache/maven/api/settings}/InputLocation.java | 2 +-
.../maven/api/settings/InputLocationTracker.java | 11 +-
.../apache/maven/api/settings}/InputSource.java | 19 +-
api/maven-api-settings/src/main/mdo/settings.mdo | 178 ++-
.../apache/maven/api/settings/SettingsTest.java | 22 +-
api/{maven-api-xml => maven-api-spi}/pom.xml | 17 +-
.../java/org/apache/maven/api/spi/ModelParser.java | 71 ++
.../apache/maven/api/spi/ModelParserException.java | 52 +-
api/maven-api-toolchain/pom.xml | 4 +-
.../maven/api/toolchain/ImmutableCollections.java | 605 ---------
api/maven-api-xml/pom.xml | 4 +-
.../java/org/apache/maven/api/xml/XmlNode.java | 2 +-
api/pom.xml | 3 +-
doap_Maven.rdf | 85 +-
maven-artifact/pom.xml | 9 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 12 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 52 +-
.../maven/artifact/handler/ArtifactHandler.java | 14 +-
.../repository/ArtifactRepositoryPolicy.java | 1 -
.../layout/ArtifactRepositoryLayout.java | 1 -
.../metadata/RepositoryMetadataStoreException.java | 1 -
.../AbstractArtifactResolutionException.java | 1 -
.../resolver/ArtifactNotFoundException.java | 1 -
.../resolver/ArtifactResolutionException.java | 1 -
.../resolver/CyclicDependencyException.java | 1 -
.../artifact/resolver/filter/ArtifactFilter.java | 1 -
.../maven/artifact/versioning/ArtifactVersion.java | 1 -
.../artifact/versioning/ComparableVersion.java | 206 ++-
.../versioning/DefaultArtifactVersion.java | 16 +-
.../InvalidVersionSpecificationException.java | 1 -
.../OverConstrainedVersionException.java | 1 -
.../maven/artifact/versioning/Restriction.java | 1 -
.../maven/artifact/versioning/VersionRange.java | 1 -
.../legacy/metadata/ArtifactMetadata.java | 1 -
.../apache/maven/artifact/ArtifactUtilsTest.java | 9 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 38 +-
.../artifact/versioning/ComparableVersionIT.java | 4 +-
.../artifact/versioning/ComparableVersionTest.java | 77 +-
.../versioning/DefaultArtifactVersionTest.java | 17 +-
.../artifact/versioning/VersionRangeTest.java | 23 +-
maven-bom/pom.xml | 38 +-
maven-builder-support/pom.xml | 2 +-
.../org/apache/maven/building/DefaultProblem.java | 2 -
.../maven/building/DefaultProblemCollector.java | 2 -
.../java/org/apache/maven/building/FileSource.java | 5 +-
.../java/org/apache/maven/building/Problem.java | 2 -
.../apache/maven/building/ProblemCollector.java | 2 -
.../maven/building/ProblemCollectorFactory.java | 1 -
.../java/org/apache/maven/building/Source.java | 1 -
.../org/apache/maven/building/StringSource.java | 1 -
.../java/org/apache/maven/building/UrlSource.java | 1 -
.../building/DefaultProblemCollectorTest.java | 6 +-
.../apache/maven/building/DefaultProblemTest.java | 16 +-
.../org/apache/maven/building/FileSourceTest.java | 10 +-
.../building/ProblemCollectorFactoryTest.java | 4 +-
.../apache/maven/building/StringSourceTest.java | 8 +-
.../org/apache/maven/building/UrlSourceTest.java | 8 +-
maven-compat/pom.xml | 18 +-
.../org/apache/maven/ArtifactFilterManager.java | 1 +
.../maven/ArtifactFilterManagerDelegate.java | 1 +
.../apache/maven/DefaultArtifactFilterManager.java | 3 +-
.../maven/DefaultProjectDependenciesResolver.java | 2 +-
.../apache/maven/ProjectDependenciesResolver.java | 1 -
.../apache/maven/artifact/ArtifactScopeEnum.java | 2 +-
.../org/apache/maven/artifact/ArtifactStatus.java | 2 +-
.../artifact/UnknownRepositoryLayoutException.java | 2 +-
.../maven/artifact/deployer/ArtifactDeployer.java | 1 +
.../deployer/ArtifactDeploymentException.java | 2 +-
.../artifact/deployer/DefaultArtifactDeployer.java | 12 +-
.../installer/ArtifactInstallationException.java | 2 +-
.../artifact/installer/ArtifactInstaller.java | 2 +-
.../installer/DefaultArtifactInstaller.java | 15 +-
.../artifact/manager/DefaultWagonManager.java | 20 +-
.../manager/WagonConfigurationException.java | 1 -
.../maven/artifact/manager/WagonManager.java | 1 -
.../metadata/AbstractArtifactMetadata.java | 0
.../ArtifactMetadataRetrievalException.java | 0
.../artifact/metadata/ArtifactMetadataSource.java | 0
.../maven/artifact/metadata/ResolutionGroup.java | 0
.../repository/ArtifactRepositoryFactory.java | 2 +-
.../repository/DefaultArtifactRepository.java | 1 -
.../DefaultArtifactRepositoryFactory.java | 28 +-
.../repository/LegacyLocalRepositoryManager.java | 6 +-
.../repository/layout/FlatRepositoryLayout.java | 8 +-
.../metadata/AbstractRepositoryMetadata.java | 33 +-
.../metadata/ArtifactRepositoryMetadata.java | 2 +-
.../metadata/DefaultRepositoryMetadataManager.java | 44 +-
.../metadata/GroupRepositoryMetadata.java | 2 +-
.../repository/metadata/MetadataBridge.java | 7 +-
.../repository/metadata/MetadataUtils.java | 2 +-
.../repository/metadata/RepositoryMetadata.java | 2 +-
.../RepositoryMetadataDeploymentException.java | 2 +-
.../RepositoryMetadataInstallationException.java | 2 +-
.../metadata/RepositoryMetadataManager.java | 1 +
.../metadata/RepositoryMetadataReadException.java | 2 +-
.../RepositoryMetadataResolutionException.java | 2 +-
.../SnapshotArtifactRepositoryMetadata.java | 2 +-
.../resolver/ArtifactResolutionRequest.java | 2 +-
.../resolver/ArtifactResolutionResult.java | 2 +-
.../maven/artifact/resolver/ArtifactResolver.java | 2 +-
.../artifact/resolver/DebugResolutionListener.java | 2 +-
.../resolver/DefaultArtifactCollector.java | 6 +-
.../artifact/resolver/DefaultArtifactResolver.java | 33 +-
.../resolver/DefaultResolutionErrorHandler.java | 2 +-
.../artifact/resolver/ResolutionErrorHandler.java | 2 +-
.../artifact/resolver/ResolutionListener.java | 2 +-
.../maven/artifact/resolver/ResolutionNode.java | 1 +
.../artifact/resolver/UnresolvedArtifacts.java | 2 +-
.../resolver/WarningResolutionListener.java | 2 +-
.../resolver/filter/InversionArtifactFilter.java | 1 +
.../artifact/resolver/filter/OrArtifactFilter.java | 2 +-
.../resolver/filter/TypeArtifactFilter.java | 1 +
.../maven/execution/DefaultRuntimeInformation.java | 15 +-
.../apache/maven/execution/RuntimeInformation.java | 1 -
.../org/apache/maven/plugin/PluginManager.java | 1 -
.../plugin/internal/DefaultPluginManager.java | 2 +-
.../profiles/DefaultMavenProfilesBuilder.java | 74 --
.../maven/profiles/DefaultProfileManager.java | 7 +-
.../maven/profiles/MavenProfilesBuilder.java | 34 -
.../profiles/activation/FileProfileActivator.java | 17 +-
.../activation/JdkPrefixProfileActivator.java | 4 +-
.../OperatingSystemProfileActivator.java | 8 +-
.../activation/SystemPropertyProfileActivator.java | 5 +-
.../maven/project/DefaultMavenProjectBuilder.java | 15 +-
.../project/MissingRepositoryElementException.java | 1 +
.../project/artifact/ActiveProjectArtifact.java | 1 -
.../artifact/DefaultMavenMetadataCache.java | 1 +
.../project/artifact/DefaultMetadataSource.java | 2 +-
.../maven/project/artifact/MavenMetadataCache.java | 1 +
.../project/artifact/MavenMetadataSource.java | 18 +-
.../project/artifact/ProjectArtifactMetadata.java | 7 +-
.../DefaultModelInheritanceAssembler.java | 8 +-
.../inheritance/ModelInheritanceAssembler.java | 1 -
.../AbstractStringBasedModelInterpolator.java | 24 +-
.../interpolation/ModelInterpolationException.java | 1 -
.../project/interpolation/ModelInterpolator.java | 1 -
.../interpolation/RegexBasedModelInterpolator.java | 1 -
.../StringSearchModelInterpolator.java | 7 +-
.../maven/project/path/DefaultPathTranslator.java | 7 +-
.../apache/maven/project/path/PathTranslator.java | 1 -
.../project/validation/DefaultModelValidator.java | 12 +-
.../project/validation/ModelValidationResult.java | 2 +-
.../maven/project/validation/ModelValidator.java | 1 -
.../maven/reporting/MavenReportException.java | 3 +-
.../repository/ArtifactDoesNotExistException.java | 1 +
.../maven/repository/ArtifactTransferEvent.java | 2 +-
.../ArtifactTransferFailedException.java | 1 +
.../maven/repository/ArtifactTransferListener.java | 1 +
.../maven/repository/ArtifactTransferResource.java | 2 +-
.../maven/repository/DefaultMirrorSelector.java | 10 +-
.../DelegatingLocalArtifactRepository.java | 0
.../maven/repository/LocalArtifactRepository.java | 1 +
.../LocalRepositoryNotAccessibleException.java | 2 +-
.../maven/repository/MavenArtifactMetadata.java | 2 +-
.../org/apache/maven/repository/MetadataGraph.java | 2 +-
.../apache/maven/repository/MetadataGraphNode.java | 2 +-
.../repository/MetadataResolutionRequest.java | 2 +-
.../maven/repository/MetadataResolutionResult.java | 2 +-
.../apache/maven/repository/MirrorSelector.java | 2 +-
.../apache/maven/repository/RepositorySystem.java | 10 +-
.../repository/UserLocalArtifactRepository.java | 1 +
.../maven/repository/VersionNotFoundException.java | 2 +-
.../repository/legacy/ChecksumFailedException.java | 2 +-
.../legacy/DefaultUpdateCheckManager.java | 8 +-
.../repository/legacy/DefaultWagonManager.java | 45 +-
.../repository/legacy/LegacyRepositorySystem.java | 43 +-
.../maven/repository/legacy/MavenArtifact.java | 1 +
.../repository/legacy/TransferListenerAdapter.java | 1 +
.../repository/legacy/UpdateCheckManager.java | 1 +
.../legacy/WagonConfigurationException.java | 1 +
.../maven/repository/legacy/WagonManager.java | 1 +
.../legacy/metadata/AbstractArtifactMetadata.java | 2 +-
.../ArtifactMetadataRetrievalException.java | 2 +-
.../legacy/metadata/ArtifactMetadataSource.java | 2 +-
.../metadata/DefaultMetadataResolutionRequest.java | 2 +-
.../legacy/metadata/MetadataResolutionRequest.java | 2 +-
.../legacy/metadata/ResolutionGroup.java | 1 +
.../repository/ArtifactRepositoryFactory.java | 2 +-
.../DefaultArtifactRepositoryFactory.java | 13 +-
.../resolver/DefaultLegacyArtifactCollector.java | 19 +-
.../legacy/resolver/LegacyArtifactCollector.java | 1 -
.../legacy/resolver/conflict/ConflictResolver.java | 3 +-
.../resolver/conflict/ConflictResolverFactory.java | 2 +-
.../ConflictResolverNotFoundException.java | 2 +-
.../resolver/conflict/DefaultConflictResolver.java | 7 +-
.../conflict/DefaultConflictResolverFactory.java | 13 +-
.../conflict/FarthestConflictResolver.java | 9 +-
.../resolver/conflict/NearestConflictResolver.java | 10 +-
.../resolver/conflict/NewestConflictResolver.java | 9 +-
.../resolver/conflict/OldestConflictResolver.java | 9 +-
.../transform/AbstractVersionTransformation.java | 9 +-
.../resolver/transform/ArtifactTransformation.java | 2 +-
.../transform/ArtifactTransformationManager.java | 1 +
.../DefaultArtifactTransformationManager.java | 27 +-
.../transform/LatestArtifactTransformation.java | 8 +-
.../transform/ReleaseArtifactTransformation.java | 9 +-
.../resolver/transform/SnapshotTransformation.java | 13 +-
.../repository/metadata/ArtifactMetadata.java | 2 +-
.../repository/metadata/ClasspathContainer.java | 2 +-
.../metadata/ClasspathTransformation.java | 2 +-
.../metadata/DefaultClasspathTransformation.java | 13 +-
.../DefaultGraphConflictResolutionPolicy.java | 9 +-
.../metadata/DefaultGraphConflictResolver.java | 13 +-
.../metadata/GraphConflictResolutionException.java | 2 +-
.../metadata/GraphConflictResolutionPolicy.java | 2 +-
.../repository/metadata/GraphConflictResolver.java | 2 +-
.../maven/repository/metadata/MetadataGraph.java | 2 +-
.../repository/metadata/MetadataGraphEdge.java | 2 +-
.../MetadataGraphTransformationException.java | 2 +-
.../repository/metadata/MetadataGraphVertex.java | 2 +-
.../repository/metadata/MetadataResolution.java | 2 +-
.../metadata/MetadataResolutionException.java | 1 +
.../metadata/MetadataResolutionRequest.java | 2 +-
.../MetadataResolutionRequestTypeEnum.java | 1 +
.../metadata/MetadataResolutionResult.java | 2 +-
.../metadata/MetadataRetrievalException.java | 2 +-
.../maven/repository/metadata/MetadataSource.java | 2 +-
.../repository/metadata/MetadataTreeNode.java | 2 +-
.../settings/DefaultMavenSettingsBuilder.java | 6 +-
.../maven/settings/MavenSettingsBuilder.java | 2 -
.../maven/toolchain/DefaultToolchainsBuilder.java | 13 +-
.../apache/maven/toolchain/ToolchainsBuilder.java | 3 +-
.../plugin/ExpressionDocumentationException.java | 1 +
.../usability/plugin/ExpressionDocumenter.java | 8 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 3 +-
.../maven/ProjectDependenciesResolverTest.java | 6 +-
.../AbstractArtifactComponentTestCase.java | 11 +-
.../artifact/deployer/ArtifactDeployerTest.java | 12 +-
.../deployer/SimpleArtifactMetadataSource.java | 1 -
.../factory/DefaultArtifactFactoryTest.java | 4 +-
.../artifact/installer/ArtifactInstallerTest.java | 5 +-
.../SwitchableMetadataSource.java} | 58 +-
.../repository/MavenArtifactRepositoryTest.java | 4 +-
.../resolver/ArtifactResolutionExceptionTest.java | 5 +-
.../artifact/resolver/ArtifactResolverTest.java | 20 +-
.../resolver/DefaultArtifactResolverTest.java | 6 +-
.../resolver/filter/AndArtifactFilterTest.java | 5 +-
.../resolver/filter/FilterHashEqualsTest.java | 5 +-
.../resolver/filter/OrArtifactFilterTest.java | 5 +-
.../resolver/filter/ScopeArtifactFilterTest.java | 13 +-
.../transform/TransformationManagerTest.java | 5 +-
.../manager/DefaultProfileManagerTest.java | 14 +-
.../project/AbstractMavenProjectTestCase.java | 1 -
.../maven/project/ClasspathArtifactResolver.java | 1 -
.../maven/project/EmptyLifecycleExecutor.java | 1 -
.../project/EmptyLifecyclePluginAnalyzer.java | 1 -
.../project/LegacyLocalRepositoryManager.java | 1 -
.../apache/maven/project/ProjectClasspathTest.java | 4 +-
.../apache/maven/project/TestProjectBuilder.java | 7 +-
.../artifact/DefaultMavenMetadataCacheTest.java | 15 +-
.../project/artifact/MavenMetadataSourceTest.java | 8 +-
.../AbstractProjectInheritanceTestCase.java | 1 -
.../inheritance/t00/ProjectInheritanceTest.java | 5 +-
.../inheritance/t01/ProjectInheritanceTest.java | 5 +-
.../inheritance/t02/ProjectInheritanceTest.java | 5 +-
.../inheritance/t03/ProjectInheritanceTest.java | 5 +-
.../inheritance/t04/ProjectInheritanceTest.java | 5 +-
.../inheritance/t05/ProjectInheritanceTest.java | 5 +-
.../inheritance/t06/ProjectInheritanceTest.java | 5 +-
.../inheritance/t07/ProjectInheritanceTest.java | 5 +-
.../inheritance/t08/ProjectInheritanceTest.java | 5 +-
.../inheritance/t09/ProjectInheritanceTest.java | 7 +-
.../inheritance/t10/ProjectInheritanceTest.java | 5 +-
.../inheritance/t11/ProjectInheritanceTest.java | 5 +-
.../inheritance/t12/ProjectInheritanceTest.java | 4 +-
.../inheritance/t12scm/ProjectInheritanceTest.java | 7 +-
.../project/path/DefaultPathTranslatorTest.java | 8 +-
.../repository/DefaultMirrorSelectorTest.java | 4 +-
.../repository/LegacyRepositorySystemTest.java | 24 +-
.../maven/repository/MirrorProcessorTest.java | 18 +-
.../maven/repository/TestArtifactHandler.java | 1 -
.../maven/repository/TestRepositorySystem.java | 23 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 16 +-
.../repository/legacy/DefaultWagonManagerTest.java | 19 +-
.../legacy/LegacyRepositorySystemTest.java | 10 +-
.../org/apache/maven/repository/legacy/WagonA.java | 2 -
.../org/apache/maven/repository/legacy/WagonB.java | 2 -
.../org/apache/maven/repository/legacy/WagonC.java | 2 -
.../apache/maven/repository/legacy/WagonMock.java | 1 -
.../resolver/DefaultArtifactCollectorTest.java | 82 +-
.../conflict/AbstractConflictResolverTest.java | 1 -
.../conflict/FarthestConflictResolverTest.java | 11 +-
.../conflict/NearestConflictResolverTest.java | 11 +-
.../conflict/NewestConflictResolverTest.java | 11 +-
.../conflict/OldestConflictResolverTest.java | 11 +-
.../DefaultClasspathTransformationTest.java | 15 +-
.../DefaultGraphConflictResolutionPolicyTest.java | 9 +-
.../metadata/DefaultGraphConflictResolverTest.java | 15 +-
.../it0063/jdk/jre/placeholder.txt | 0
.../it0063/jdk/lib/tools.jar | Bin
.../project-dependencies-resolver/it0063/pom.xml | 0
.../project-with-exclusions/pom.xml | 0
maven-core/pom.xml | 51 +-
.../org/apache/maven/BuildFailureException.java | 1 -
.../main/java/org/apache/maven/DefaultMaven.java | 75 +-
.../apache/maven/DuplicateProjectException.java | 1 -
.../org/apache/maven/InternalErrorException.java | 1 -
.../src/main/java/org/apache/maven/Maven.java | 1 -
.../org/apache/maven/MavenExecutionException.java | 1 -
.../apache/maven/ProjectBuildFailureException.java | 1 -
.../org/apache/maven/ProjectCycleException.java | 3 +-
.../main/java/org/apache/maven/ReactorReader.java | 1 -
.../java/org/apache/maven/RepositoryUtils.java | 29 +-
.../main/java/org/apache/maven/SessionScoped.java | 1 -
.../DependencyResolutionRequiredException.java | 1 -
.../maven/artifact/InvalidRepositoryException.java | 1 -
.../artifact/handler/DefaultArtifactHandler.java | 2 -
.../handler/manager/ArtifactHandlerManager.java | 1 -
.../manager/DefaultArtifactHandlerManager.java | 1 -
.../providers/BomArtifactHandlerProvider.java | 25 +-
.../repository/DefaultRepositoryRequest.java | 1 -
.../maven/artifact/repository/RepositoryCache.java | 1 -
.../artifact/repository/RepositoryRequest.java | 1 -
.../repository/layout/DefaultRepositoryLayout.java | 1 -
.../metadata/io/DefaultMetadataReader.java | 28 +-
.../metadata/io/MetadataParseException.java | 1 -
.../repository/metadata/io/MetadataReader.java | 1 -
.../filter/AbstractScopeArtifactFilter.java | 1 -
.../resolver/filter/AndArtifactFilter.java | 1 -
.../filter/CumulativeScopeArtifactFilter.java | 2 -
.../resolver/filter/ExcludesArtifactFilter.java | 1 -
.../resolver/filter/ExclusionArtifactFilter.java | 52 +-
.../resolver/filter/ExclusionSetFilter.java | 1 -
.../resolver/filter/IncludesArtifactFilter.java | 1 -
.../resolver/filter/ScopeArtifactFilter.java | 1 -
.../apache/maven/bridge/MavenRepositorySystem.java | 47 +-
.../classrealm/ArtifactClassRealmConstituent.java | 1 -
.../maven/classrealm/ClassRealmConstituent.java | 1 -
.../apache/maven/classrealm/ClassRealmManager.java | 1 -
.../classrealm/ClassRealmManagerDelegate.java | 1 -
.../apache/maven/classrealm/ClassRealmRequest.java | 1 -
.../maven/classrealm/DefaultClassRealmManager.java | 70 +-
.../maven/classrealm/DefaultClassRealmRequest.java | 1 -
.../BasedirBeanConfigurationPathTranslator.java | 1 -
.../configuration/BeanConfigurationException.java | 1 -
.../BeanConfigurationPathTranslator.java | 1 -
.../configuration/BeanConfigurationRequest.java | 1 -
.../BeanConfigurationValuePreprocessor.java | 1 -
.../maven/configuration/BeanConfigurator.java | 1 -
.../DefaultBeanConfigurationRequest.java | 15 +-
.../internal/DefaultBeanConfigurator.java | 41 +-
.../internal/EnhancedConverterLookup.java | 1 +
.../maven/exception/DefaultExceptionHandler.java | 23 +-
.../maven/execution/AbstractExecutionListener.java | 1 -
.../org/apache/maven/execution/BuildFailure.java | 1 -
.../org/apache/maven/execution/BuildSuccess.java | 1 -
.../org/apache/maven/execution/BuildSummary.java | 1 -
.../DefaultBuildResumptionDataRepository.java | 6 +-
.../execution/DefaultMavenExecutionRequest.java | 48 +-
.../DefaultMavenExecutionRequestPopulator.java | 39 +-
.../execution/DefaultMavenExecutionResult.java | 1 -
.../org/apache/maven/execution/ExecutionEvent.java | 1 -
.../apache/maven/execution/ExecutionListener.java | 1 -
.../maven/execution/MavenExecutionRequest.java | 52 +-
.../MavenExecutionRequestPopulationException.java | 1 -
.../execution/MavenExecutionRequestPopulator.java | 1 -
.../maven/execution/MavenExecutionResult.java | 1 -
.../org/apache/maven/execution/MavenSession.java | 22 +-
.../maven/execution/ProjectDependencyGraph.java | 1 -
.../org/apache/maven/execution/ReactorManager.java | 2 +-
.../maven/execution/scope/MojoExecutionScoped.java | 1 -
.../extension/internal/CoreExtensionEntry.java | 36 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 7 +-
.../maven/graph/DefaultProjectDependencyGraph.java | 3 +-
.../graph/FilteredProjectDependencyGraph.java | 1 -
.../DefaultRepositorySystemSessionFactory.java | 2 +-
.../internal/aether/LoggingRepositoryListener.java | 40 +-
.../aether/ReverseTreeRepositoryListener.java | 163 ++-
.../maven/internal/impl/DefaultArtifact.java | 2 +-
.../impl/DefaultArtifactCoordinateFactory.java | 13 +-
.../internal/impl/DefaultArtifactFactory.java | 13 +-
.../org/apache/maven/internal/impl/DefaultLog.java | 32 +-
.../maven/internal/impl/DefaultMessageBuilder.java | 76 +-
.../impl/DefaultMessageBuilderFactory.java | 15 +-
.../internal/impl/DefaultModelXmlFactory.java | 32 +-
.../apache/maven/internal/impl/DefaultProject.java | 16 +
.../maven/internal/impl/DefaultProjectBuilder.java | 45 +-
.../apache/maven/internal/impl/DefaultSession.java | 13 +-
.../internal/impl/DefaultSettingsBuilder.java | 2 +-
.../internal/impl/DefaultSettingsXmlFactory.java | 18 +-
.../internal/impl/DefaultSuperPomProvider.java | 24 +-
.../internal/impl/DefaultToolchainsBuilder.java | 11 +-
.../internal/impl/DefaultToolchainsXmlFactory.java | 10 +-
.../maven/internal/impl/DefaultTypeRegistry.java | 2 +-
.../ConsumerPomArtifactTransformer.java | 257 ++--
.../transformation/TransformedArtifact.java | 12 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 3 -
.../apache/maven/lifecycle/DefaultLifecycles.java | 15 +-
.../maven/lifecycle/LifeCyclePluginAnalyzer.java | 1 -
.../lifecycle/LifecycleExecutionException.java | 25 +-
.../apache/maven/lifecycle/LifecycleExecutor.java | 1 -
.../maven/lifecycle/LifecycleMappingDelegate.java | 1 -
.../lifecycle/LifecycleNotFoundException.java | 1 -
.../lifecycle/LifecyclePhaseNotFoundException.java | 1 -
.../maven/lifecycle/MissingProjectException.java | 1 -
.../maven/lifecycle/MojoExecutionConfigurator.java | 1 -
.../maven/lifecycle/NoGoalSpecifiedException.java | 1 -
.../lifecycle/internal/BuildListCalculator.java | 1 -
.../lifecycle/internal/DefaultExecutionEvent.java | 1 -
.../internal/DefaultExecutionEventCatapult.java | 1 -
.../DefaultLifecycleExecutionPlanCalculator.java | 23 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 13 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 17 +-
.../internal/DefaultMojoExecutionConfigurator.java | 17 +-
.../internal/DefaultProjectArtifactFactory.java | 113 +-
.../lifecycle/internal/DependencyContext.java | 2 -
.../lifecycle/internal/ExecutionEventCatapult.java | 1 -
.../lifecycle/internal/ExecutionPlanItem.java | 1 -
.../apache/maven/lifecycle/internal/GoalTask.java | 1 -
.../lifecycle/internal/LifecycleDebugLogger.java | 8 +-
.../internal/LifecycleDependencyResolver.java | 28 +-
.../internal/LifecycleExecutionPlanCalculator.java | 2 -
.../lifecycle/internal/LifecycleModuleBuilder.java | 3 -
.../internal/LifecyclePluginResolver.java | 2 -
.../maven/lifecycle/internal/LifecycleStarter.java | 3 -
.../maven/lifecycle/internal/LifecycleTask.java | 1 -
.../internal/LifecycleTaskSegmentCalculator.java | 4 -
.../lifecycle/internal/MojoDescriptorCreator.java | 4 -
.../maven/lifecycle/internal/MojoExecutor.java | 39 +-
.../maven/lifecycle/internal/PhaseRecorder.java | 2 -
.../maven/lifecycle/internal/ProjectBuildList.java | 41 +-
.../maven/lifecycle/internal/ProjectIndex.java | 2 -
.../maven/lifecycle/internal/ProjectSegment.java | 3 -
.../lifecycle/internal/ReactorBuildStatus.java | 1 -
.../maven/lifecycle/internal/ReactorContext.java | 2 -
.../maven/lifecycle/internal/TaskSegment.java | 2 -
.../maven/lifecycle/internal/builder/Builder.java | 1 -
.../lifecycle/internal/builder/BuilderCommon.java | 1 -
.../multithreaded/ConcurrencyDependencyGraph.java | 1 -
.../multithreaded/MultiThreadedBuilder.java | 5 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 1 -
.../maven/lifecycle/mapping/LifecyclePhase.java | 40 +-
.../providers/WrapperLifecycleProvider.java | 2 +-
.../AbstractLifecycleMappingProvider.java | 16 +-
.../BomLifecycleMappingProvider.java} | 26 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 1 -
.../maven/monitor/event/EventDispatcher.java | 1 -
.../apache/maven/monitor/event/EventMonitor.java | 1 -
.../apache/maven/plugin/BuildPluginManager.java | 1 -
.../java/org/apache/maven/plugin/CacheUtils.java | 1 -
.../java/org/apache/maven/plugin/ClassMap.java | 388 ++++++
.../CycleDetectedInPluginGraphException.java | 1 -
.../maven/plugin/DebugConfigurationListener.java | 1 -
.../maven/plugin/DefaultPluginArtifactsCache.java | 2 -
.../maven/plugin/DefaultPluginDescriptorCache.java | 1 -
.../apache/maven/plugin/ExtensionRealmCache.java | 2 -
.../IntrospectionException.java} | 19 +-
.../maven/plugin/InvalidPluginException.java | 1 -
.../org/apache/maven/plugin/LegacySupport.java | 1 -
.../apache/maven/plugin/MavenPluginManager.java | 1 -
.../java/org/apache/maven/plugin/MethodMap.java | 389 ++++++
.../apache/maven/plugin/PluginArtifactsCache.java | 2 -
.../maven/plugin/PluginConfigurationException.java | 1 -
.../maven/plugin/PluginContainerException.java | 1 -
.../apache/maven/plugin/PluginDescriptorCache.java | 1 -
.../plugin/PluginDescriptorParsingException.java | 1 -
.../maven/plugin/PluginExecutionException.java | 3 +-
.../apache/maven/plugin/PluginLoaderException.java | 1 -
.../maven/plugin/PluginManagerException.java | 1 -
.../maven/plugin/PluginNotFoundException.java | 1 -
.../maven/plugin/PluginParameterException.java | 5 +-
.../plugin/PluginParameterExpressionEvaluator.java | 2 -
.../PluginParameterExpressionEvaluatorV4.java | 2 -
.../org/apache/maven/plugin/PluginRealmCache.java | 2 -
.../maven/plugin/PluginResolutionException.java | 1 -
.../maven/plugin/PluginValidationManager.java | 80 ++
.../maven/plugin/ReflectionValueExtractor.java | 298 +++++
.../AbstractMavenPluginDependenciesValidator.java | 55 +
...PluginDescriptorSourcedParametersValidator.java | 7 +-
.../AbstractMavenPluginParametersValidator.java | 41 +-
.../plugin/internal/DefaultLegacySupport.java | 1 -
.../plugin/internal/DefaultMavenPluginManager.java | 60 +-
.../DefaultPluginDependenciesResolver.java | 31 +-
.../internal/DefaultPluginValidationManager.java | 341 +++++
.../DeprecatedCoreExpressionValidator.java | 21 +-
.../plugin/internal/DeprecatedPluginValidator.java | 57 +-
.../internal/Maven2DependenciesValidator.java | 70 +
.../Maven3CompatDependenciesValidator.java | 62 +
.../internal/MavenMixedDependenciesValidator.java | 69 +
.../MavenPluginConfigurationValidator.java | 6 +-
....java => MavenPluginDependenciesValidator.java} | 20 +-
.../MavenPluginJavaPrerequisiteChecker.java | 3 +-
.../MavenPluginMavenPrerequisiteChecker.java | 7 +-
.../internal/MavenScopeDependenciesValidator.java | 72 ++
.../maven/plugin/internal/MojoLogWrapper.java | 33 +-
...lexusContainerDefaultDependenciesValidator.java | 60 +
.../plugin/internal/PluginConfigurationModule.java | 53 +
.../internal/PluginDependenciesResolver.java | 1 -
.../ReadOnlyPluginParametersValidator.java | 29 +-
.../internal/ValidatingConfigurationListener.java | 1 -
.../plugin/prefix/DefaultPluginPrefixRequest.java | 1 -
.../maven/plugin/prefix/PluginPrefixRequest.java | 1 -
.../maven/plugin/prefix/PluginPrefixResolver.java | 1 -
.../maven/plugin/prefix/PluginPrefixResult.java | 1 -
.../internal/DefaultPluginPrefixResolver.java | 31 +-
.../prefix/internal/DefaultPluginPrefixResult.java | 1 -
.../version/DefaultPluginVersionRequest.java | 1 -
.../maven/plugin/version/PluginVersionRequest.java | 1 -
.../plugin/version/PluginVersionResolver.java | 1 -
.../maven/plugin/version/PluginVersionResult.java | 1 -
.../internal/DefaultPluginVersionResolver.java | 69 +-
.../internal/DefaultPluginVersionResult.java | 1 -
...nException.java => CycleDetectedException.java} | 23 +-
.../DefaultDependencyResolutionRequest.java | 1 -
.../project/DefaultDependencyResolutionResult.java | 1 -
.../project/DefaultModelBuildingListener.java | 3 +-
.../maven/project/DefaultProjectBuilder.java | 114 +-
.../project/DefaultProjectBuildingHelper.java | 10 +-
.../project/DefaultProjectBuildingResult.java | 1 -
.../DefaultProjectDependenciesResolver.java | 13 +-
.../project/DependencyResolutionException.java | 1 -
.../maven/project/DependencyResolutionRequest.java | 1 -
.../maven/project/DependencyResolutionResult.java | 1 -
.../DuplicateArtifactAttachmentException.java | 2 -
.../maven/project/DuplicateProjectException.java | 1 -
.../apache/maven/project/ExtensionDescriptor.java | 1 -
.../maven/project/ExtensionDescriptorBuilder.java | 17 +-
.../main/java/org/apache/maven/project/Graph.java | 125 ++
.../org/apache/maven/project/MavenProject.java | 24 +-
.../maven/project/ProjectBuildingException.java | 1 -
.../maven/project/ProjectBuildingHelper.java | 1 -
.../maven/project/ProjectBuildingResult.java | 1 -
.../maven/project/ProjectDependenciesResolver.java | 1 -
.../apache/maven/project/ProjectModelResolver.java | 1 -
.../apache/maven/project/ProjectRealmCache.java | 2 -
.../org/apache/maven/project/ProjectSorter.java | 30 +-
.../org/apache/maven/project/ReactorModelPool.java | 66 +-
.../artifact/DefaultProjectArtifactsCache.java | 3 -
.../InvalidDependencyVersionException.java | 1 -
.../project/artifact/ProjectArtifactsCache.java | 3 -
.../project/collector/DefaultProjectsSelector.java | 3 +-
.../collector/MultiModuleCollectionStrategy.java | 14 +-
.../properties/internal/EnvironmentUtils.java | 5 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 11 +-
.../settings/SettingsConfigurationException.java | 1 -
.../org/apache/maven/settings/SettingsUtils.java | 1 -
.../org/apache/maven/settings/SettingsUtilsV4.java | 38 +-
.../apache/maven/toolchain/DefaultToolchain.java | 5 +-
.../maven/toolchain/DefaultToolchainManager.java | 1 -
.../toolchain/DefaultToolchainManagerPrivate.java | 2 -
.../toolchain/MisconfiguredToolchainException.java | 1 -
.../apache/maven/toolchain/RequirementMatcher.java | 1 -
.../maven/toolchain/RequirementMatcherFactory.java | 3 -
.../java/org/apache/maven/toolchain/Toolchain.java | 2 -
.../apache/maven/toolchain/ToolchainFactory.java | 1 -
.../apache/maven/toolchain/ToolchainManager.java | 2 -
.../maven/toolchain/ToolchainManagerPrivate.java | 1 -
.../apache/maven/toolchain/ToolchainPrivate.java | 1 -
.../apache/maven/toolchain/java/JavaToolchain.java | 2 -
.../maven/toolchain/java/JavaToolchainFactory.java | 14 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 29 +-
.../DefaultConsumerPomXMLFilterFactory.java | 35 -
maven-core/src/site/apt/default-bindings.apt.vm | 4 +
maven-core/src/site/apt/index.apt | 19 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 6 +-
.../java/org/apache/maven/DefaultMavenTest.java | 8 +-
.../maven/MavenLifecycleParticipantTest.java | 6 +-
.../src/test/java/org/apache/maven/MavenTest.java | 52 -
.../artifact/handler/ArtifactHandlerTest.java | 8 +-
.../filter/ExclusionArtifactFilterTest.java | 49 +-
.../classrealm/DefaultClassRealmManagerTest.java | 164 +++
.../DefaultBeanConfiguratorPathTest.java | 25 +-
.../configuration/DefaultBeanConfiguratorTest.java | 25 +-
.../exception/DefaultExceptionHandlerTest.java | 38 +-
.../DefaultBuildResumptionAnalyzerTest.java | 14 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 12 +-
.../DefaultMavenExecutionRequestPopulatorTest.java | 4 +-
.../maven/execution/DefaultMavenExecutionTest.java | 7 +-
.../scope/internal/MojoExecutionScopeTest.java | 6 +-
.../maven/graph/DefaultGraphBuilderTest.java | 5 +-
.../graph/DefaultProjectDependencyGraphTest.java | 22 +-
.../maven/internal/MultilineMessageHelperTest.java | 6 +-
.../DefaultRepositorySystemSessionFactoryTest.java | 400 ++++++
.../aether/ReverseTreeRepositoryListenerTest.java | 25 +-
.../maven/internal/impl/DefaultSessionTest.java | 62 +
.../maven/internal/impl/PropertiesAsMapTest.java | 4 +-
.../org/apache/maven/internal/impl/TestApi.java | 2 +-
.../maven/internal/impl/TestArtifactHandler.java | 1 -
.../maven/internal/impl/TestRepositorySystem.java | 298 -----
.../ConsumerPomArtifactTransformerTest.java | 61 +-
.../maven/lifecycle/DefaultLifecyclesTest.java | 15 +-
.../lifecycle/EmptyLifecyclePluginAnalyzer.java | 1 -
.../lifecycle/LifecycleExecutorSubModulesTest.java | 5 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 24 +-
.../maven/lifecycle/MavenExecutionPlanTest.java | 11 +-
.../internal/BuildListCalculatorTest.java | 4 +-
.../internal/ConcurrencyDependencyGraphTest.java | 7 +-
.../internal/LifecycleDependencyResolverTest.java | 4 +-
.../LifecycleExecutionPlanCalculatorTest.java | 5 +-
.../internal/LifecycleModuleBuilderTest.java | 4 +-
.../LifecycleTaskSegmentCalculatorImplTest.java | 5 +-
.../lifecycle/internal/PhaseRecorderTest.java | 5 +-
.../lifecycle/internal/ProjectBuildListTest.java | 5 +-
.../internal/builder/BuilderCommonTest.java | 13 +-
.../ConcurrencyDependencyGraphTest.java | 4 +-
.../multithreaded/ThreadOutputMuxerTest.java | 7 +-
.../internal/stub/BuildPluginManagerStub.java | 1 -
.../internal/stub/CompletionServiceStub.java | 1 -
.../internal/stub/DefaultLifecyclesStub.java | 1 -
.../internal/stub/ExecutionEventCatapultStub.java | 1 -
.../internal/stub/LifeCyclePluginAnalyzerStub.java | 1 -
.../stub/LifecycleExecutionPlanCalculatorStub.java | 1 -
.../stub/LifecycleTaskSegmentCalculatorStub.java | 1 -
.../lifecycle/internal/stub/MojoExecutorStub.java | 15 +-
.../internal/stub/PluginPrefixResolverStub.java | 1 -
.../internal/stub/PluginVersionResolverStub.java | 1 -
.../stub/ProjectDependenciesResolverStub.java | 104 --
.../internal/stub/ProjectDependencyGraphStub.java | 1 -
.../stub/ProjectDependencyGraphStubTest.java | 11 +-
.../lifecycle/mapping/LifecyclePhaseTest.java | 7 +-
.../org/apache/maven/model/ModelBuilderTest.java | 63 +
.../org/apache/maven/plugin/PluginManagerTest.java | 24 +-
.../maven/plugin/PluginParameterExceptionTest.java | 11 +-
.../PluginParameterExpressionEvaluatorTest.java | 74 +-
... PluginParameterExpressionEvaluatorV4Test.java} | 95 +-
.../maven/plugin/ReflectionValueExtractorTest.java | 574 +++++++++
.../plugin/internal/DefaultLegacySupportTest.java | 5 +-
.../plugin/internal/MavenPluginValidatorTest.java | 11 +-
.../project/AbstractMavenProjectTestCase.java | 6 +-
.../project/DefaultMavenProjectBuilderTest.java | 35 +-
.../maven/project/EmptyLifecycleExecutor.java | 1 -
.../maven/project/EmptyProjectBuildingHelper.java | 1 -
.../project/ExtensionDescriptorBuilderTest.java | 11 +-
.../java/org/apache/maven/project/GraphTest.java | 233 ++++
.../project/LegacyLocalRepositoryManager.java | 1 -
.../org/apache/maven/project/MavenProjectTest.java | 24 +-
.../apache/maven/project/PomConstructionTest.java | 462 +++++--
.../apache/maven/project/ProjectBuilderTest.java | 43 +-
.../maven/project/ProjectModelResolverTest.java | 27 +-
.../apache/maven/project/ProjectSorterTest.java | 27 +-
.../apache/maven/project/TestMetadataSource.java | 64 -
.../artifact/DefaultProjectArtifactsCacheTest.java | 6 +-
.../canonical/CanonicalProjectBuilderTest.java | 5 +-
.../project/harness/Xpp3DomAttributeIterator.java | 1 -
.../project/harness/Xpp3DomAttributePointer.java | 1 -
.../maven/project/harness/Xpp3DomNodeIterator.java | 6 +-
.../maven/project/harness/Xpp3DomNodePointer.java | 1 -
.../project/harness/Xpp3DomPointerFactory.java | 1 -
.../repository/TestMavenRepositorySystem.java | 61 +
.../maven/repository/TestRepositoryConnector.java | 30 +-
.../repository/TestRepositoryConnectorFactory.java | 1 -
.../internal/DefaultRuntimeInformationTest.java | 6 +-
.../settings/PomConstructionWithSettingsTest.java | 36 +-
.../apache/maven/settings/SettingsUtilsTest.java | 6 +-
.../DefaultToolchainManagerPrivateTest.java | 12 +-
.../toolchain/DefaultToolchainManagerTest.java | 16 +-
.../maven/toolchain/DefaultToolchainTest.java | 20 +-
.../toolchain/RequirementMatcherFactoryTest.java | 7 +-
.../project-with-inheritance/pom.xml | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../maven-plugin-api/2.0/maven-plugin-api-2.0.pom | 2 +-
.../test/resources-project-builder/foo/sub/pom.xml | 4 -
.../resources-project-builder/micromailer/pom.xml | 4 +-
.../plugin-interpolation-build/pom.xml | 123 ++
.../plugin-interpolation-reporting/pom.xml | 123 ++
.../plexus-containers-1.0-alpha-16.pom | 2 +-
.../plexus-containers-1.0-alpha-16.pom | 2 +-
.../projects/future-model-version-pom.xml | 2 +-
.../test/resources/projects/transform/after.pom | 65 +-
.../test/resources/projects/transform/before.pom | 39 +-
.../test/resources/projects/tree/consumer/pom.xml | 16 +
.../src/test/resources/projects/tree/dep/pom.xml | 9 +
.../src/test/resources/projects/tree/pom.xml | 10 +
maven-embedder/pom.xml | 40 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 25 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 23 +-
.../main/java/org/apache/maven/cli/CliRequest.java | 13 +
.../maven/cli/ExtensionConfigurationModule.java | 85 ++
.../main/java/org/apache/maven/cli/MavenCli.java | 352 +++--
.../SettingsXmlConfigurationProcessor.java | 50 +-
.../maven/cli/event/ExecutionEventLogger.java | 63 +-
.../internal/BootstrapCoreExtensionManager.java | 5 +-
.../cli/internal/ExtensionResolutionException.java | 1 -
.../maven/cli/jansi/JansiMessageBuilder.java | 83 +-
.../cli/jansi/JansiMessageBuilderFactory.java | 11 +-
.../org/apache/maven/cli/jansi/MessageUtils.java | 201 +++
.../java/org/apache/maven/cli/jansi/Style.java | 148 +++
.../maven/cli/logging/BaseSlf4jConfiguration.java | 1 -
.../maven/cli/logging/Slf4jConfiguration.java | 1 -
.../cli/logging/Slf4jConfigurationFactory.java | 37 +-
.../org/apache/maven/cli/logging/Slf4jLogger.java | 1 -
.../maven/cli/logging/Slf4jLoggerManager.java | 1 -
.../cli/logging/impl/Log4j2Configuration.java | 1 -
.../cli/logging/impl/LogbackConfiguration.java | 1 -
.../cli/logging/impl/Slf4jSimpleConfiguration.java | 1 -
.../impl/UnsupportedSlf4jBindingConfiguration.java | 37 +-
.../transfer/AbstractMavenTransferListener.java | 51 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 5 +-
.../cli/transfer/QuietMavenTransferListener.java | 1 -
.../sisu/plexus/PlexusXmlBeanConverter.java | 13 +-
maven-embedder/src/main/mdo/core-extensions.mdo | 21 +-
maven-embedder/src/site/apt/logging.apt | 19 +-
.../maven/cli/CLIManagerDocumentationTest.java | 10 +-
.../apache/maven/cli/CLIReportingUtilsTest.java | 4 +-
.../org/apache/maven/cli/CleanArgumentTest.java | 9 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 175 ++-
.../maven/cli/event/ExecutionEventLoggerTest.java | 24 +-
.../maven/cli/transfer/FileSizeFormatTest.java | 18 +-
.../mavenConfigProperties/.mvn/maven.config | 1 +
.../src/test/projects/root-attribute/child/pom.xml | 3 +
.../src/test/projects/root-attribute/pom.xml | 3 +
maven-model-builder/pom.xml | 28 +-
.../java/org/apache/maven/feature/Features.java | 76 --
.../building/AbstractModelBuildingListener.java | 1 -
.../building/AbstractModelSourceTransformer.java | 28 -
.../maven/model/building/ArtifactModelSource.java | 6 +-
.../building/BuildModelSourceTransformer.java | 159 ++-
.../building/DefaultBuildPomXMLFilterFactory.java | 98 --
.../maven/model/building/DefaultModelBuilder.java | 169 ++-
.../model/building/DefaultModelBuilderFactory.java | 40 +-
.../model/building/DefaultModelBuildingEvent.java | 1 -
.../building/DefaultModelBuildingRequest.java | 16 +-
.../model/building/DefaultModelBuildingResult.java | 1 -
.../maven/model/building/DefaultModelProblem.java | 1 -
.../building/DefaultModelProblemCollector.java | 1 -
.../model/building/DefaultModelProcessor.java | 132 +-
.../building/DefaultModelSourceTransformer.java | 39 -
.../model/building/DefaultTransformerContext.java | 20 +-
.../maven/model/building/FileModelSource.java | 17 +-
.../maven/model/building/FileToRawModelMerger.java | 1 -
.../model/building/FilterModelBuildingRequest.java | 13 +-
.../apache/maven/model/building/ModelBuilder.java | 4 +-
.../maven/model/building/ModelBuildingEvent.java | 1 -
.../model/building/ModelBuildingEventCatapult.java | 1 -
.../model/building/ModelBuildingException.java | 10 +-
.../model/building/ModelBuildingListener.java | 1 -
.../maven/model/building/ModelBuildingRequest.java | 15 +-
.../maven/model/building/ModelBuildingResult.java | 1 -
.../apache/maven/model/building/ModelCache.java | 2 -
.../apache/maven/model/building/ModelCacheTag.java | 1 -
.../org/apache/maven/model/building/ModelData.java | 1 -
.../apache/maven/model/building/ModelProblem.java | 1 -
.../model/building/ModelProblemCollector.java | 1 -
.../model/building/ModelProblemCollectorExt.java | 1 -
.../building/ModelProblemCollectorRequest.java | 1 -
.../maven/model/building/ModelProblemUtils.java | 1 -
.../apache/maven/model/building/ModelSource.java | 1 -
.../apache/maven/model/building/ModelSource3.java | 56 +
.../model/building/ModelSourceTransformer.java | 13 +-
.../org/apache/maven/model/building/Result.java | 1 -
.../maven/model/building/StringModelSource.java | 1 -
.../maven/model/building/TransformerContext.java | 16 +-
.../model/building/TransformerContextBuilder.java | 1 -
.../maven/model/building/TransformerException.java | 1 -
.../maven/model/building/UrlModelSource.java | 1 -
.../DefaultDependencyManagementImporter.java | 1 -
.../composition/DependencyManagementImporter.java | 1 -
.../inheritance/DefaultInheritanceAssembler.java | 21 +-
.../model/inheritance/InheritanceAssembler.java | 1 -
.../AbstractStringBasedModelInterpolator.java | 75 +-
.../model/interpolation/ModelInterpolator.java | 1 -
.../interpolation/ProblemDetectingValueSource.java | 75 ++
.../StringVisitorModelInterpolator.java | 15 +-
.../interpolation/UrlNormalizingPostProcessor.java | 1 -
.../apache/maven/model/io/DefaultModelReader.java | 97 +-
.../apache/maven/model/io/DefaultModelWriter.java | 7 +-
.../apache/maven/model/io/ModelParseException.java | 1 -
.../org/apache/maven/model/io/ModelReader.java | 7 +-
.../org/apache/maven/model/io/ModelWriter.java | 1 -
.../maven/model/locator/DefaultModelLocator.java | 18 +-
.../apache/maven/model/locator/ModelLocator.java | 11 +-
.../DefaultDependencyManagementInjector.java | 1 -
.../DefaultPluginManagementInjector.java | 1 -
.../management/DependencyManagementInjector.java | 1 -
.../model/management/PluginManagementInjector.java | 1 -
.../apache/maven/model/merge/MavenModelMerger.java | 8 +-
.../normalization/DefaultModelNormalizer.java | 4 +-
.../maven/model/normalization/ModelNormalizer.java | 1 -
.../model/path/DefaultModelPathTranslator.java | 1 -
.../model/path/DefaultModelUrlNormalizer.java | 1 -
.../maven/model/path/DefaultPathTranslator.java | 1 -
.../maven/model/path/DefaultUrlNormalizer.java | 1 -
.../maven/model/path/ModelPathTranslator.java | 1 -
.../maven/model/path/ModelUrlNormalizer.java | 1 -
.../apache/maven/model/path/PathTranslator.java | 1 -
.../ProfileActivationFilePathInterpolator.java | 20 +-
.../org/apache/maven/model/path/UrlNormalizer.java | 1 -
.../plugin/DefaultPluginConfigurationExpander.java | 14 +-
.../plugin/DefaultReportConfigurationExpander.java | 11 +-
.../model/plugin/DefaultReportingConverter.java | 1 -
.../model/plugin/LifecycleBindingsInjector.java | 1 -
.../model/plugin/PluginConfigurationExpander.java | 1 -
.../model/plugin/ReportConfigurationExpander.java | 1 -
.../maven/model/plugin/ReportingConverter.java | 1 -
.../profile/DefaultProfileActivationContext.java | 1 -
.../model/profile/DefaultProfileInjector.java | 1 -
.../model/profile/DefaultProfileSelector.java | 1 -
.../model/profile/ProfileActivationContext.java | 3 +-
.../maven/model/profile/ProfileInjector.java | 1 -
.../maven/model/profile/ProfileSelector.java | 1 -
.../profile/activation/FileProfileActivator.java | 6 +-
.../activation/JdkVersionProfileActivator.java | 1 -
.../OperatingSystemProfileActivator.java | 9 +-
.../model/profile/activation/ProfileActivator.java | 1 -
.../activation/PropertyProfileActivator.java | 6 +-
.../resolution/InvalidRepositoryException.java | 1 -
.../maven/model/resolution/ModelResolver.java | 1 -
.../resolution/UnresolvableModelException.java | 1 -
.../maven/model/root/DefaultRootLocator.java | 60 +
.../org/apache/maven/model/root/RootLocator.java | 69 +
.../model/superpom/DefaultSuperPomProvider.java | 5 +-
.../maven/model/superpom/SuperPomProvider.java | 3 +-
.../model/validation/DefaultModelValidator.java | 84 +-
.../maven/model/validation/ModelValidator.java | 1 -
.../src/main/java/org/apache/maven/utils/Os.java | 215 ++++
.../org.apache.maven.model.root.RootLocator | 1 +
.../resources/org/apache/maven/model/pom-4.0.0.xml | 30 +-
maven-model-builder/src/site/apt/index.apt | 22 +-
.../building/BuildModelSourceTransformerTest.java | 150 +++
.../model/building/ComplexActivationTest.java | 5 +-
.../building/DefaultModelBuilderFactoryTest.java | 7 +-
.../model/building/DefaultModelBuilderTest.java | 7 +-
.../maven/model/building/FileModelSourceTest.java | 6 +-
.../model/building/FileToRawModelMergerTest.java | 4 +-
.../model/building/ModelBuildingExceptionTest.java | 37 +-
.../model/building/SimpleProblemCollector.java | 13 +-
.../DefaultInheritanceAssemblerTest.java | 36 +-
.../apache/maven/model/inheritance/MergerTest.java | 111 ++
.../AbstractModelInterpolatorTest.java | 84 +-
.../interpolation/MavenBuildTimestampTest.java | 4 +-
.../StringVisitorModelInterpolatorTest.java | 2 +-
.../maven/model/merge/MavenModelMergerTest.java | 10 +-
.../maven/model/path/DefaultUrlNormalizerTest.java | 17 +-
.../activation/AbstractProfileActivatorTest.java | 1 -
.../activation/FileProfileActivatorTest.java | 36 +-
.../activation/JdkVersionProfileActivatorTest.java | 17 +-
.../activation/PropertyProfileActivatorTest.java | 23 +-
.../validation/DefaultModelValidatorTest.java | 143 ++-
.../resources/poms/validation/modelVersion-4_0.xml | 8 +-
maven-model-transform/pom.xml | 52 -
.../transform/BuildToRawPomXMLFilterFactory.java | 95 --
.../maven/model/transform/CiFriendlyXMLFilter.java | 75 --
.../maven/model/transform/FastForwardFilter.java | 111 --
.../maven/model/transform/ModulesXMLFilter.java | 41 -
.../maven/model/transform/ParentXMLFilter.java | 146 ---
.../RawToConsumerPomXMLFilterFactory.java | 50 -
.../transform/ReactorDependencyXMLFilter.java | 98 --
.../model/transform/RelativePathXMLFilter.java | 67 -
.../maven/model/transform/RelativeProject.java | 50 -
.../model/transform/pull/BufferingParser.java | 445 -------
.../model/transform/pull/NodeBufferingParser.java | 71 --
.../maven/model/transform/pull/XmlUtils.java | 118 --
maven-model-transform/src/site/apt/index.apt | 73 --
.../model/transform/AbstractXMLFilterTests.java | 51 -
.../model/transform/CiFriendlyXMLFilterTest.java | 52 -
.../model/transform/ConsumerPomXMLFilterTest.java | 228 ----
.../model/transform/ModulesXMLFilterTest.java | 86 --
.../maven/model/transform/ParentXMLFilterTest.java | 315 -----
.../transform/ReactorDependencyXMLFilterTest.java | 141 --
.../model/transform/RelativePathXMLFilterTest.java | 108 --
maven-model/pom.xml | 31 +-
.../maven/model/io/xpp3/MavenXpp3Reader.java | 55 +-
.../maven/model/io/xpp3/MavenXpp3ReaderEx.java | 98 +-
.../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 | 29 +-
.../org/apache/maven/model/DependencyTest.java | 11 +-
.../maven/model/DeploymentRepositoryTest.java | 11 +-
.../java/org/apache/maven/model/DeveloperTest.java | 22 +-
.../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 | 26 +-
.../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 +-
.../org/apache/maven/model/SerializationTest.java | 4 +-
.../test/java/org/apache/maven/model/SiteTest.java | 11 +-
.../apache/maven/model/merge/MavenMergerTest.java | 9 +-
.../maven/model/v4/MavenModelVersionTest.java | 44 +-
.../org/apache/maven/model/v4/ModelXmlTest.java | 11 +-
.../org/apache/maven/model/v4/Xpp3DomPerfTest.java | 100 ++
maven-plugin-api/pom.xml | 17 +-
.../java/org/apache/maven/plugin/AbstractMojo.java | 3 -
.../plugin/AbstractMojoExecutionException.java | 1 -
.../org/apache/maven/plugin/ContextEnabled.java | 1 -
.../main/java/org/apache/maven/plugin/Mojo.java | 1 -
.../maven/plugin/MojoExecutionException.java | 1 -
.../apache/maven/plugin/MojoFailureException.java | 1 -
.../descriptor/InvalidParameterException.java | 1 -
.../apache/maven/plugin/descriptor/Parameter.java | 1 -
.../maven/plugin/descriptor/PluginDescriptor.java | 18 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 26 +-
.../maven/plugin/descriptor/Requirement.java | 1 -
.../java/org/apache/maven/plugin/logging/Log.java | 1 -
.../maven/plugin/logging/SystemStreamLog.java | 1 -
maven-plugin-api/src/main/mdo/plugin.mdo | 7 +-
maven-plugin-api/src/site/apt/index.apt | 12 +-
maven-plugin-api/src/site/site.xml | 4 +-
.../plugin/descriptor/MojoDescriptorTest.java | 4 +-
.../descriptor/PluginDescriptorBuilderTest.java | 9 +-
maven-repository-metadata/pom.xml | 53 +-
.../artifact/repository/metadata/BaseObject.java | 61 +
.../metadata/io/xpp3/MetadataXpp3Reader.java | 157 +++
.../metadata/io/xpp3/MetadataXpp3Writer.java | 73 ++
.../src/main/mdo/metadata.mdo | 20 +-
maven-repository-metadata/src/site/apt/index.apt | 8 +-
.../artifact/repository/metadata/MetadataTest.java | 28 +-
maven-resolver-provider/pom.xml | 11 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 8 +-
.../internal/ArtifactDescriptorUtils.java | 3 +-
.../internal/DefaultArtifactDescriptorReader.java | 2 +-
.../repository/internal/DefaultModelCache.java | 3 +-
.../repository/internal/DefaultModelResolver.java | 1 -
.../internal/DefaultVersionRangeResolver.java | 13 +-
.../internal/DefaultVersionResolver.java | 24 +-
.../repository/internal/LocalSnapshotMetadata.java | 63 +-
.../internal/LocalSnapshotMetadataGenerator.java | 9 +-
.../maven/repository/internal/MavenMetadata.java | 34 +-
.../internal/MavenRepositorySystemUtils.java | 1 -
.../repository/internal/MavenResolverModule.java | 1 +
.../repository/internal/MavenSnapshotMetadata.java | 16 +-
.../internal/PluginsMetadataGenerator.java | 12 +-
.../internal/PluginsMetadataGeneratorFactory.java | 4 +-
.../repository/internal/RelocatedArtifact.java | 10 +-
.../internal/RemoteSnapshotMetadata.java | 15 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 9 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 4 +-
.../repository/internal/VersionsMetadata.java | 5 +
.../internal/VersionsMetadataGenerator.java | 7 +-
.../internal/VersionsMetadataGeneratorFactory.java | 4 +-
.../DefaultArtifactDescriptorReaderTest.java | 4 +-
.../internal/DefaultModelResolverTest.java | 24 +-
.../internal/DefaultVersionResolverTest.java | 6 +-
.../internal/MavenRepositorySystemUtilsTest.java | 4 +-
.../internal/RemoteSnapshotMetadataTest.java | 11 +-
.../repository/internal/RepositorySystemTest.java | 24 +-
maven-settings-builder/pom.xml | 14 +-
.../settings/building/DefaultSettingsBuilder.java | 129 +-
.../building/DefaultSettingsBuilderFactory.java | 1 -
.../building/DefaultSettingsBuildingRequest.java | 29 +-
.../building/DefaultSettingsBuildingResult.java | 1 -
.../settings/building/DefaultSettingsProblem.java | 1 -
.../building/DefaultSettingsProblemCollector.java | 1 -
.../settings/building/FileSettingsSource.java | 1 -
.../maven/settings/building/SettingsBuilder.java | 4 +-
.../building/SettingsBuildingException.java | 1 -
.../settings/building/SettingsBuildingRequest.java | 35 +-
.../settings/building/SettingsBuildingResult.java | 1 -
.../maven/settings/building/SettingsProblem.java | 1 -
.../building/SettingsProblemCollector.java | 1 -
.../maven/settings/building/SettingsSource.java | 1 -
.../settings/building/StringSettingsSource.java | 1 -
.../maven/settings/building/UrlSettingsSource.java | 1 -
.../settings/crypto/DefaultSettingsDecrypter.java | 1 -
.../crypto/DefaultSettingsDecryptionRequest.java | 1 -
.../crypto/DefaultSettingsDecryptionResult.java | 1 -
.../maven/settings/crypto/SettingsDecrypter.java | 1 -
.../settings/crypto/SettingsDecryptionRequest.java | 1 -
.../settings/crypto/SettingsDecryptionResult.java | 1 -
.../maven/settings/io/DefaultSettingsReader.java | 41 +-
.../maven/settings/io/DefaultSettingsWriter.java | 25 +-
.../maven/settings/io/SettingsParseException.java | 1 -
.../apache/maven/settings/io/SettingsReader.java | 1 -
.../apache/maven/settings/io/SettingsWriter.java | 1 -
.../maven/settings/merge/MavenSettingsMerger.java | 8 +-
.../validation/DefaultSettingsValidator.java | 79 +-
.../settings/validation/SettingsValidator.java | 12 +-
.../DefaultSettingsBuilderFactoryTest.java | 5 +-
.../validation/DefaultSettingsValidatorTest.java | 25 +-
maven-settings/pom.xml | 43 +-
.../org/apache/maven/settings/WrapperList.java | 105 --
.../apache/maven/settings/WrapperProperties.java | 333 -----
.../maven/settings/io/xpp3/SettingsXpp3Reader.java | 56 +-
.../maven/settings/io/xpp3/SettingsXpp3Writer.java | 1 +
maven-slf4j-provider/pom.xml | 13 +-
.../java/org/slf4j/impl/MavenLoggerFactory.java | 9 +-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 67 +-
.../src/site/apt/index.apt | 18 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 10 +-
.../java/org/slf4j/impl/MavenSimpleLoggerTest.java | 78 ++
maven-slf4j-wrapper/pom.xml | 2 +-
.../maven/logwrapper/LogLevelRecorderTest.java | 10 +-
maven-toolchain-builder/pom.xml | 6 +-
.../building/DefaultToolchainsBuilder.java | 1 -
.../building/DefaultToolchainsBuildingRequest.java | 1 -
.../building/DefaultToolchainsBuildingResult.java | 1 -
.../toolchain/building/ToolchainsBuilder.java | 1 -
.../building/ToolchainsBuildingException.java | 1 -
.../building/ToolchainsBuildingRequest.java | 1 -
.../building/ToolchainsBuildingResult.java | 1 -
.../toolchain/io/DefaultToolchainsReader.java | 37 +-
.../toolchain/io/DefaultToolchainsWriter.java | 9 +-
.../toolchain/io/ToolchainsParseException.java | 1 -
.../maven/toolchain/io/ToolchainsReader.java | 1 -
.../maven/toolchain/io/ToolchainsWriter.java | 2 -
.../toolchain/merge/MavenToolchainMerger.java | 1 -
.../building/DefaultToolchainsBuilderTest.java | 22 +-
.../building/ToolchainsBuildingExceptionTest.java | 10 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 10 +-
.../toolchain/merge/toolchains-jdks-extend.xml | 2 +-
.../toolchain/merge/toolchains-jdks-extra.xml | 2 +-
.../maven/toolchain/merge/toolchains-jdks.xml | 2 +-
maven-toolchain-model/pom.xml | 18 +-
.../apache/maven/toolchain/model/WrapperList.java | 105 --
.../maven/toolchain/model/WrapperProperties.java | 333 -----
maven-xml-impl/pom.xml | 26 +-
.../maven/internal/xml/MavenXmlException.java | 39 -
.../apache/maven/internal/xml/XmlNodeBuilder.java | 115 +-
.../org/apache/maven/internal/xml/XmlNodeImpl.java | 19 +-
.../java/org/codehaus/plexus/util/xml/Xpp3Dom.java | 422 ------
.../codehaus/plexus/util/xml/Xpp3DomBuilder.java | 94 --
.../org/codehaus/plexus/util/xml/package-info.java | 10 -
.../{README.md => src/site/markdown/index.md} | 2 +-
.../src/site/site.xml | 0
.../maven/internal/xml/XmlNodeBuilderTest.java | 29 +-
.../apache/maven/internal/xml/XmlNodeImplTest.java | 394 +++++-
plexus-utils/README.md | 26 -
plexus-utils/pom.xml | 166 ---
pom.xml | 120 +-
.../mdo/java}/ImmutableCollections.java | 8 +-
.../maven/model => src/mdo/java}/WrapperList.java | 2 +-
.../model => src/mdo/java}/WrapperProperties.java | 2 +-
src/mdo/merger.vm | 276 ++--
src/mdo/model-v3.vm | 220 ++--
src/mdo/model-version.vm | 184 +++
src/mdo/model.vm | 235 ++--
src/mdo/reader-ex.vm | 669 +++++++---
src/mdo/reader-modified.vm | 681 +++++++---
src/mdo/reader-stax.vm | 935 ++++++++++++++
src/mdo/reader.vm | 1343 +++++++++++---------
src/mdo/transformer.vm | 122 +-
src/mdo/writer-ex.vm | 282 ++--
src/mdo/writer-stax.vm | 511 ++++++++
src/mdo/writer.vm | 227 ++--
src/site/xdoc/index.xml | 9 +-
1170 files changed, 18141 insertions(+), 13635 deletions(-)
create mode 100644
apache-maven/src/main/appended-resources/licenses/unrecognized-asm-9.5.txt
create mode 100644
apache-maven/src/main/appended-resources/licenses/unrecognized-stax2-api-4.2.1.txt
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java
copy {maven-model-builder/src/main/java/org/apache/maven/model/superpom =>
api/maven-api-core/src/main/java/org/apache/maven/api/services}/SuperPomProvider.java
(71%)
delete mode 100644
api/maven-api-model/src/main/java/org/apache/maven/api/model/ImmutableCollections.java
delete mode 100644
api/maven-api-settings/src/main/java/org/apache/maven/api/settings/ImmutableCollections.java
copy api/{maven-api-model/src/main/java/org/apache/maven/api/model =>
maven-api-settings/src/main/java/org/apache/maven/api/settings}/InputLocation.java
(99%)
copy
maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java =>
api/maven-api-settings/src/main/java/org/apache/maven/api/settings/InputLocationTracker.java
(84%)
copy api/{maven-api-model/src/main/java/org/apache/maven/api/model =>
maven-api-settings/src/main/java/org/apache/maven/api/settings}/InputSource.java
(70%)
copy
maven-resolver-provider/src/test/java/org/apache/maven/repository/internal/MavenRepositorySystemUtilsTest.java
=>
api/maven-api-settings/src/test/java/org/apache/maven/api/settings/SettingsTest.java
(61%)
copy api/{maven-api-xml => maven-api-spi}/pom.xml (76%)
create mode 100644
api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ModelParser.java
copy
maven-core/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
=>
api/maven-api-spi/src/main/java/org/apache/maven/api/spi/ModelParserException.java
(55%)
delete mode 100644
api/maven-api-toolchain/src/main/java/org/apache/maven/api/toolchain/ImmutableCollections.java
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/ArtifactFilterManager.java (99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/ArtifactFilterManagerDelegate.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
(100%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/ProjectDependenciesResolver.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/metadata/AbstractArtifactMetadata.java
(100%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
(100%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
(100%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/metadata/ResolutionGroup.java
(100%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java
(87%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java
(97%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataDeploymentException.java
(95%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataInstallationException.java
(95%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataResolutionException.java
(95%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionResult.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/resolver/DefaultResolutionErrorHandler.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ResolutionErrorHandler.java
(97%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ResolutionListener.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/plugin/PluginManager.java (98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/plugin/internal/DefaultPluginManager.java
(99%)
delete mode 100644
maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
delete mode 100644
maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/project/artifact/DefaultMavenMetadataCache.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/project/artifact/DefaultMetadataSource.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/project/artifact/MavenMetadataCache.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(97%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
(95%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/project/path/PathTranslator.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/ArtifactDoesNotExistException.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferEvent.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferFailedException.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferListener.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/ArtifactTransferResource.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/DelegatingLocalArtifactRepository.java
(100%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/LocalArtifactRepository.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/LocalRepositoryNotAccessibleException.java
(97%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/RepositorySystem.java
(94%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/AbstractArtifactMetadata.java
(96%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataRetrievalException.java
(97%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadataSource.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/DefaultMetadataResolutionRequest.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/MetadataResolutionRequest.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/repository/legacy/metadata/ResolutionGroup.java
(99%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
(97%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
(98%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
(86%)
rename {maven-core =>
maven-compat}/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
(94%)
copy {maven-core =>
maven-compat}/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
(98%)
rename {maven-core =>
maven-compat}/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
(93%)
copy
maven-compat/src/test/java/org/apache/maven/artifact/{deployer/SimpleArtifactMetadataSource.java
=> metadata/SwitchableMetadataSource.java} (52%)
rename {maven-core =>
maven-compat}/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java
(88%)
rename {maven-core =>
maven-compat}/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
(95%)
rename {maven-core =>
maven-compat}/src/test/java/org/apache/maven/repository/TestArtifactHandler.java
(98%)
rename {maven-core =>
maven-compat}/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
(95%)
rename {maven-core =>
maven-compat}/src/test/projects/project-dependencies-resolver/it0063/jdk/jre/placeholder.txt
(100%)
rename {maven-core =>
maven-compat}/src/test/projects/project-dependencies-resolver/it0063/jdk/lib/tools.jar
(100%)
rename {maven-core =>
maven-compat}/src/test/projects/project-dependencies-resolver/it0063/pom.xml
(100%)
rename {maven-core =>
maven-compat}/src/test/projects/project-dependencies-resolver/project-with-exclusions/pom.xml
(100%)
copy
maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java
=>
maven-core/src/main/java/org/apache/maven/artifact/handler/providers/BomArtifactHandlerProvider.java
(57%)
copy
maven-model-builder/src/main/java/org/apache/maven/model/locator/DefaultModelLocator.java
=>
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSuperPomProvider.java
(61%)
copy
maven-core/src/main/java/org/apache/maven/lifecycle/providers/{WrapperLifecycleProvider.java
=> packaging/BomLifecycleMappingProvider.java} (60%)
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/ClassMap.java
copy
maven-core/src/main/java/org/apache/maven/{toolchain/MisconfiguredToolchainException.java
=> plugin/IntrospectionException.java} (74%)
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/MethodMap.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/PluginValidationManager.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/ReflectionValueExtractor.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/AbstractMavenPluginDependenciesValidator.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginValidationManager.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/Maven2DependenciesValidator.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/Maven3CompatDependenciesValidator.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/MavenMixedDependenciesValidator.java
copy
maven-core/src/main/java/org/apache/maven/plugin/internal/{MavenPluginConfigurationValidator.java
=> MavenPluginDependenciesValidator.java} (63%)
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/MavenScopeDependenciesValidator.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/PlexusContainerDefaultDependenciesValidator.java
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/PluginConfigurationModule.java
copy
maven-core/src/main/java/org/apache/maven/project/{DependencyResolutionException.java
=> CycleDetectedException.java} (66%)
create mode 100644 maven-core/src/main/java/org/apache/maven/project/Graph.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/xml/internal/DefaultConsumerPomXMLFilterFactory.java
delete mode 100644 maven-core/src/test/java/org/apache/maven/MavenTest.java
create mode 100644
maven-core/src/test/java/org/apache/maven/classrealm/DefaultClassRealmManagerTest.java
create mode 100644
maven-core/src/test/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactoryTest.java
create mode 100644
maven-core/src/test/java/org/apache/maven/internal/impl/DefaultSessionTest.java
delete mode 100644
maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java
delete mode 100644
maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/ProjectDependenciesResolverStub.java
create mode 100644
maven-core/src/test/java/org/apache/maven/model/ModelBuilderTest.java
copy
maven-core/src/test/java/org/apache/maven/plugin/{PluginParameterExpressionEvaluatorTest.java
=> PluginParameterExpressionEvaluatorV4Test.java} (76%)
create mode 100644
maven-core/src/test/java/org/apache/maven/plugin/ReflectionValueExtractorTest.java
create mode 100644
maven-core/src/test/java/org/apache/maven/project/GraphTest.java
delete mode 100644
maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java
create mode 100644
maven-core/src/test/java/org/apache/maven/repository/TestMavenRepositorySystem.java
create mode 100644
maven-core/src/test/resources-project-builder/plugin-interpolation-build/pom.xml
create mode 100644
maven-core/src/test/resources-project-builder/plugin-interpolation-reporting/pom.xml
create mode 100644 maven-core/src/test/resources/projects/tree/consumer/pom.xml
create mode 100644 maven-core/src/test/resources/projects/tree/dep/pom.xml
create mode 100644 maven-core/src/test/resources/projects/tree/pom.xml
create mode 100644
maven-embedder/src/main/java/org/apache/maven/cli/ExtensionConfigurationModule.java
copy
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java
=>
maven-embedder/src/main/java/org/apache/maven/cli/jansi/JansiMessageBuilder.java
(61%)
copy
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java
=>
maven-embedder/src/main/java/org/apache/maven/cli/jansi/JansiMessageBuilderFactory.java
(80%)
create mode 100644
maven-embedder/src/main/java/org/apache/maven/cli/jansi/MessageUtils.java
create mode 100644
maven-embedder/src/main/java/org/apache/maven/cli/jansi/Style.java
create mode 100644
maven-embedder/src/test/projects/root-attribute/child/pom.xml
create mode 100644 maven-embedder/src/test/projects/root-attribute/pom.xml
delete mode 100644
maven-model-builder/src/main/java/org/apache/maven/feature/Features.java
delete mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelSourceTransformer.java
delete mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
delete mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelSourceTransformer.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelSource3.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/root/DefaultRootLocator.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/root/RootLocator.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/utils/Os.java
create mode 100644
maven-model-builder/src/main/resources/META-INF/services/org.apache.maven.model.root.RootLocator
create mode 100644
maven-model-builder/src/test/java/org/apache/maven/model/building/BuildModelSourceTransformerTest.java
copy
maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java
=>
maven-model-builder/src/test/java/org/apache/maven/model/building/ModelBuildingExceptionTest.java
(54%)
create mode 100644
maven-model-builder/src/test/java/org/apache/maven/model/inheritance/MergerTest.java
copy maven-core/src/test/resources/projects/future-model-version-pom.xml =>
maven-model-builder/src/test/resources/poms/validation/modelVersion-4_0.xml
(83%)
delete mode 100644 maven-model-transform/pom.xml
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterFactory.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/CiFriendlyXMLFilter.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/FastForwardFilter.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/ModulesXMLFilter.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/ParentXMLFilter.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/RawToConsumerPomXMLFilterFactory.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/ReactorDependencyXMLFilter.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/RelativePathXMLFilter.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/RelativeProject.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/BufferingParser.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/NodeBufferingParser.java
delete mode 100644
maven-model-transform/src/main/java/org/apache/maven/model/transform/pull/XmlUtils.java
delete mode 100644 maven-model-transform/src/site/apt/index.apt
delete mode 100644
maven-model-transform/src/test/java/org/apache/maven/model/transform/AbstractXMLFilterTests.java
delete mode 100644
maven-model-transform/src/test/java/org/apache/maven/model/transform/CiFriendlyXMLFilterTest.java
delete mode 100644
maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java
delete mode 100644
maven-model-transform/src/test/java/org/apache/maven/model/transform/ModulesXMLFilterTest.java
delete mode 100644
maven-model-transform/src/test/java/org/apache/maven/model/transform/ParentXMLFilterTest.java
delete mode 100644
maven-model-transform/src/test/java/org/apache/maven/model/transform/ReactorDependencyXMLFilterTest.java
delete mode 100644
maven-model-transform/src/test/java/org/apache/maven/model/transform/RelativePathXMLFilterTest.java
copy
maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java
=>
maven-model/src/test/java/org/apache/maven/model/v4/MavenModelVersionTest.java
(50%)
create mode 100644
maven-model/src/test/java/org/apache/maven/model/v4/Xpp3DomPerfTest.java
create mode 100644
maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/BaseObject.java
create mode 100644
maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
create mode 100644
maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
delete mode 100644
maven-settings/src/main/java/org/apache/maven/settings/WrapperList.java
delete mode 100644
maven-settings/src/main/java/org/apache/maven/settings/WrapperProperties.java
copy {maven-plugin-api => maven-slf4j-provider}/src/site/apt/index.apt (64%)
create mode 100644
maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenSimpleLoggerTest.java
delete mode 100644
maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/WrapperList.java
delete mode 100644
maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/WrapperProperties.java
delete mode 100644
maven-xml-impl/src/main/java/org/apache/maven/internal/xml/MavenXmlException.java
delete mode 100644
maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
delete mode 100644
maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/Xpp3DomBuilder.java
delete mode 100644
maven-xml-impl/src/main/java/org/codehaus/plexus/util/xml/package-info.java
rename maven-xml-impl/{README.md => src/site/markdown/index.md} (94%)
rename {maven-model-transform => maven-xml-impl}/src/site/site.xml (100%)
copy
maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java
=>
maven-xml-impl/src/test/java/org/apache/maven/internal/xml/XmlNodeBuilderTest.java
(58%)
delete mode 100644 plexus-utils/README.md
delete mode 100644 plexus-utils/pom.xml
rename {maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle =>
src/mdo/java}/ImmutableCollections.java (98%)
rename {maven-model/src/main/java/org/apache/maven/model =>
src/mdo/java}/WrapperList.java (99%)
rename {maven-model/src/main/java/org/apache/maven/model =>
src/mdo/java}/WrapperProperties.java (99%)
create mode 100644 src/mdo/model-version.vm
create mode 100644 src/mdo/reader-stax.vm
create mode 100644 src/mdo/writer-stax.vm
