This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch MNG-7173-resolver-guice-module
in repository https://gitbox.apache.org/repos/asf/maven.git.
from d2ef32f [MNG-7173] The maven-resolver-provider:MavenResolverModule is
broken
add f5d19f4 Run Maven ITs with more JDKs
add 6b56fc8 [MNG-7175] Upgrade Maven Resolver to 1.7.1
add 6bed162 [MNG-7172] Remove expansion of Jansi native libraries
add 73e00ed [MNG-6843] Parallel build fails due to missing JAR artifacts
in compilePath
add cbaf7f7 Change @since from 3.7.0 to 4.0.0
add b551be7 Document hacks as such
add 78fc373 Trim trailing whitespace
add 3670933 Add new ignores
add d8be2f0 Add RAT exclude
add a70828c [MNG-7180] Make --color option behave more like BSD/GNU
grep's --color option
add 1fc605d [MNG-7181] Make --version support -q
add a7010c5 [MNG-6840] Upgrade commons-lang3 to 3.12.0
add 46410d3 Improve the use of checkstyle in the build (#477)
add 1052ec5 [MNG-7184] document .mavenrc/mavenrc_pre.bat|cmd and
MAVEN_SKIP_RC
add e29a661 [MNG-7185] Describe explicit and recommended version for
VersionRange.createFromVersionSpec()
add e8b9cad Wrap line in consistency with Command script
add e9a54c6 Use proper term: directory
add 94df4a8 Apply consistent formatting
add 8712063 [MNG-7190] Load mavenrc from /usr/local/etc also in Bourne
shell script
add 2321e03 [MNG-7190] add /usr/local/etc/mavenrc to reference
documentation
add f582ce8 [MNG-7047] Validate that repo configuration does not contain
any expression
add 0696cf1 [MNG-7131] maven.config doesn't handle arguments with spaces
in them
add b8cdac5 [MNG-7189] Remove undocumented environment variable
MAVEN_BASEDIR in startup scripts
add 6b37fcb [MNG-7191] Remove undocumented environment variable
MAVEN_CONFIG in startup scripts
add 1328d6e [MNG-7192] Remove unsed MAVEN_CMD_LINE_ARGS environment
variable in startup scripts
add a2f8106 [MNG-6656] Features must use userProperties instead of
systemProperties
add f7a775b [MNG-6648] 'mavenrc_pre' script does not receive arguments
like mavenrc in Bourne shell does
add a2ab329 Warn also on Windows when JAVA_HOME isn't set
add 9c69c78 remove unused property
add 5fa834f [MNG-7010] Omit "NB: JAVA_HOME should point to a JDK not a
JRE"
add 021e53f [MNG-7196] Upgrade Jansi to 2.3.4
add 6c67c9d [MNG-7197] Simplify exit code handling in Windows command
startup script
add a21be1d [MNG-7195] Rework JAVA_HOME handling
add 52c12da [MNG-7195] Rework JAVA_HOME handling
add 06bc508 [MNG-7198] Upgrade SLF4J to 1.7.32
add 43eb189 [chore] Update CI environment
add ef62d7a Merge pull request #516 from aheritier/ci-maven
add 750cb6c [MNG-7199] MAVENHOME_CONFIG var in mvnlauncher script
improperly handles two options at once
add a2a3df3 [MNG-7203] Introduce a long option --verbose and deprecate
--debug
add 5acdfb6 [MNG-7205] Simplify/unify Cygwin/MingGW handling in startup
scripts
add 0137f35 Document Maven 3.8.2 release
add f594c0b Add ModelSource test for MNG-5669
add 48a9e04 [MNG-7209] Introduce a user mavenrc.cmd in Windows command
script
add 0682a1c [MNG-7208] Introduce a system-wide mavenrc.cmd in Windows
command script
add b20bfb1 [MNG-7208] Document system-wide mavenrc.cmd in Windows
command script
add 92d2c2e [MNG-7209] Document user mavenrc.cmd in Windows command script
add 76d7f58 [MNG-7226] DefaultModelBuilder.buildRawModel fails (#528)
add 067171d [MNG-7246] Upgrade Plexus Cipher and Sec Dispatcher to 2.0
add aa30d96 [MNG-7247] Upgrade Maven Resolver to 1.7.2
add 406c525 [MNG-7250] Upgrade Sisu Inject/Plexus to 0.3.5
add a6e462b [MNG-7251] Fix threadLocalArtifactsHolder leaking into cloned
project
add 6b6589b [MNG-7219] [Regression] plexus-cipher missing from transitive
dependencies
add 23ffe33 [MNG-7236] The DefaultPluginVersionResolver should cache
results for the session
add 8c297e9 [MNG-7254] Expand Windows native libraries for Jansi due to
JDK-8195129 (workaround)
add a1ba330 [MNG-7253] Display relocation message defined in model
add f50de4c [MNG-7210] Deprecate mavenrc_{pre,post}.{bat,cmd} scripts
add 5fd5368 [MNG-7248] Fix warnings issued by dependency:analyze
add ad2e084 [MNG-7164] Add constructor MojoExecutionException(Throwable)
add 9735fff added an "ignore" option for checksumPolicy in documents
add 9539227 set "fail" as a default option for checksumPolicy in documents
add 98b69be deleted duplication in checksum description
add b718287 Default value of checksumPolicy depends on the Maven version
add 2926f03 [MNG-7265] Convert maven-core artifact-handlers.xml to
Providers
add 4cb8909 Convert maven-core components XML to Providers
add c647dbc Get rid of guava
add 9f348e9 PlexusCipher should be injected
add 6c34313 Merge pull request #549 from apache/drop-components-xml
add 6c7d105 [MNG-7264] Convert maven-core default-bindings to Providers
(#550)
add c8d5ba3 [MNG-7235] Speed improvements when calculating the sorted
project graph
add 25cf157 [MNG-7271] - Code Improvement
add 038201e [MNG-7274] - JUnit Jupiter via BOM
add 5c9512f [MNG-7275] - fixing resource leak due to Files.list
add edbf133 [MNG-7277] - Remove useless Test -
testNonNumericVersionRepresentationReturnsANumberFormatException
add e30c1bf Add a unit test for MavenRepositorySystemUtils#newSession
add 1ab49b3 Remove deprecated usage of ServiceLocator/Service
add 35e5a4d [MNG-5577] Use JSR 330 constructor injection
add 71a0a49 [MNG-7272] - Code Improvement - II
add d141957 [MNG-7055] Fix G level metadata handling (#555)
add af9c64f [MNG-6898] Drop plexus-component-metadata plugin from
maven-core (#554)
add c3962c1 [MNG-7278] Clean up core logging (#562)
add 7934f73 Update DOAP with Maven 3.8.3 release
add 69ee0c8 [MNG-7103] VersionScheme provider (#563)
add d75bea4 [MNG-7279] Drop deprecated constructor (#564)
add 3017b85 Refactor MavenSession#getPluginContext to be thread safe
(#575)
add e50d65d MNG-7295 - Remove redundant/unused import statements.
add 4fafe44 MNG-7296 - Remove redundant 'if' statement
add c825b97 (doc) Update GH build config - bump 17-ea to 17, use new
setup-java@2 action
add ccb76b0 (doc) Update dead link for Github PR docs
add fbb9d95 MNG-7293:fix resource leak due to Files.walk
add b9fb762 [MNG-7292] Unnecessarily escaped character
add d61fcf7 [MNG-7288] Remove redundant local variables
add 16afe06 [MNG-7290] Java8 improvements
add 2579622 fix indentation
add b31f3ae [MNG-7291] Avoid String concatenation in loops (#572)
add 4daa48e [MNG-7287] Simplify assertion with simpler and equivalent
calls
add 0080e84 [MNG-7297] Remove redundant type arguments (#581)
add 8852b87 [MNG-7270] Switch to shell alternative to "which"
add ffc2b99 [MNG-6389] Move the toolchains model to a separate artifactId
add 274388f [MNG-7303] - Replace Throwable.initCause() with constructor.
add 4c21e11 [MNG-7298] - Avoid redundant conditions.
add 796e02c Merge remote-tracking branch 'origin/master' into
MNG-7173-resolver-guice-module
add 3efdbc2 Fix the module, make test pass
add ba4785c Add comments
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml | 24 +-
.gitignore | 3 +-
.mvn/readme.txt | 1 +
CONTRIBUTING.md | 10 +-
Jenkinsfile | 8 +-
README.md | 16 +-
apache-maven/pom.xml | 6 +-
apache-maven/src/assembly/maven/bin/mvnDebug | 2 +-
apache-maven/src/assembly/maven/bin/mvnDebug.cmd | 4 +-
apache-maven/src/assembly/maven/component.xml | 15 +-
.../src/assembly/maven/lib/jansi-native/README.txt | 11 +-
apache-maven/src/assembly/shared/init | 82 ++---
apache-maven/src/assembly/shared/init.cmd | 7 +-
apache-maven/src/assembly/shared/mvnlauncher | 3 +-
apache-maven/src/assembly/shared/mvnlauncher.cmd | 1 -
apache-maven/src/assembly/shared/mvnwDebug | 2 +-
apache-maven/src/assembly/shared/mvnwDebug.cmd | 2 +-
apache-maven/src/assembly/shared/mvnwlauncher | 1 -
apache-maven/src/assembly/shared/mvnwlauncher.cmd | 1 -
apache-maven/src/assembly/shared/run | 28 +-
apache-maven/src/assembly/shared/run.cmd | 12 +-
apache-maven/src/assembly/shared/validate | 28 +-
apache-maven/src/assembly/shared/validate.cmd | 31 +-
apache-maven/src/assembly/wrapper/script/download | 2 +-
apache-maven/src/assembly/wrapper/source.xml | 4 +-
.../main/appended-resources/META-INF/LICENSE.vm | 4 +-
.../src/main/appended-resources/META-INF/NOTICE.vm | 2 +-
.../main/appended-resources/licenses/CDDL-1.0.txt | 384 ---------------------
...f4j-api-1.7.30.txt => MIT-slf4j-api-1.7.32.txt} | 0
apache-maven/src/site/apt/index.apt.vm | 43 +++
.../checkstyle-suppressions.xml | 16 +-
doap_Maven.rdf | 18 +
.../org/apache/maven/artifact/ArtifactUtils.java | 4 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 6 +-
.../maven/artifact/handler/ArtifactHandler.java | 1 +
.../maven/artifact/versioning/Restriction.java | 5 +-
.../maven/artifact/versioning/VersionRange.java | 5 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 16 +-
.../apache/maven/artifact/DefaultArtifactTest.java | 5 +-
.../versioning/DefaultArtifactVersionTest.java | 14 +-
maven-bom/pom.xml | 12 +-
maven-bom/src/site/apt/index.apt | 2 +-
.../building/DefaultProblemCollectorTest.java | 3 +-
.../apache/maven/building/DefaultProblemTest.java | 3 +-
maven-compat/pom.xml | 8 +-
.../maven/profiles/DefaultProfileManager.java | 6 +-
.../profiles/activation/FileProfileActivator.java | 2 +-
.../java/org/apache/maven/project/ModelUtils.java | 4 +-
.../StringSearchModelInterpolator.java | 14 +-
.../maven/repository/MetadataResolutionResult.java | 8 +-
.../legacy/DefaultUpdateCheckManager.java | 2 +-
.../repository/legacy/LegacyRepositorySystem.java | 8 +-
.../legacy/WagonConfigurationException.java | 4 +-
.../resolver/DefaultLegacyArtifactCollector.java | 2 +-
.../metadata/DefaultGraphConflictResolver.java | 3 +-
.../repository/metadata/MetadataGraphVertex.java | 2 +-
maven-compat/src/main/mdo/profiles.mdo | 6 +-
.../artifact/deployer/ArtifactDeployerTest.java | 34 +-
.../deployer/SimpleArtifactMetadataSource.java | 1 -
.../artifact/installer/ArtifactInstallerTest.java | 26 +-
.../resolver/DefaultArtifactResolverTest.java | 1 -
.../apache/maven/project/ProjectClasspathTest.java | 7 +-
.../maven/project/TestMavenRepositorySystem.java | 2 -
.../apache/maven/project/TestProjectBuilder.java | 16 +
.../inheritance/t12/ProjectInheritanceTest.java | 3 +-
.../maven/repository/legacy/PerLookupWagon.java | 3 -
.../resolver/DefaultArtifactCollectorTest.java | 2 +-
maven-core/pom.xml | 25 +-
.../main/java/org/apache/maven/DefaultMaven.java | 54 +--
.../maven/DefaultProjectDependenciesResolver.java | 13 +-
.../main/java/org/apache/maven/ReactorReader.java | 11 +-
.../java/org/apache/maven/RepositoryUtils.java | 24 +-
.../artifact/factory/DefaultArtifactFactory.java | 7 +-
.../artifact/handler/DefaultArtifactHandler.java | 96 ++++--
.../manager/DefaultArtifactHandlerManager.java | 11 +-
.../providers/EarArtifactHandlerProvider.java} | 37 +-
.../providers/EjbArtifactHandlerProvider.java} | 37 +-
.../EjbClientArtifactHandlerProvider.java} | 37 +-
.../providers/JarArtifactHandlerProvider.java} | 37 +-
.../JavaSourceArtifactHandlerProvider.java} | 37 +-
.../providers/JavadocArtifactHandlerProvider.java} | 37 +-
.../MavenPluginArtifactHandlerProvider.java} | 37 +-
.../providers/PomArtifactHandlerProvider.java} | 37 +-
.../providers/RarArtifactHandlerProvider.java} | 37 +-
.../providers/TestJarArtifactHandlerProvider.java} | 37 +-
.../providers/WarArtifactHandlerProvider.java} | 37 +-
.../metadata/AbstractRepositoryMetadata.java | 2 +-
.../metadata/io/DefaultMetadataReader.java | 4 +-
.../resolver/ArtifactResolutionResult.java | 8 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 4 +-
.../maven/classrealm/DefaultClassRealmManager.java | 13 +-
.../eventspy/internal/EventSpyDispatcher.java | 16 +-
.../maven/exception/DefaultExceptionHandler.java | 5 +-
.../apache/maven/exception/ExceptionSummary.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 39 ++-
.../apache/maven/execution/ProfileActivation.java | 2 +-
.../org/apache/maven/execution/ReactorManager.java | 4 +-
.../DefaultPluginsMetadataInfoProvider.java | 137 ++++++++
.../scope/internal/MojoExecutionScopeModule.java | 4 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 5 +-
.../maven/graph/DefaultProjectDependencyGraph.java | 55 +--
.../DefaultRepositorySystemSessionFactory.java | 50 +--
.../internal/aether/LoggingRepositoryListener.java | 4 +-
.../maven/lifecycle/DefaultLifecycleExecutor.java | 43 ++-
.../apache/maven/lifecycle/DefaultLifecycles.java | 13 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 45 +--
.../internal/DefaultLifecyclePluginAnalyzer.java | 55 ++-
.../DefaultLifecycleTaskSegmentCalculator.java | 13 +-
.../lifecycle/internal/DependencyContext.java | 6 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 18 +-
.../internal/LifecycleDependencyResolver.java | 34 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 29 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 44 ++-
.../lifecycle/internal/MojoDescriptorCreator.java | 36 +-
.../maven/lifecycle/internal/MojoExecutor.java | 28 +-
.../lifecycle/internal/builder/BuilderCommon.java | 48 ++-
.../multithreaded/MultiThreadedBuilder.java | 12 +-
.../lifecycle/mapping/DefaultLifecycleMapping.java | 31 +-
.../providers/EarLifecycleMappingProvider.java | 83 +++++
.../providers/EjbLifecycleMappingProvider.java | 95 +++++
.../providers/JarLifecycleMappingProvider.java | 95 +++++
.../MavenPluginLifecycleMappingProvider.java | 100 ++++++
.../providers/PomLifecycleMappingProvider.java | 71 ++++
.../providers/RarLifecycleMappingProvider.java | 95 +++++
.../providers/WarLifecycleMappingProvider.java | 95 +++++
.../providers/CleanLifecycleProvider.java | 63 ++++
.../providers/DefaultLifecycleProvider.java | 78 +++++
.../lifecycle/providers/SiteLifecycleProvider.java | 65 ++++
.../providers/WrapperLifecycleProvider.java | 46 ++-
.../plugin/DefaultLifecycleBindingsInjector.java | 11 +-
.../maven/plugin/DebugConfigurationListener.java | 4 +-
.../maven/plugin/DefaultBuildPluginManager.java | 25 +-
.../maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../maven/plugin/PluginParameterException.java | 8 +-
.../plugin/PluginParameterExpressionEvaluator.java | 10 -
.../plugin/internal/DefaultMavenPluginManager.java | 70 ++--
.../DefaultPluginDependenciesResolver.java | 14 +-
.../plugin/internal/DefaultPluginManager.java | 30 +-
.../maven/plugin/internal/MojoLogWrapper.java | 32 +-
.../prefix/NoPluginFoundForPrefixException.java | 12 +-
.../internal/DefaultPluginPrefixResolver.java | 26 +-
.../version/PluginVersionNotFoundException.java | 2 +-
.../version/PluginVersionResolutionException.java | 6 +-
.../internal/DefaultPluginVersionResolver.java | 120 ++++++-
.../project/DefaultDependencyResolutionResult.java | 2 +-
.../maven/project/DefaultMavenProjectHelper.java | 4 +-
.../maven/project/DefaultProjectBuilder.java | 56 +--
.../project/DefaultProjectBuildingHelper.java | 38 +-
.../DefaultProjectDependenciesResolver.java | 32 +-
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../maven/project/ExtensionDescriptorBuilder.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 87 ++---
.../org/apache/maven/project/ProjectSorter.java | 58 +---
.../project/artifact/ActiveProjectArtifact.java | 6 +-
.../project/artifact/DefaultMetadataSource.java | 14 +-
.../artifact/DefaultProjectArtifactsCache.java | 4 +-
.../project/artifact/MavenMetadataSource.java | 72 ++--
.../maven/project/artifact/PluginArtifact.java | 1 +
.../maven/project/artifact/ProjectArtifact.java | 3 +-
.../collector/MultiModuleCollectionStrategy.java | 2 +-
.../collector/PomlessCollectionStrategy.java | 2 +-
.../rtinfo/internal/DefaultRuntimeInformation.java | 83 +++--
.../maven/session/scope/internal/SessionScope.java | 2 +-
.../session/scope/internal/SessionScopeModule.java | 2 +-
.../settings/DefaultMavenSettingsBuilder.java | 9 +-
.../apache/maven/toolchain/DefaultToolchain.java | 6 +-
.../maven/toolchain/DefaultToolchainManager.java | 25 +-
.../toolchain/DefaultToolchainManagerPrivate.java | 17 +
.../maven/toolchain/DefaultToolchainsBuilder.java | 8 +-
.../maven/toolchain/java/DefaultJavaToolChain.java | 2 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 8 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 2 +-
.../main/resources/META-INF/maven/extension.xml | 2 +-
.../META-INF/plexus/artifact-handlers.xml | 194 -----------
.../main/resources/META-INF/plexus/components.xml | 154 ---------
.../resources/META-INF/plexus/default-bindings.xml | 318 -----------------
.../maven/lifecycle/DefaultLifecyclesTest.java | 3 +-
.../lifecycle/LifecycleExecutorSubModulesTest.java | 3 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 2 -
.../internal/LifecycleDependencyResolverTest.java | 5 +-
.../internal/{ => builder}/BuilderCommonTest.java | 20 +-
.../lifecycle/internal/stub/AboutTheStubs.html | 4 +-
.../internal/stub/DefaultLifecyclesStub.java | 2 +-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 6 +-
.../maven/lifecycle/internal/stub/LoggerStub.java | 110 ------
.../lifecycle/internal/stub/MojoExecutorStub.java | 15 +-
.../org/apache/maven/plugin/PluginManagerTest.java | 2 -
.../plugin/internal/MavenPluginValidatorTest.java | 8 +-
.../project/DefaultMavenProjectBuilderTest.java | 10 +-
.../org/apache/maven/project/MavenProjectTest.java | 43 +++
.../apache/maven/project/PomConstructionTest.java | 26 +-
.../apache/maven/project/ProjectBuilderTest.java | 26 ++
.../apache/maven/project/TestMetadataSource.java | 9 +
.../DefaultToolchainManagerPrivateTest.java | 10 +-
.../toolchain/DefaultToolchainManagerTest.java | 11 +-
.../maven/toolchain/DefaultToolchainTest.java | 55 +--
.../project-with-inheritance/pom.xml | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../project-builder/it0063/jdk/jre/placeholder.txt | 2 +-
.../it0063/jdk/jre/placeholder.txt | 2 +-
.../test/resources/META-INF/plexus/components.xml | 107 ------
.../resources/org/apache/maven/lifecycle/pom.xml | 2 +-
.../{modelsource => modelsourcebasedir}/pom.xml | 12 +-
maven-embedder/pom.xml | 4 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 14 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 7 +
.../main/java/org/apache/maven/cli/CliRequest.java | 6 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 49 ++-
.../SettingsXmlConfigurationProcessor.java | 12 +-
.../internal/BootstrapCoreExtensionManager.java | 11 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 2 +-
.../java/org/apache/maven/cli/MavenCliTest.java | 19 +-
.../src/test/projects/config/.mvn/maven.config | 5 +-
.../mavenConfigProperties/.mvn/maven.config | 4 +-
.../java/org/apache/maven/feature/Features.java | 16 +-
.../building/BuildModelSourceTransformer.java | 2 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 5 +-
.../maven/model/building/DefaultModelBuilder.java | 371 ++++++++++++++------
.../model/building/DefaultModelBuilderFactory.java | 219 +++++++++---
.../model/building/DefaultModelProcessor.java | 14 +-
.../maven/model/building/FileToRawModelMerger.java | 8 +-
.../apache/maven/model/building/ModelCache.java | 4 +-
.../apache/maven/model/building/ModelProblem.java | 1 -
.../org/apache/maven/model/building/Result.java | 4 +-
.../AbstractStringBasedModelInterpolator.java | 18 +-
.../StringSearchModelInterpolator.java | 15 +
.../StringVisitorModelInterpolator.java | 8 +
.../apache/maven/model/io/DefaultModelReader.java | 6 +-
.../model/path/DefaultModelPathTranslator.java | 7 +-
.../model/path/DefaultModelUrlNormalizer.java | 7 +-
.../ProfileActivationFilePathInterpolator.java | 7 +-
.../model/profile/DefaultProfileSelector.java | 7 +-
.../profile/activation/FileProfileActivator.java | 14 +-
.../activation/JdkVersionProfileActivator.java | 6 +-
.../OperatingSystemProfileActivator.java | 6 +-
.../activation/PropertyProfileActivator.java | 6 +-
.../model/superpom/DefaultSuperPomProvider.java | 7 +-
.../model/validation/DefaultModelValidator.java | 25 +-
.../model/building/DefaultModelBuilderTest.java | 21 +-
.../maven/model/building/FileModelSourceTest.java | 4 +-
.../DefaultInheritanceAssemblerTest.java | 3 +-
.../StringSearchModelInterpolatorTest.java | 1 -
.../StringVisitorModelInterpolatorTest.java | 2 +-
.../activation/AbstractProfileActivatorTest.java | 17 +-
.../activation/FileProfileActivatorTest.java | 12 +-
.../activation/JdkVersionProfileActivatorTest.java | 9 +-
.../activation/PropertyProfileActivatorTest.java | 9 +-
.../validation/DefaultModelValidatorTest.java | 24 +-
.../repository-with-basedir-expression.xml | 38 +-
.../raw-model/repository-with-expression.xml | 42 +--
.../model/transform/AbstractEventXMLFilter.java | 32 +-
.../maven/model/transform/DependencyKey.java | 7 +-
.../maven/model/transform/sax/SAXEventFactory.java | 10 +-
maven-model-transform/src/site/apt/index.apt | 10 +-
maven-model/pom.xml | 4 -
.../plugin/AbstractMojoExecutionException.java | 12 +
.../maven/plugin/MojoExecutionException.java | 13 +
.../apache/maven/plugin/MojoFailureException.java | 13 +
.../apache/maven/plugin/descriptor/Parameter.java | 2 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 2 +-
.../descriptor/PluginDescriptorBuilderTest.java | 29 +-
maven-resolver-provider/pom.xml | 15 +-
.../internal/ArtifactDescriptorReaderDelegate.java | 4 +-
.../internal/DefaultArtifactDescriptorReader.java | 115 ++----
.../internal/DefaultVersionRangeResolver.java | 57 +--
.../internal/DefaultVersionResolver.java | 46 +--
.../internal/DefaultVersionSchemeProvider.java | 37 +-
.../internal/MavenRepositorySystemUtils.java | 24 --
.../repository/internal/MavenResolverModule.java | 114 +++++-
.../maven/repository/internal/PluginsMetadata.java | 117 +++++++
...enerator.java => PluginsMetadataGenerator.java} | 63 ++--
...y.java => PluginsMetadataGeneratorFactory.java} | 24 +-
...eader.java => PluginsMetadataInfoProvider.java} | 23 +-
.../DefaultArtifactDescriptorReaderTest.java | 6 +-
.../internal/DefaultVersionResolverTest.java | 2 -
.../internal/MavenRepositorySystemUtilsTest.java | 19 +-
.../internal/MavenResolverModuleTest.java | 36 +-
maven-settings-builder/pom.xml | 2 +-
.../crypto/MavenSecDispatcherProvider.java | 43 +--
.../maven/settings/io/DefaultSettingsReader.java | 4 +-
maven-settings/src/main/mdo/settings.mdo | 4 +-
maven-toolchain-builder/pom.xml | 70 ++++
.../building/DefaultToolchainsBuilder.java | 15 +-
.../building/DefaultToolchainsBuildingRequest.java | 0
.../building/DefaultToolchainsBuildingResult.java | 0
.../toolchain/building/ToolchainsBuilder.java | 0
.../building/ToolchainsBuildingException.java | 0
.../building/ToolchainsBuildingRequest.java | 0
.../building/ToolchainsBuildingResult.java | 0
.../toolchain/io/DefaultToolchainsReader.java | 0
.../toolchain/io/DefaultToolchainsWriter.java | 0
.../toolchain/io/ToolchainsParseException.java | 0
.../maven/toolchain/io/ToolchainsReader.java | 0
.../maven/toolchain/io/ToolchainsWriter.java | 0
.../toolchain/merge/MavenToolchainMerger.java | 0
.../building/DefaultToolchainsBuilderTest.java | 2 +-
.../building/ToolchainsBuildingExceptionTest.java | 8 +-
.../toolchain/merge/MavenToolchainMergerTest.java | 0
.../org/apache/maven/toolchain/global.xml | 0
.../toolchain/model/toolchains-jdks-extend.xml | 0
.../toolchain/model/toolchains-jdks-extra.xml | 0
.../maven/toolchain/model/toolchains-jdks.xml | 0
.../resources/org/apache/maven/toolchain/user.xml | 0
maven-toolchain-model/pom.xml | 59 ++++
.../src/main/mdo/toolchains.mdo | 0
.../apache/maven/wrapper/BootstrapMainStarter.java | 7 +-
.../apache/maven/wrapper/DefaultDownloader.java | 6 +-
.../java/org/apache/maven/wrapper/Installer.java | 11 +-
pom.xml | 87 +++--
src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
310 files changed, 4295 insertions(+), 3399 deletions(-)
create mode 100644 .mvn/readme.txt
delete mode 100644
apache-maven/src/main/appended-resources/licenses/CDDL-1.0.txt
rename
apache-maven/src/main/appended-resources/licenses/{MIT-slf4j-api-1.7.30.txt =>
MIT-slf4j-api-1.7.32.txt} (100%)
create mode 100644 apache-maven/src/site/apt/index.apt.vm
copy maven-embedder/src/examples/simple-project/settings.xml =>
build/checkstyle-suppressions.xml (68%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/EarArtifactHandlerProvider.java} (56%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/EjbArtifactHandlerProvider.java} (56%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/EjbClientArtifactHandlerProvider.java} (55%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/JarArtifactHandlerProvider.java} (56%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/JavaSourceArtifactHandlerProvider.java} (55%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/JavadocArtifactHandlerProvider.java} (55%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/MavenPluginArtifactHandlerProvider.java} (55%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/PomArtifactHandlerProvider.java} (56%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/RarArtifactHandlerProvider.java} (56%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/TestJarArtifactHandlerProvider.java} (55%)
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> artifact/handler/providers/WarArtifactHandlerProvider.java} (56%)
create mode 100644
maven-core/src/main/java/org/apache/maven/execution/infoproviders/DefaultPluginsMetadataInfoProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/EarLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/EjbLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/JarLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/MavenPluginLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/PomLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/RarLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/WarLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/DefaultLifecycleProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/SiteLifecycleProvider.java
copy maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
=>
maven-core/src/main/java/org/apache/maven/lifecycle/providers/WrapperLifecycleProvider.java
(50%)
rename
maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
=>
maven-core/src/main/java/org/apache/maven/plugin/internal/MojoLogWrapper.java
(86%)
delete mode 100644
maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
delete mode 100644 maven-core/src/main/resources/META-INF/plexus/components.xml
delete mode 100644
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
rename maven-core/src/test/java/org/apache/maven/lifecycle/internal/{ =>
builder}/BuilderCommonTest.java (84%)
delete mode 100644
maven-core/src/test/java/org/apache/maven/lifecycle/internal/stub/LoggerStub.java
delete mode 100644 maven-core/src/test/resources/META-INF/plexus/components.xml
copy maven-core/src/test/resources/projects/{modelsource =>
modelsourcebasedir}/pom.xml (60%)
copy maven-model-transform/pom.xml =>
maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-basedir-expression.xml
(60%)
copy maven-model-transform/pom.xml =>
maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-expression.xml
(60%)
copy
maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
=>
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionSchemeProvider.java
(61%)
create mode 100644
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadata.java
copy
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/{VersionsMetadataGenerator.java
=> PluginsMetadataGenerator.java} (52%)
copy
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/{VersionsMetadataGeneratorFactory.java
=> PluginsMetadataGeneratorFactory.java} (68%)
copy
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/{MavenWorkspaceReader.java
=> PluginsMetadataInfoProvider.java} (68%)
copy
maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java
=>
maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/MavenSecDispatcherProvider.java
(51%)
create mode 100644 maven-toolchain-builder/pom.xml
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
(94%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/global.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/user.xml
(100%)
create mode 100644 maven-toolchain-model/pom.xml
rename {maven-core => maven-toolchain-model}/src/main/mdo/toolchains.mdo (100%)
