This is an automated email from the ASF dual-hosted git repository. kwin pushed a change to branch feature/validate-ids-across-settings-and-model in repository https://gitbox.apache.org/repos/asf/maven.git
omit cd7aba6af6 only emit warnings when urls differ omit 35c9ac5f4e improve message, validate pluginRepositories as well omit 8280b80e37 [MNG-8050] emit warn in case of repo id clashes between settings and POM add 0c529f830a [MNG-8053] Profile activation by packaging in the POM (#1410) add 972b074656 [MNG-8039] Don't change resolved artifact by DefaultProjectBuilder add 7b60c8d7dc [MNG-8054] Ability to force build number (#1414) add 54c1b2f28a [MNG-8029] improve documentation about mirror settings add 969a6ffbb2 Move API first (as needed by other modules) add ff5fa9e4e5 [MNG-8057] Upgrade Modello to 2.3.0 (#1418) add a31c145ae9 [MNG-8006] Switch property contributors to use a lazy lookup (#1419) add cf438ca624 [MNG-8059] Paths everywhere (#1413) add 83949a7384 Use isEmpty instead of length (#1420) add ab6ec5bd74 [MNG-7976] Investigate MNG-6127 IT instability (#1422) add cf60940497 [MNG-5726] Support regular expression matching in profile activation for (#1421) add 3c2f8ebdb7 Use v4 api to resolve project dependencies (#1409) add 5307bcba09 Use SessionData to store ProjectIndex (#1423) add ce15193394 Fix concurrent cache access (#1425) add a9934f91fd Extract JLine support into its own module (#1426) add 24eee1f8e6 Add a SpiService marker interface (#1427) add 456890d40b Missing annotations on api (#1428) add a3e8da805c Make LifecycleStarter pluggable (#1424) add a27873629f [MNG-8024] Make WrapperProperties and WrapperList serializable (#1433) add 9780ca1baf [MNG-8015] Control the type of path where each dependency can be placed (#1401) add 5029cc238c [MNG-8012] Warn if in-reactor BOM import happens (#1434) add 2bfa3a8fae [MNG-8061] Maven: Require Java 17 (#1430) add 0a6a5617fe [maven-release-plugin] prepare release maven-4.0.0-alpha-13 add 33788fd7fc [maven-release-plugin] prepare for next development iteration add 1fc87b8d0d [MNG-8075] Allow project.baseUri in repository.url add 740dae43ca [MNG-4840] document requiredMavenVersion in plugin descriptor add a0206ec32f Bump ognl:ognl from 2.5.1 to 3.0.12 in /maven-compat/src/test/resources (#1439) add 267de063ee remove repetitive words (#1436) add c710760fb9 [MNG-8085] switch png+imagemap to svg add 6e508869f0 configure javadoc groups add 52d453caf9 Complete Packaging in v4 api (#1451) add 003a5bc06d [MNG-8084] Make the v4 api usable outside the Maven runtime (#1441) add a5ea944c99 Remove unneeded dependencies in maven-di (#1440) add 2594047014 [MNG-8088] Using Resolver with MRESOLVER-512 (#1442) add c16f45d858 [MNG-8089] Introduce fat-JAR types (#1459) add 691e3780e6 This is NOT a component (#1462) add a6f52774eb Boot JLine in async mode add 97518b5b29 Do not recreate nodes if merge does nothing add 8418fb3960 Cache parent artifact resolution add 084e3f9500 Lazily create builders during transformations add 34863e6345 [MNG-8091] Update Resolver to 2.0.0-alpha-10 (#1460) add 4f3fe699f1 [MNG-8050] emit warn in case of repo id clashes between settings and POM add bee5ef434b improve message, validate pluginRepositories as well add 885cee2970 only emit warnings when urls differ This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cd7aba6af6) \ N -- N -- N refs/heads/feature/validate-ids-across-settings-and-model (885cee2970) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 6 +- .github/workflows/maven_build_itself.yml | 2 +- .gitignore | 1 + Jenkinsfile | 4 +- Jenkinsfile.s390x | 4 +- README.md | 2 +- apache-maven/pom.xml | 2 +- apache-maven/src/site/site.xml | 5 +- api/maven-api-core/pom.xml | 2 +- .../main/java/org/apache/maven/api/Dependency.java | 8 + .../java/org/apache/maven/api/DependencyScope.java | 5 +- .../java/org/apache/maven/api/ExtensibleEnum.java | 6 + .../java/org/apache/maven/api/JavaPathType.java | 319 ++++++ .../java/org/apache/maven/api/MojoExecution.java | 2 + .../main/java/org/apache/maven/api/Packaging.java | 12 +- .../main/java/org/apache/maven/api/PathType.java | 131 +++ .../src/main/java/org/apache/maven/api/Plugin.java | 2 + .../org/apache/maven/api/RemoteRepository.java | 2 + .../main/java/org/apache/maven/api/Service.java | 1 + .../main/java/org/apache/maven/api/Session.java | 302 +++++- .../java/org/apache/maven/api/SessionData.java | 59 +- .../src/main/java/org/apache/maven/api/Type.java | 87 +- .../apache/maven/api/plugin/LifecycleProvider.java | 2 + .../main/java/org/apache/maven/api/plugin/Log.java | 2 + .../api/services/DependencyResolverRequest.java | 63 +- .../api/services/DependencyResolverResult.java | 46 + .../maven/api/services/ExtensibleEnumRegistry.java | 5 +- ...pendencyResolverResult.java => PathSource.java} | 43 +- .../maven/api/services/ProjectScopeRegistry.java | 4 + .../apache/maven/api/services/SettingsBuilder.java | 39 + .../api/services/SettingsBuilderException.java | 16 +- .../maven/api/services/SettingsBuilderRequest.java | 113 +-- .../maven/api/services/SettingsBuilderResult.java | 6 + .../java/org/apache/maven/api/services/Source.java | 10 + .../maven/api/services/SuperPomProvider.java | 2 + .../maven/api/services/ToolchainsBuilder.java | 2 + .../api/services/ToolchainsBuilderException.java | 16 +- .../api/services/ToolchainsBuilderRequest.java | 73 +- .../api/services/ToolchainsBuilderResult.java | 6 + .../maven/api/services/VersionRangeResolver.java | 2 + .../api/services/VersionRangeResolverRequest.java | 4 + .../api/services/VersionRangeResolverResult.java | 4 + .../apache/maven/api/services/VersionResolver.java | 2 + .../maven/api/services/VersionResolverRequest.java | 4 + .../maven/api/services/VersionResolverResult.java | 4 + .../apache/maven/api/services/xml/Location.java | 58 ++ .../maven/api/services/xml/XmlReaderException.java | 9 +- .../maven/api/services/xml/XmlWriterException.java | 9 +- api/maven-api-di/pom.xml | 2 +- .../src/site/site.xml | 0 api/maven-api-meta/pom.xml | 2 +- .../org/apache/maven/api/annotations/Consumer.java | 2 +- api/maven-api-model/pom.xml | 2 +- api/maven-api-model/src/main/mdo/maven.mdo | 33 + api/maven-api-plugin/pom.xml | 2 +- api/maven-api-plugin/src/main/mdo/plugin.mdo | 12 +- api/maven-api-settings/pom.xml | 2 +- api/maven-api-settings/src/main/mdo/settings.mdo | 27 +- api/maven-api-spi/pom.xml | 2 +- .../maven/api/spi/ExtensibleEnumProvider.java | 18 +- .../org/apache/maven/api/spi/LanguageProvider.java | 7 + .../java/org/apache/maven/api/spi/ModelParser.java | 7 +- ...thScopeProvider.java => PackagingProvider.java} | 8 +- .../apache/maven/api/spi/PathScopeProvider.java | 7 + .../apache/maven/api/spi/ProjectScopeProvider.java | 7 + .../apache/maven/api/spi/PropertyContributor.java | 6 +- .../{PathScopeProvider.java => SpiService.java} | 10 +- .../org/apache/maven/api/spi/TypeProvider.java | 7 + .../src/site/site.xml | 0 api/maven-api-toolchain/pom.xml | 2 +- api/maven-api-xml/pom.xml | 2 +- api/pom.xml | 2 +- {maven-plugin-api => maven-api-impl}/pom.xml | 103 +- .../apache/maven/internal/impl/AbstractNode.java | 0 .../maven/internal/impl/AbstractSession.java | 231 ++++- .../maven/internal/impl/DefaultArtifact.java | 0 .../internal/impl/DefaultArtifactCoordinate.java | 0 .../impl/DefaultArtifactCoordinateFactory.java | 5 +- .../internal/impl/DefaultArtifactDeployer.java | 5 +- .../internal/impl/DefaultArtifactFactory.java | 5 +- .../internal/impl/DefaultArtifactInstaller.java | 7 +- .../internal/impl/DefaultArtifactResolver.java | 5 +- .../maven/internal/impl/DefaultBuilderProblem.java | 115 +-- .../impl/DefaultChecksumAlgorithmService.java | 22 +- .../maven/internal/impl/DefaultDependency.java | 1 + .../internal/impl/DefaultDependencyCollector.java | 46 +- .../internal/impl/DefaultDependencyCoordinate.java | 6 +- .../impl/DefaultDependencyCoordinateFactory.java | 5 +- .../impl/DefaultDependencyResolverResult.java | 348 +++++++ .../internal/impl/DefaultLocalRepository.java | 3 - .../impl/DefaultLocalRepositoryManager.java | 5 +- .../maven/internal/impl/DefaultMessageBuilder.java | 0 .../impl/DefaultMessageBuilderFactory.java | 9 +- .../internal/impl/DefaultModelXmlFactory.java | 11 +- .../apache/maven/internal/impl/DefaultNode.java | 0 .../internal/impl/DefaultRemoteRepository.java | 0 .../internal/impl/DefaultRepositoryFactory.java | 14 +- .../internal/impl/DefaultSettingsBuilder.java | 300 ++++++ .../internal/impl}/DefaultSettingsValidator.java | 111 ++- .../internal/impl/DefaultSettingsXmlFactory.java | 19 +- .../internal/impl/DefaultToolchainsBuilder.java | 218 ++++ .../internal/impl/DefaultToolchainsXmlFactory.java | 11 +- .../maven/internal/impl/DefaultTransport.java | 5 - .../internal/impl/DefaultTransportProvider.java | 7 +- .../maven/internal/impl/DefaultVersionParser.java | 7 +- .../internal/impl/DefaultVersionRangeResolver.java | 7 +- .../internal/impl/DefaultVersionResolver.java | 7 +- .../maven/internal/impl/InternalSession.java | 13 - .../maven/internal/impl/MappedCollection.java | 0 .../org/apache/maven/internal/impl/MappedList.java | 0 .../maven/internal/impl/PathModularization.java | 265 +++++ .../internal/impl/PathModularizationCache.java | 134 +++ .../maven/internal/impl/PropertiesAsMap.java | 0 .../maven/internal/impl}/SettingsUtilsV4.java | 17 +- .../apache/maven/internal/impl/StaxLocation.java | 76 ++ .../java/org/apache/maven/internal/impl/Utils.java | 0 .../apache/maven/internal/impl/WrapperNode.java | 0 .../impl/DefaultSettingsBuilderFactoryTest.java | 80 ++ .../impl}/DefaultSettingsValidatorTest.java | 74 +- .../maven/internal/impl/standalone/ApiRunner.java | 336 +++++++ .../impl/standalone/TestApiStandalone.java | 51 + .../src/test/resources/settings-simple.xml | 0 maven-artifact/pom.xml | 2 +- .../maven/artifact/handler/ArtifactHandler.java | 11 +- .../maven/artifact/versioning/VersionRange.java | 8 +- maven-artifact/src/site/site.xml | 3 - .../artifact/handler/ArtifactHandlerMock.java | 2 + maven-bom/pom.xml | 2 +- maven-bom/src/site/site.xml | 28 + maven-builder-support/pom.xml | 2 +- .../org/apache/maven/building/DefaultProblem.java | 4 +- .../maven/building/DefaultProblemCollector.java | 2 +- .../java/org/apache/maven/building/FileSource.java | 39 +- .../java/org/apache/maven/building/UrlSource.java | 2 +- maven-builder-support/src/site/site.xml | 3 - .../org/apache/maven/building/FileSourceTest.java | 4 +- maven-compat/pom.xml | 2 +- .../repository/LegacyLocalRepositoryManager.java | 6 +- .../repository/layout/FlatRepositoryLayout.java | 2 +- .../repository/metadata/MetadataBridge.java | 6 + .../maven/project/path/DefaultPathTranslator.java | 2 +- .../maven/repository/legacy/MavenArtifact.java | 2 +- maven-compat/src/site/site.xml | 3 - .../AbstractArtifactComponentTestCase.java | 37 +- .../maven/project/ClasspathArtifactResolver.java | 3 +- .../project/LegacyLocalRepositoryManager.java | 8 +- .../maven/repository/TestArtifactHandler.java | 1 + maven-compat/src/test/resources/pom.xml | 2 +- maven-core/pom.xml | 7 +- .../main/java/org/apache/maven/DefaultMaven.java | 11 +- .../java/org/apache/maven/RepositoryUtils.java | 13 +- .../artifact/handler/DefaultArtifactHandler.java | 3 + .../manager/DefaultArtifactHandlerManager.java | 4 +- .../repository/layout/DefaultRepositoryLayout.java | 2 +- .../apache/maven/bridge/MavenRepositorySystem.java | 11 +- .../internal/EnhancedConfigurationConverter.java | 4 +- .../org/apache/maven/execution/MavenSession.java | 2 +- .../DefaultRepositorySystemSessionFactory.java | 41 +- .../aether/PropertyContributorExtender.java | 22 +- .../maven/internal/aether/TypeRegistryAdapter.java | 5 +- .../internal/impl/DefaultArtifactManager.java | 4 +- .../internal/impl/DefaultDependencyResolver.java | 157 +-- .../apache/maven/internal/impl/DefaultEvent.java | 4 +- .../maven/internal/impl/DefaultMojoExecution.java | 4 +- .../internal/impl/DefaultPackagingRegistry.java | 142 ++- .../internal/impl/DefaultPluginXmlFactory.java | 6 +- .../apache/maven/internal/impl/DefaultProject.java | 9 +- .../maven/internal/impl/DefaultProjectBuilder.java | 2 +- .../maven/internal/impl/DefaultProjectManager.java | 6 +- .../apache/maven/internal/impl/DefaultSession.java | 153 +-- .../maven/internal/impl/DefaultSessionFactory.java | 2 +- .../internal/impl/DefaultSettingsBuilder.java | 162 --- .../internal/impl/DefaultToolchainManager.java | 8 +- .../internal/impl/DefaultToolchainsBuilder.java | 149 --- .../maven/internal/impl/DefaultTypeRegistry.java | 6 +- .../apache/maven/internal/impl/EventSpyImpl.java | 2 +- ...teRepository.java => InternalMavenSession.java} | 44 +- .../maven/internal/impl/SisuDiBridgeModule.java | 89 ++ .../impl/DefaultConsumerPomBuilder.java | 1 + .../impl/TransformedArtifactHandler.java | 1 + .../maven/lifecycle/DefaultLifecycleExecutor.java | 3 +- ...leStarter.java => DefaultLifecycleStarter.java} | 13 +- .../internal/LifecycleDependencyResolver.java | 31 +- .../lifecycle/internal/LifecycleModuleBuilder.java | 2 +- .../maven/lifecycle/internal/LifecycleStarter.java | 116 +-- .../maven/lifecycle/internal/MojoExecutor.java | 46 +- .../maven/lifecycle/internal/ReactorContext.java | 8 - .../maven/lifecycle/internal/builder/Builder.java | 2 +- .../singlethreaded/SingleThreadedBuilder.java | 2 +- .../lifecycle/mapping/DefaultLifecycleMapping.java | 2 +- .../maven/plugin/DefaultBuildPluginManager.java | 4 +- .../maven/plugin/DefaultPluginDescriptorCache.java | 31 +- .../plugin/internal/DefaultMavenPluginManager.java | 12 +- .../maven/project/DefaultProjectBuilder.java | 12 +- .../maven/project/ExtensionDescriptorBuilder.java | 6 +- .../org/apache/maven/project/MavenProject.java | 151 +-- .../apache/maven/project/ProjectModelResolver.java | 66 +- .../artifact/DefaultProjectArtifactsCache.java | 4 +- .../maven/project/artifact/PluginArtifact.java | 1 + .../maven/project/artifact/ProjectArtifact.java | 1 + .../session/scope/internal/SessionScopeModule.java | 6 +- .../org/apache/maven/settings/SettingsUtils.java | 17 +- .../src/site/apt/configuration-management.apt | 2 +- maven-core/src/site/apt/offline-mode.apt | 2 +- maven-core/src/site/site.xml | 6 - .../DefaultBeanConfiguratorPathTest.java | 6 +- .../configuration/DefaultBeanConfiguratorTest.java | 6 +- .../DefaultRepositorySystemSessionFactoryTest.java | 14 - .../org/apache/maven/internal/impl/TestApi.java | 71 +- .../maven/internal/impl/TestArtifactHandler.java | 1 + .../internal/LifecycleModuleBuilderTest.java | 4 +- .../lifecycle/internal/stub/MojoExecutorStub.java | 7 +- .../PluginParameterExpressionEvaluatorV4Test.java | 3 +- .../project/LegacyLocalRepositoryManager.java | 8 +- .../maven/project/ProjectModelResolverTest.java | 1 + .../maven/repository/TestRepositoryConnector.java | 2 +- .../internal/DefaultRuntimeInformationTest.java | 2 +- .../apache/maven/settings/SettingsUtilsTest.java | 3 + maven-di/pom.xml | 14 +- .../java/org/apache/maven/di/impl/Binding.java | 2 +- .../org/apache/maven/di/impl/InjectorImpl.java | 2 +- {maven-model => maven-di}/src/site/site.xml | 3 - maven-embedder/pom.xml | 6 +- .../main/java/org/apache/maven/cli/CLIManager.java | 2 +- .../org/apache/maven/cli/CLIReportingUtils.java | 2 +- .../main/java/org/apache/maven/cli/MavenCli.java | 4 +- .../maven/cli/event/ExecutionEventLogger.java | 37 +- .../sisu/plexus/PlexusXmlBeanConverter.java | 2 +- .../src/main/java/org/fusesource/jansi/Ansi.java | 2 +- maven-embedder/src/site/site.xml | 7 - .../java/org/apache/maven/cli/MavenCliTest.java | 2 +- .../maven/cli/event/ExecutionEventLoggerTest.java | 4 +- .../transfer/ConsoleMavenTransferListenerTest.java | 2 +- {maven-di => maven-jline}/pom.xml | 30 +- .../java/org/apache/maven/jline/FastTerminal.java | 273 ++++++ .../maven}/jline/JLineMessageBuilderFactory.java | 6 +- .../java/org/apache/maven}/jline/MessageUtils.java | 18 +- {maven-model => maven-jline}/src/site/site.xml | 3 - maven-model-builder/pom.xml | 2 +- .../maven/model/building/ArtifactModelSource.java | 10 + .../maven/model/building/DefaultModelBuilder.java | 58 +- .../building/DefaultModelBuildingRequest.java | 24 +- .../model/building/DefaultModelProcessor.java | 29 +- .../building/DefaultTransformerContextBuilder.java | 20 +- .../maven/model/building/FileModelSource.java | 25 +- .../model/building/FilterModelBuildingRequest.java | 14 +- .../apache/maven/model/building/ModelBuilder.java | 21 + .../model/building/ModelBuildingException.java | 2 +- .../maven/model/building/ModelBuildingRequest.java | 29 +- .../maven/model/building/ModelProblemUtils.java | 22 +- .../inheritance/DefaultInheritanceAssembler.java | 2 +- .../AbstractStringBasedModelInterpolator.java | 36 +- .../model/interpolation/ModelInterpolator.java | 28 + .../PathTranslatingPostProcessor.java | 6 +- .../interpolation/ProblemDetectingValueSource.java | 2 +- .../StringVisitorModelInterpolator.java | 8 + .../apache/maven/model/io/DefaultModelReader.java | 12 +- .../apache/maven/model/io/DefaultModelWriter.java | 2 +- .../org/apache/maven/model/io/ModelReader.java | 14 + .../maven/model/locator/DefaultModelLocator.java | 29 +- .../apache/maven/model/locator/ModelLocator.java | 33 +- .../model/path/DefaultModelPathTranslator.java | 14 +- .../maven/model/path/DefaultPathTranslator.java | 8 +- .../maven/model/path/ModelPathTranslator.java | 14 + .../apache/maven/model/path/PathTranslator.java | 15 + .../activation/JdkVersionProfileActivator.java | 6 +- .../OperatingSystemProfileActivator.java | 51 +- .../activation/PackagingProfileActivator.java | 62 ++ .../activation/PropertyProfileActivator.java | 2 +- .../model/validation/DefaultModelValidator.java | 20 +- .../src/main/java/org/apache/maven/utils/Os.java | 45 +- maven-model-builder/src/site/site.xml | 7 - .../AbstractModelInterpolatorTest.java | 19 +- .../OperatingSystemProfileActivatorTest.java | 138 +++ .../repository-with-basedir-expression.xml | 10 +- maven-model/pom.xml | 2 +- maven-model/src/site/site.xml | 3 - .../org/apache/maven/model/SerializationTest.java | 14 + maven-plugin-api/pom.xml | 2 +- .../maven/plugin/descriptor/MojoDescriptor.java | 4 +- .../maven/plugin/descriptor/PluginDescriptor.java | 13 + .../plugin/descriptor/PluginDescriptorBuilder.java | 8 +- maven-plugin-api/src/site/site.xml | 3 - maven-repository-metadata/pom.xml | 2 +- maven-repository-metadata/src/site/site.xml | 3 - maven-resolver-provider/pom.xml | 29 +- .../internal/ArtifactDescriptorReaderDelegate.java | 9 +- .../internal/DefaultArtifactDescriptorReader.java | 4 +- .../repository/internal/DefaultModelResolver.java | 2 +- .../internal/DefaultVersionRangeResolver.java | 5 +- .../internal/DefaultVersionResolver.java | 11 +- .../repository/internal/LocalSnapshotMetadata.java | 15 +- .../internal/LocalSnapshotMetadataGenerator.java | 2 +- .../maven/repository/internal/MavenMetadata.java | 42 +- .../internal/MavenRepositorySystemSupplier.java | 1037 ++++++++++++++++++++ .../internal/MavenSessionBuilderSupplier.java | 41 +- .../repository/internal/MavenSnapshotMetadata.java | 6 +- .../maven/repository/internal/PluginsMetadata.java | 15 +- .../internal/PluginsMetadataGenerator.java | 4 +- .../repository/internal/RelocatedArtifact.java | 20 +- .../internal/RemoteSnapshotMetadata.java | 21 +- .../internal/RemoteSnapshotMetadataGenerator.java | 12 +- .../repository/internal/VersionsMetadata.java | 15 +- .../internal/artifact/MavenArtifactProperties.java | 8 + .../scopes/Maven3ScopeManagerConfiguration.java | 169 ++++ .../scopes/Maven4ScopeManagerConfiguration.java | 197 ++++ .../scopes/MavenDependencyContextRefiner.java | 84 -- .../internal/scopes/MavenDependencyScopes.java | 53 - .../internal/scopes/MavenScopeDeriver.java | 59 -- .../internal/scopes/MavenScopeSelector.java | 83 -- .../repository/internal/type/DefaultType.java | 26 +- .../internal/type/DefaultTypeProvider.java | 41 +- maven-resolver-provider/src/site/site.xml | 3 - .../internal/RemoteSnapshotMetadataTest.java | 24 +- maven-settings-builder/pom.xml | 11 +- .../settings/building/DefaultSettingsBuilder.java | 296 ++---- .../building/DefaultSettingsBuilderFactory.java | 6 +- .../settings/building/DefaultSettingsProblem.java | 4 +- .../validation/DefaultSettingsValidator.java | 313 +----- maven-settings-builder/src/site/site.xml | 3 - .../validation/DefaultSettingsValidatorTest.java | 3 +- maven-settings/pom.xml | 2 +- maven-settings/src/site/apt/index.apt | 12 + maven-settings/src/site/site.xml | 3 - maven-slf4j-provider/pom.xml | 4 +- .../org/apache/maven/slf4j/MavenSimpleLogger.java | 40 +- .../java/org/slf4j/simple/ExtSimpleLogger.java | 28 +- maven-slf4j-provider/src/site/site.xml | 3 - .../apache/maven/slf4j/MavenSimpleLoggerTest.java | 2 +- maven-slf4j-wrapper/pom.xml | 2 +- maven-toolchain-builder/pom.xml | 11 +- .../building/DefaultToolchainsBuilder.java | 217 ++-- .../building/DefaultToolchainsBuilderTest.java | 119 ++- maven-toolchain-model/pom.xml | 5 +- maven-xml-impl/pom.xml | 4 +- .../apache/maven/internal/xml/XmlNodeBuilder.java | 94 -- .../org/apache/maven/internal/xml/XmlNodeImpl.java | 11 +- ...XmlNodeBuilder.java => XmlNodeStaxBuilder.java} | 128 +-- .../maven/internal/xml/XmlNodeBuilderTest.java | 2 +- .../apache/maven/internal/xml/XmlNodeImplTest.java | 28 +- pom.xml | 70 +- prepare-svg.sh | 30 + src/mdo/java/WrapperList.java | 8 +- src/mdo/java/WrapperProperties.java | 7 + src/mdo/reader-stax.vm | 6 +- src/mdo/transformer.vm | 97 +- src/site/resources/images/maven-deps.png | Bin 140323 -> 0 bytes src/site/resources/images/maven-deps.svg | 736 ++++++++++++++ src/site/site.xml | 11 +- .../site/svgo.config.mjs | 24 +- src/site/xdoc/index.xml | 36 +- src/site/xdoc/maven-deps.odg | Bin 19994 -> 35992 bytes 352 files changed, 8570 insertions(+), 3454 deletions(-) create mode 100644 api/maven-api-core/src/main/java/org/apache/maven/api/JavaPathType.java create mode 100644 api/maven-api-core/src/main/java/org/apache/maven/api/PathType.java copy api/maven-api-core/src/main/java/org/apache/maven/api/services/{DependencyResolverResult.java => PathSource.java} (59%) create mode 100644 api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/Location.java copy api/{maven-api-core => maven-api-di}/src/site/site.xml (100%) copy api/maven-api-spi/src/main/java/org/apache/maven/api/spi/{PathScopeProvider.java => PackagingProvider.java} (77%) copy api/maven-api-spi/src/main/java/org/apache/maven/api/spi/{PathScopeProvider.java => SpiService.java} (76%) copy api/{maven-api-core => maven-api-spi}/src/site/site.xml (100%) copy {maven-plugin-api => maven-api-impl}/pom.xml (57%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/AbstractNode.java (100%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/AbstractSession.java (71%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifact.java (100%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinate.java (100%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactCoordinateFactory.java (97%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactDeployer.java (96%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactFactory.java (96%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactInstaller.java (95%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultArtifactResolver.java (97%) copy maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsProblem.java => maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultBuilderProblem.java (55%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultChecksumAlgorithmService.java (92%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependency.java (99%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java (64%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinate.java (93%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCoordinateFactory.java (97%) create mode 100644 maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolverResult.java rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepository.java (97%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultLocalRepositoryManager.java (96%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilder.java (100%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultMessageBuilderFactory.java (91%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultModelXmlFactory.java (92%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultNode.java (100%) copy {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultRemoteRepository.java (100%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultRepositoryFactory.java (89%) create mode 100644 maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java copy {maven-settings-builder/src/main/java/org/apache/maven/settings/validation => maven-api-impl/src/main/java/org/apache/maven/internal/impl}/DefaultSettingsValidator.java (76%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultSettingsXmlFactory.java (87%) create mode 100644 maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsXmlFactory.java (92%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultTransport.java (98%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultTransportProvider.java (95%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultVersionParser.java (94%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultVersionRangeResolver.java (97%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/DefaultVersionResolver.java (96%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/InternalSession.java (84%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/MappedCollection.java (100%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/MappedList.java (100%) create mode 100644 maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularization.java create mode 100644 maven-api-impl/src/main/java/org/apache/maven/internal/impl/PathModularizationCache.java rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/PropertiesAsMap.java (100%) rename {maven-core/src/main/java/org/apache/maven/settings => maven-api-impl/src/main/java/org/apache/maven/internal/impl}/SettingsUtilsV4.java (96%) create mode 100644 maven-api-impl/src/main/java/org/apache/maven/internal/impl/StaxLocation.java rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/Utils.java (100%) rename {maven-core => maven-api-impl}/src/main/java/org/apache/maven/internal/impl/WrapperNode.java (100%) create mode 100644 maven-api-impl/src/test/java/org/apache/maven/internal/impl/DefaultSettingsBuilderFactoryTest.java copy {maven-settings-builder/src/test/java/org/apache/maven/settings/validation => maven-api-impl/src/test/java/org/apache/maven/internal/impl}/DefaultSettingsValidatorTest.java (81%) create mode 100644 maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/ApiRunner.java create mode 100644 maven-api-impl/src/test/java/org/apache/maven/internal/impl/standalone/TestApiStandalone.java copy maven-settings-builder/src/test/resources/settings/factory/simple.xml => maven-api-impl/src/test/resources/settings-simple.xml (100%) delete mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultSettingsBuilder.java delete mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/DefaultToolchainsBuilder.java rename maven-core/src/main/java/org/apache/maven/internal/impl/{DefaultRemoteRepository.java => InternalMavenSession.java} (50%) create mode 100644 maven-core/src/main/java/org/apache/maven/internal/impl/SisuDiBridgeModule.java copy maven-core/src/main/java/org/apache/maven/lifecycle/internal/{LifecycleStarter.java => DefaultLifecycleStarter.java} (93%) copy {maven-model => maven-di}/src/site/site.xml (95%) copy {maven-di => maven-jline}/pom.xml (67%) create mode 100644 maven-jline/src/main/java/org/apache/maven/jline/FastTerminal.java rename {maven-embedder/src/main/java/org/apache/maven/cli => maven-jline/src/main/java/org/apache/maven}/jline/JLineMessageBuilderFactory.java (98%) rename {maven-embedder/src/main/java/org/apache/maven/cli => maven-jline/src/main/java/org/apache/maven}/jline/MessageUtils.java (86%) copy {maven-model => maven-jline}/src/site/site.xml (95%) create mode 100644 maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PackagingProfileActivator.java create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivatorTest.java create mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemSupplier.java create mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven3ScopeManagerConfiguration.java create mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/Maven4ScopeManagerConfiguration.java delete mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenDependencyContextRefiner.java delete mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenDependencyScopes.java delete mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenScopeDeriver.java delete mode 100644 maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/scopes/MavenScopeSelector.java copy api/maven-api-core/src/main/java/org/apache/maven/api/RemoteRepository.java => maven-slf4j-provider/src/main/java/org/slf4j/simple/ExtSimpleLogger.java (63%) copy maven-xml-impl/src/main/java/org/apache/maven/internal/xml/{XmlNodeBuilder.java => XmlNodeStaxBuilder.java} (53%) create mode 100755 prepare-svg.sh delete mode 100644 src/site/resources/images/maven-deps.png create mode 100644 src/site/resources/images/maven-deps.svg copy api/maven-api-spi/src/main/java/org/apache/maven/api/spi/PathScopeProvider.java => src/site/svgo.config.mjs (69%)