You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2026/09/02 07:56:32 UTC
(maven) 01/01: Merge remote-tracking branch 'origin/master' into codex/fix-cli-compatibility-spelling
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch codex/fix-cli-compatibility-spelling
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 71c98fafbdcfdd4d1a738f92a797a2b538c8ec60
Merge: a8643a23cf 616bc0de25
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Sep 2 09:56:15 2026 +0200
Merge remote-tracking branch 'origin/master' into codex/fix-cli-compatibility-spelling
.github/workflows/stale-branches.yml | 118 ++++
.../main/java/org/apache/maven/api/Constants.java | 52 ++
.../org/apache/maven/api/feature/Features.java | 9 +
.../main/java/org/apache/maven/api/plugin/Log.java | 95 ++++
api/maven-api-settings/pom.xml | 6 +
api/maven-api-toolchain/pom.xml | 6 +
.../artifact/versioning/ComparableVersion.java | 76 ++-
.../versioning/DefaultArtifactVersion.java | 5 +-
.../artifact/versioning/ComparableVersionTest.java | 30 +
.../versioning/DefaultArtifactVersionTest.java | 20 +
.../artifact/versioning/VersionRangeTest.java | 10 +
.../artifact/manager/DefaultWagonManager.java | 5 +-
.../repository/LegacyLocalRepositoryManager.java | 28 +-
.../metadata/AbstractRepositoryMetadata.java | 28 +-
.../metadata/DefaultRepositoryMetadataManager.java | 83 ++-
.../project/artifact/MavenMetadataSource.java | 31 ++
.../maven/repository/DefaultMirrorSelector.java | 53 +-
.../repository/legacy/LegacyRepositorySystem.java | 35 +-
.../LegacyLocalRepositoryManagerTest.java | 58 ++
.../metadata/AbstractRepositoryMetadataTest.java | 70 +++
.../DefaultRepositoryMetadataManagerTest.java | 81 +++
...ultRepositoryMetadataManagerValidationTest.java | 63 +++
.../MavenMetadataSourceRelocationTest.java | 167 ++++++
.../repository/DefaultMirrorSelectorTest.java | 36 ++
.../maven/repository/MirrorProcessorTest.java | 6 +-
.../legacy/LegacyRepositorySystemTest.java | 25 +
.../metadata-invalid-timestamp/maven-metadata.xml | 31 ++
.../metadata-invalid-token/maven-metadata.xml | 28 +
.../transfer/AbstractMavenTransferListener.java | 45 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 2 +-
.../cli/transfer/Slf4jMavenTransferListener.java | 27 +-
.../maven/model/building/DefaultModelBuilder.java | 55 +-
.../AbstractStringBasedModelInterpolator.java | 68 ++-
.../StringVisitorModelInterpolator.java | 4 +-
.../model/validation/DefaultModelValidator.java | 14 +-
.../ExternalModelProfileActivationTest.java | 123 +++++
.../AbstractModelInterpolatorTest.java | 93 ++++
.../repository/internal/DefaultModelResolver.java | 15 +
.../internal/DefaultVersionRangeResolver.java | 36 +-
.../internal/DefaultVersionResolver.java | 39 +-
...ributionManagementArtifactRelocationSource.java | 39 +-
.../internal/DefaultModelResolverTest.java | 45 ++
.../internal/DefaultVersionRangeResolverTest.java | 47 ++
.../internal/DefaultVersionResolverTest.java | 28 +
...tionManagementArtifactRelocationSourceTest.java | 109 ++++
.../maven/its/dep-invalid-range/maven-metadata.xml | 35 ++
.../dep-invalid-sv/1.0-SNAPSHOT/maven-metadata.xml | 40 ++
.../dep-invalid-ts/1.0-SNAPSHOT/maven-metadata.xml | 33 ++
.../settings/crypto/DefaultSettingsDecrypter.java | 5 +
.../validation/DefaultSettingsValidator.java | 11 +-
.../crypto/DefaultSettingsDecrypterTest.java | 62 +++
.../invoker/mvnup/goals/AbstractUpgradeGoal.java | 26 +-
.../mvnup/goals/AbstractUpgradeStrategy.java | 102 +++-
.../mvnup/goals/CompatibilityFixStrategy.java | 21 +-
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 42 +-
.../mvnup/goals/ToolchainPluginStrategy.java | 349 ++++++++++++
.../transfer/AbstractMavenTransferListener.java | 45 +-
.../transfer/ConsoleMavenTransferListener.java | 2 +-
.../cling/transfer/Slf4jMavenTransferListener.java | 27 +-
.../mvnup/goals/AbstractUpgradeGoalTest.java | 80 ++-
.../mvnup/goals/RemoteResolutionGateTest.java | 164 ++++++
.../mvnup/goals/ToolchainPluginStrategyTest.java | 531 ++++++++++++++++++
.../cling/transfer/TransferListenerOutputTest.java | 80 +++
.../main/java/org/apache/maven/DefaultMaven.java | 24 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 55 +-
.../DefaultRepositorySystemSessionFactory.java | 40 +-
.../aether/OriginBoundAuthenticationSelector.java | 197 +++++++
.../org/apache/maven/internal/impl/DefaultLog.java | 65 ++-
.../impl/ConsumerPomArtifactTransformer.java | 25 +-
.../impl/DefaultConsumerPomBuilder.java | 286 +++++++++-
.../DefaultLifecycleExecutionPlanCalculator.java | 4 +-
.../DefaultLifecycleTaskSegmentCalculator.java | 8 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 14 +-
.../maven/lifecycle/internal/MojoExecutor.java | 20 +-
.../maven/lifecycle/internal/ProjectIndex.java | 6 +-
.../concurrent/ConcurrentLifecycleStarter.java | 6 -
.../maven/logging/LoggingExecutionListener.java | 16 +
.../maven/logging/ProjectBuildLogAppender.java | 49 ++
.../maven/plugin/DefaultBuildPluginManager.java | 2 +-
.../plugin/internal/DefaultMavenPluginManager.java | 2 +-
.../internal/DefaultPluginPrefixResolver.java | 16 +-
.../apache/maven/DefaultMavenSessionScopeTest.java | 88 +++
.../maven/bridge/MavenRepositorySystemTest.java | 64 +++
.../OriginBoundAuthenticationSelectorTest.java | 149 +++++
.../apache/maven/internal/impl/DefaultLogTest.java | 196 +++++++
.../impl/ConsumerPomArtifactTransformerTest.java | 43 ++
.../impl/ConsumerPomBuilderTest.java | 591 ++++++++++++++++++++
...efaultLifecycleExecutionPlanCalculatorTest.java | 94 ++++
.../LifecycleExecutionPlanCalculatorTest.java | 5 +-
.../internal/MojoExecutorForkedExecutionTest.java | 144 +++++
.../stub/LifecycleTaskSegmentCalculatorStub.java | 2 +-
.../internal/DefaultPluginPrefixResolverTest.java | 123 +++++
.../consumer/bom-repo-scope/child/pom.xml | 25 +
.../test/resources/consumer/bom-repo-scope/pom.xml | 17 +
.../consumer/packaging-bom-profiles/pom.xml | 25 +
.../consumer/packaging-parent-profiles/pom.xml | 23 +
.../resources/consumer/packaging-profiles/pom.xml | 62 +++
.../apache/maven/impl/DefaultSettingsBuilder.java | 159 ++++--
.../maven/impl/DefaultSettingsValidator.java | 6 +-
.../apache/maven/impl/DefaultToolchainManager.java | 182 +++++-
.../org/apache/maven/impl/DefaultTransport.java | 46 +-
.../apache/maven/impl/JdkSourceLevelSupport.java | 162 ++++++
.../model/DefaultDependencyManagementImporter.java | 14 +-
.../maven/impl/model/DefaultModelBuilder.java | 313 ++++++++++-
.../maven/impl/model/DefaultModelInterpolator.java | 59 +-
.../maven/impl/model/DefaultModelValidator.java | 16 +-
.../impl/resolver/DefaultVersionRangeResolver.java | 6 +-
.../impl/resolver/DefaultVersionResolver.java | 6 +-
.../impl/resolver/MetadataInputValidator.java | 96 ++++
...ributionManagementArtifactRelocationSource.java | 37 +-
.../apache/maven/impl/standalone/ApiRunner.java | 43 +-
.../impl/DefaultSettingsBuilderDecryptTest.java | 104 ++++
.../maven/impl/DefaultToolchainManagerTest.java | 291 ++++++++++
.../apache/maven/impl/DefaultTransportTest.java | 34 ++
.../maven/impl/JdkSourceLevelSupportTest.java | 178 ++++++
.../DefaultDependencyManagementImporterTest.java | 46 ++
.../maven/impl/model/DefaultModelBuilderTest.java | 614 +++++++++++++++++++++
.../impl/model/DefaultModelInterpolatorTest.java | 97 ++++
.../impl/resolver/MetadataInputValidatorTest.java | 155 ++++++
.../MetadataVersionTokenValidationTest.java | 110 ++++
...tionManagementArtifactRelocationSourceTest.java | 116 ++++
.../maven/its/dep-invalid-range/maven-metadata.xml | 15 +
.../dep-invalid-sv/1.0-SNAPSHOT/maven-metadata.xml | 20 +
.../dep-invalid-ts/1.0-SNAPSHOT/maven-metadata.xml | 13 +
.../resources/poms/factory/import-bom-type.xml | 35 ++
.../poms/factory/import-system-scope-bom.xml | 35 ++
.../mng-8450-profile-context/bom-one/pom.xml | 17 +
.../mng-8450-profile-context/bom-two/pom.xml | 17 +
.../factory/mng-8450-profile-context/child/pom.xml | 11 +
.../mng-8450-profile-context/parent/pom.xml | 34 ++
.../poms/factory/mng-8450-profile-context/pom.xml | 14 +
.../poms/factory/mng-8450-standalone/child/pom.xml | 11 +
.../factory/mng-8450-standalone/parent/pom.xml | 26 +
.../1.0.0/standalone-bom-one-1.0.0.pom | 17 +
.../1.0.0/standalone-bom-two-1.0.0.pom | 17 +
.../poms/factory/mng-8450/bom-one/pom.xml | 17 +
.../poms/factory/mng-8450/bom-two/pom.xml | 17 +
.../poms/factory/mng-8450/child-one/pom.xml | 10 +
.../poms/factory/mng-8450/child-two/pom.xml | 10 +
.../poms/factory/mng-8450/independent/pom.xml | 26 +
.../test/resources/poms/factory/mng-8450/pom.xml | 41 ++
.../poms/factory/resolved-model-with-profiles.xml | 71 +++
.../settings/settings-security-decrypt.xml | 3 +
.../settings/settings-servers-decrypt-fail.xml | 21 +-
.../java/org/apache/maven/jline/FastTerminal.java | 48 +-
.../java/org/apache/maven/jline/MessageUtils.java | 10 +-
.../maven/jline/FastTerminalReentrancyTest.java | 76 ++-
its/core-it-suite/pom.xml | 6 +-
.../it/MavenIT0085TransitiveSystemScopeTest.java | 31 ++
.../MavenITMvnupToolchainPluginStrategyTest.java | 94 ++++
.../it/MavenITgh10210SettingsXmlDecryptTest.java | 9 +-
...avenITgh12660BomVersionFromImportedBomTest.java | 101 ++++
...gh12729ModulePathPropertyInterpolationTest.java | 65 +++
...enITmng3586SystemScopePluginDependencyTest.java | 31 ++
...sitiveSystemPathInterpolatedWithEnvVarTest.java | 31 ++
...ImportedPomUsesSystemAndUserPropertiesTest.java | 29 +
.../bom/pom.xml | 66 +++
.../ext-bom/pom.xml | 51 ++
.../mod-1}/pom.xml | 18 +-
.../mod-2/pom.xml} | 25 +-
.../pom.xml} | 28 +-
.../child}/pom.xml | 11 +-
.../pom.xml} | 22 +-
.../src/test/resources/mng-2309/profiles.xml | 56 --
.../src/test/resources/mng-3259/settings.xml | 3 -
.../src/test/resources/mng-3701/profiles.xml | 32 --
.../test/resources/mng-3948/test-1/profiles.xml | 43 --
.../resources/mng-3948/test-1/repo/.gitattributes | 3 -
.../its/mng3948/parent/0.1/parent-0.1.pom.md5 | 1 -
.../its/mng3948/parent/0.1/parent-0.1.pom.sha1 | 1 -
.../maven/its/mng3948/parent/maven-metadata.xml | 12 -
.../its/mng3948/parent/maven-metadata.xml.md5 | 1 -
.../its/mng3948/parent/maven-metadata.xml.sha1 | 1 -
.../src/test/resources/mng-3970/test-1/pom.xml | 56 --
.../test/resources/mng-3970/test-1/profiles.xml | 43 --
.../resources/mng-3970/test-1/repo/.gitattributes | 3 -
.../org/apache/maven/its/mng3970/a/0.1/a-0.1.jar | Bin 1928 -> 0 bytes
.../apache/maven/its/mng3970/a/0.1/a-0.1.jar.md5 | 1 -
.../apache/maven/its/mng3970/a/0.1/a-0.1.jar.sha1 | 1 -
.../apache/maven/its/mng3970/a/0.1/a-0.1.pom.md5 | 1 -
.../apache/maven/its/mng3970/a/0.1/a-0.1.pom.sha1 | 1 -
.../apache/maven/its/mng3970/a/maven-metadata.xml | 12 -
.../maven/its/mng3970/a/maven-metadata.xml.md5 | 1 -
.../maven/its/mng3970/a/maven-metadata.xml.sha1 | 1 -
.../src/test/resources/mng-3983/test-2/pom.xml | 48 --
.../test/resources/mng-3983/test-2/profiles.xml | 43 --
.../resources/mng-3983/test-2/repo/.gitattributes | 3 -
.../apache/maven/its/mng3983/maven-metadata.xml | 9 -
.../maven/its/mng3983/maven-metadata.xml.md5 | 1 -
.../maven/its/mng3983/maven-metadata.xml.sha1 | 1 -
.../org/apache/maven/its/mng3983/p/0.1/p-0.1.jar | Bin 7385 -> 0 bytes
.../apache/maven/its/mng3983/p/0.1/p-0.1.jar.md5 | 1 -
.../apache/maven/its/mng3983/p/0.1/p-0.1.jar.sha1 | 1 -
.../org/apache/maven/its/mng3983/p/0.1/p-0.1.pom | 65 ---
.../apache/maven/its/mng3983/p/0.1/p-0.1.pom.md5 | 1 -
.../apache/maven/its/mng3983/p/0.1/p-0.1.pom.sha1 | 1 -
.../apache/maven/its/mng3983/p/maven-metadata.xml | 13 -
.../maven/its/mng3983/p/maven-metadata.xml.md5 | 1 -
.../maven/its/mng3983/p/maven-metadata.xml.sha1 | 1 -
.../resources/mng-4036/legacy/repo/.gitattributes | 3 -
.../poms/maven-metadata.xml | 12 -
.../poms/maven-metadata.xml.md5 | 1 -
.../poms/maven-metadata.xml.sha1 | 1 -
.../poms/parent-0.1.pom.md5 | 1 -
.../poms/parent-0.1.pom.sha1 | 1 -
.../test/resources/mng-4036/legacy/settings.xml | 44 --
.../src/test/resources/mng-4106/profiles.xml | 43 --
.../mng-8572-di-type-handler/test/settings.xml | 5 -
.../mvnup-toolchain-plugin-strategy/pom.xml | 12 +
pom.xml | 2 +-
210 files changed, 9913 insertions(+), 999 deletions(-)