This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch infosupport-MPH-183_dependency-management-hierarchy-inputsource in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3c3bdf072602b69afbc826ae409533bc45345def Merge: 78b912c52f 4369fa8dff Author: Guillaume Nodet <gno...@gmail.com> AuthorDate: Sun Aug 11 00:33:29 2024 +0200 Merge remote-tracking branch 'origin/master' into infosupport-MPH-183_dependency-management-hierarchy-inputsource # Conflicts: # api/maven-api-model/src/main/java/org/apache/maven/api/model/InputLocation.java .../java/org/apache/maven/api/ExtensibleEnums.java | 6 +- .../main/java/org/apache/maven/api/Lifecycle.java | 4 +- .../main/java/org/apache/maven/api/PathScope.java | 2 +- .../services/ArtifactCoordinateFactoryRequest.java | 1 + .../api/services/ChecksumAlgorithmService.java | 3 +- .../api/services/DependencyResolverRequest.java | 3 +- .../apache/maven/api/services/ProjectManager.java | 14 ++- .../maven/api/services/xml/XmlWriterRequest.java | 28 ++++- .../main/java/org/apache/maven/api/di/Inject.java | 4 +- .../main/java/org/apache/maven/api/di/Named.java | 1 - .../main/java/org/apache/maven/api/di/Typed.java | 4 +- .../org/apache/maven/api/model/InputLocation.java | 22 ---- .../maven/internal/impl/AbstractSession.java | 40 ++++++- .../internal/impl/AetherDependencyWrapper.java | 127 +++++++++++++++++++++ .../internal/impl/DefaultArtifactDeployer.java | 3 +- .../internal/impl/DefaultArtifactInstaller.java | 3 +- .../maven/internal/impl/DefaultDependency.java | 58 +--------- .../internal/impl/DefaultDependencyCoordinate.java | 52 +-------- .../internal/impl/DefaultDependencyResolver.java | 13 ++- .../internal/impl/DefaultModelXmlFactory.java | 12 +- .../internal/impl/DefaultSettingsValidator.java | 1 + .../internal/impl/DefaultToolchainsXmlFactory.java | 5 - .../model/DefaultDependencyManagementImporter.java | 2 +- .../model/DefaultDependencyManagementInjector.java | 2 +- .../impl/model/DefaultInheritanceAssembler.java | 2 +- .../model/DefaultLifecycleBindingsInjector.java | 2 +- .../internal/impl/model/DefaultModelBuilder.java | 20 +++- .../impl/model/DefaultModelInterpolator.java | 5 +- .../impl/model/DefaultModelNormalizer.java | 2 +- .../impl/model/DefaultModelPathTranslator.java | 3 +- .../internal/impl/model/DefaultModelProcessor.java | 2 +- .../impl/model/DefaultModelTransformerContext.java | 2 +- .../internal/impl/model/DefaultModelValidator.java | 5 +- .../impl/model/DefaultModelVersionProcessor.java | 2 +- .../internal/impl/model/DefaultPathTranslator.java | 2 +- .../model/DefaultProfileActivationContext.java | 2 +- .../impl/model/DefaultProfileInjector.java | 2 +- .../impl/model/DefaultProfileSelector.java | 4 +- .../internal/impl/model/DefaultRootLocator.java | 2 +- .../impl/resolver/PluginsMetadataGenerator.java | 23 +++- .../resolver/PluginsMetadataGeneratorFactory.java | 1 - .../resolver/SnapshotMetadataGeneratorFactory.java | 1 - .../resolver/VersionsMetadataGeneratorFactory.java | 1 - ...ributionManagementArtifactRelocationSource.java | 1 - .../UserPropertiesArtifactRelocationSource.java | 1 - .../maven/internal/impl/standalone/ApiRunner.java | 48 +++++++- .../impl/standalone/RepositorySystemSupplier.java | 28 ++++- maven-artifact/pom.xml | 5 + .../org/apache/maven/artifact/DefaultArtifact.java | 16 ++- .../repository/ArtifactRepositoryPolicy.java | 1 - .../maven/artifact/versioning/VersionRange.java | 4 + .../apache/maven/artifact/DefaultArtifactTest.java | 33 ++++++ maven-bom/pom.xml | 2 +- .../main/java/org/apache/maven/ReactorReader.java | 12 +- .../org/apache/maven/execution/MavenSession.java | 1 - .../DefaultRepositorySystemSessionFactory.java | 11 +- .../internal/impl/DefaultPluginXmlFactory.java | 6 +- .../apache/maven/internal/impl/DefaultProject.java | 24 +++- .../maven/internal/impl/DefaultProjectManager.java | 16 ++- .../apache/maven/internal/impl/DefaultSession.java | 10 +- .../java/org/apache/maven/internal/impl/Graph.java | 11 +- .../transformation/impl/TransformedArtifact.java | 1 + .../java/org/apache/maven/lifecycle/Lifecycle.java | 5 +- .../DefaultLifecycleExecutionPlanCalculator.java | 10 +- .../lifecycle/internal/DependencyContext.java | 4 +- .../packaging/BomLifecycleMappingProvider.java | 1 - .../packaging/EarLifecycleMappingProvider.java | 1 - .../packaging/EjbLifecycleMappingProvider.java | 1 - .../packaging/JarLifecycleMappingProvider.java | 1 - .../MavenPluginLifecycleMappingProvider.java | 1 - .../packaging/PomLifecycleMappingProvider.java | 1 - .../packaging/RarLifecycleMappingProvider.java | 1 - .../packaging/WarLifecycleMappingProvider.java | 1 - .../plugin/internal/DefaultMavenPluginManager.java | 15 ++- .../DefaultPluginDependenciesResolver.java | 11 +- .../maven/project/DefaultProjectBuilder.java | 33 +++++- .../main/java/org/apache/maven/project/Graph.java | 9 +- .../apache/maven/project/ProjectModelResolver.java | 1 + .../resolver/MavenChainedWorkspaceReader.java | 8 +- .../DefaultRepositorySystemSessionFactoryTest.java | 12 +- .../impl/DefaultChecksumAlgorithmServiceTest.java | 9 +- .../org/apache/maven/internal/impl/TestApi.java | 11 +- .../internal/stub/DefaultLifecyclesStub.java | 17 ++- .../stub/LifecycleExecutionPlanCalculatorStub.java | 7 +- .../PluginParameterExpressionEvaluatorV4Test.java | 6 +- .../MavenPluginJavaPrerequisiteCheckerTest.java | 4 +- .../java/org/apache/maven/di/impl/Binding.java | 5 +- .../apache/maven/di/impl/BindingInitializer.java | 4 +- .../org/apache/maven/di/impl/InjectorImpl.java | 16 ++- .../org/apache/maven/di/impl/ReflectionUtils.java | 22 +++- .../main/java/org/apache/maven/di/impl/Types.java | 16 ++- .../org/apache/maven/di/impl/InjectorImplTest.java | 14 ++- .../org/apache/maven/di/impl/TypeUtilsTest.java | 5 +- .../main/java/org/apache/maven/cli/CLIManager.java | 2 +- .../main/java/org/apache/maven/cli/MavenCli.java | 16 ++- .../apache/maven/cli/transfer/FileSizeFormat.java | 2 - .../src/main/java/org/fusesource/jansi/Ansi.java | 2 +- maven-model-builder/pom.xml | 5 + .../org/apache/maven/model/building/Graph.java | 10 +- .../DefaultDependencyManagementImporter.java | 9 +- .../profile/DefaultProfileActivationContext.java | 2 - .../OperatingSystemProfileActivator.java | 12 +- .../model/validation/DefaultModelValidator.java | 2 + .../model/building/DefaultModelBuilderTest.java | 5 +- .../activation/JdkVersionProfileActivatorTest.java | 4 +- .../maven/model/io/xpp3/MavenXpp3Writer.java | 9 +- .../org/apache/maven/model/v4/Xpp3DomPerfTest.java | 11 +- .../internal/DefaultArtifactDescriptorReader.java | 1 + .../internal/PluginsMetadataGenerator.java | 23 +++- .../internal/PluginsMetadataGeneratorFactory.java | 1 - .../internal/SnapshotMetadataGeneratorFactory.java | 1 - .../internal/VersionsMetadataGeneratorFactory.java | 1 - ...ributionManagementArtifactRelocationSource.java | 1 - .../UserPropertiesArtifactRelocationSource.java | 1 - .../repository/internal/type/DefaultType.java | 6 +- .../repository/internal/AbstractVersionTest.java | 3 +- .../internal/ModelVersionParserTest.java | 5 +- .../repository/internal/RepositorySystemTest.java | 36 +++++- .../repository/internal/VersionRangeTest.java | 5 +- .../maven/repository/internal/VersionTest.java | 2 +- .../simple/rogue-plugin/1.0/rogue-plugin-1.0.jar | Bin 0 -> 7446 bytes .../simple/rogue-plugin/1.0/rogue-plugin-1.0.pom | 31 +++++ .../repo/ut/simple/rogue-plugin/maven-metadata.xml | 34 ++++++ .../maven/internal/xml/ImmutableCollections.java | 14 ++- pom.xml | 14 +-- src/mdo/writer-stax.vm | 9 +- 126 files changed, 948 insertions(+), 307 deletions(-)