This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch doc/modelVersion
in repository https://gitbox.apache.org/repos/asf/maven.git
from bf0762ffee document supported values
add 6e88fb34f4 Bump mockitoVersion from 5.22.0 to 5.23.0 (#11794)
add 73ed60b236 Bump actions/download-artifact from 8.0.0 to 8.0.1 (#11791)
add 2e1589dece Bump org.codehaus.mojo:extra-enforcer-rules from 1.11.0 to
1.12.0 (#11804)
add 4a6a86804c Use Maven 3.9.14 in unit test
add 025bd712fb Bump jlineVersion from 3.30.6 to 4.0.9 (#11832)
add 0513b01f6e Bump actions/cache from 5.0.3 to 5.0.4 (#11814)
add e95fc6e040 Fixes issue #11827 - Maven DI crashes if the file
org.apache.maven.api.di.Inject contains empty lines
add 73dc3736cb Consumer POM of multi-module project should exclude <build>
and <dependencies> elements (#11639)
add 0fae538e9a Bump net.bytebuddy:byte-buddy from 1.18.7 to 1.18.8 (#11873)
add 2e6d49951c Bump org.codehaus.woodstox:stax2-api from 4.2.2 to 4.3.0
(#11872)
add f1e8feb3c6 Bump net.sourceforge.pmd:pmd-core from 7.22.0 to 7.23.0
(#11866)
add 4d395192c8 Bump jlineVersion from 4.0.9 to 4.0.10 (#11884)
add 7925d2382f Bump actions/upload-artifact from 7.0.0 to 7.0.1 (#11933)
add 530415e457 Bump eu.maveniverse.maven.plugins:bom-builder3 from 1.3.2
to 1.3.3 (#11915)
add 5481cc5294 Bump jlineVersion from 4.0.10 to 4.0.12 (#11914)
add eb390f19af Bump com.github.siom79.japicmp:japicmp-maven-plugin (#11945)
add a65a20d445 Bump actions/cache from 5.0.4 to 5.0.5 (#11944)
add 342f961110 Bump com.google.guava:guava from 33.5.0-jre to 33.6.0-jre
(#11952)
add ecfc3003a2 document supported values
add 999f3ca6f0 Promote java version in JavaToolchain
add 4860e0d901 Bump commons-io:commons-io from 2.21.0 to 2.22.0 (#11981)
add 89e6d1ee9e Backport: Maven Executor Fixes (#11987)
add 7f0677a78e Bump jlineVersion from 4.0.12 to 4.0.13 (#11993)
add d9f7a97a92 Bump net.sourceforge.pmd:pmd-core from 7.23.0 to 7.24.0
(#11989)
add f81a828777 Remove extracted Mac OS JLine binaries from Maven distro
add 61506d2082 Bump jlineVersion from 4.0.13 to 4.0.14 (#12002)
add e2d3b7289e improve align in dependency graph
add c3e0fd53ef Bump com.github.siom79.japicmp:japicmp-maven-plugin (#12021)
add b6ef79e602 Bump org.codehaus.plexus:plexus-classworlds from 2.9.0 to
2.11.0
add 37d0723e21 Bump org.apache:apache from 37 to 38 (#12030)
add 2bccc8c926 Bump org.apache.maven:maven-parent from 47 to 48 (#12029)
add 1631eac6d6 Bump slf4jVersion from 2.0.17 to 2.0.18 (#12043)
add f25ce51b73 [maven-4.0.x] Fix #11920: skip expression validation for
profile repository URLs (#12055)
add 834daf2bd4 Fix #12045: fix mvnup plugin upgrade strategy for inherited
plugins from remote parent POMs
add 586802711c Downgrade plexus-classworlds from 2.11.0 to 2.9.0 (#12092)
add 6b42a8e69b Filter transitive repositories with uninterpolated IDs
(#12049) (#12050) (#12070)
add 904bb60ea3 [maven-4.0.x] fix: propagate addResource() to model Build
for Maven 3 compat (#12093)
add be7d73b2c5 fix: restore buildConfiguration() callback in deprecated
build() methods (#12094)
add aa3b4d33f1 Fix #12075: skip expression validation for
distributionManagement repository IDs (#12077)
add 1b53468bfe Fix #12074: prevent false parent cycle with shade plugin's
dependency-reduced-pom.xml (#12079)
add b8a0ae05a8 [maven-4.0.x] Backport bug fixes from master to maven-4.0.x
(#12091)
add f52d3cae6a Fix #12085: add regression tests for version inheritance
from remote parent (#12101)
add 16c00a84f2 Fix #12081: mvnup: use domtrip XML API on 4.0.x branch to
align with master (#12082)
add 0a792e8a8a Use maven-api Version for mvnup plugin version comparison
(#12073)
add 67d297bf69 [maven-4.0.x] Fix #12087: add surefire and failsafe plugins
to PluginUpgradeStrategy (#12109)
add 402facb381 Backport bug fixes from master to maven-4.0.x (batch 2)
(#12107)
add ef1ce187aa [maven-4.0.x] Upgrade plugin dependencies
(extra-enforcer-rules) in mvnup (#12108)
add 9c8a1ef4fb Fix #11885: Disable ANSI colors when stdout is piped or
redirected on JDK 22+ (#11887) (#12111)
add cf510b39e1 [maven-4.0.x] Add maven-surefire-report-plugin to
PluginUpgradeStrategy (#12114)
add 7a9947bdd0 [maven-4.0.x] Fix consumer POM serialization of prefixed
XML attributes (fixes #11760) (#12110)
add 8f7bdee4c4 [maven-4.0.x] Fix mvn script expanding ${...} in CLI
arguments (#12095)
add 94ba23c666 Bump asmVersion from 9.9.1 to 9.10 (#12059)
add aaa1d29b01 Fix #11899: Default addLocationInformation to false in
Settings and Toolchains XML writers (#11984) (#12123)
add ae719daa25 Update binary distribution LICENSE with complete Apache
License 2.0 text
add 475bd4a202 Bump com.fasterxml.woodstox:woodstox-core from 7.1.1 to
7.2.0 (#12126)
add 7ac961157f Bump org.apache.maven.reporting:maven-reporting-exec from
2.0.0 to 2.0.1 (#12066)
add 537cb7eb83 Resolver 2018 (#12112) (#12133)
add 39879890f8 Bump org.codehaus.plexus:plexus-classworlds from 2.9.0 to
2.12.0 (#12132)
add 9f1b12fcbb Bump jlineVersion from 4.0.14 to 4.1.0 (#12018)
add 2dd2693500 [maven-4.0.x] Filter transitive dependencies with
uninterpolated expressions (#12097)
add c106730d1e Fix #12086: filter transitive repos with uninterpolated
expressions (#12098)
add d39e57d307 [maven-4.0.x] Fix mvnup to replace deprecated ${basedir} in
repository URLs (#12105) (#12106)
add 004d2435ee mvnup: upgrade enforcer plugin minimum and add new plugin
upgrades (#12121)
add 34d3b053df Fix incompatible extensions in mvnup for Maven 4
compatibility (#12122)
add 933992eeb0 Bump domtripVersion from 0.4.1 to 1.5.1 (#12131)
add c2073d48e8 Fix domtrip API breakage after 1.5.1 upgrade (#12138)
add 19bd49fe44 [backport maven-4.0.x] Fix logging setup/teardown order
(#12137)
add 126a27e3a8 Bump eu.maveniverse.maven.mimir:testing from 0.11.2 to
0.11.4 (#12067)
add f980166475 Bump com.github.siom79.japicmp:japicmp-maven-plugin (#12142)
add 763898b8ee [maven-4.0.x] Backport bug fixes from #11741 and #11733
(#12144)
add 5f099825e3 Bump asmVersion from 9.10 to 9.10.1 (#12152)
add c6af3e3971 Bump jlineVersion from 4.1.0 to 4.1.2 (#12151)
add 686f1b8e76 Extract shared session infrastructure into
AbstractUpgradeStrategy
add a0ed03ca9f Fix #12080: mvnup - comment out dependencies with undefined
property expressions
add d3534a6a4b Fix mvnup recommending non-existent
maven-enforcer-plugin:3.5.2 (#12155) (#12156)
add e2c974aa70 Bump com.github.siom79.japicmp:japicmp-maven-plugin (#12171)
add 71bb3e9c0a Bump ch.qos.logback:logback-classic from 1.5.32 to 1.5.33
(#12170)
add 0c0e2bda39 Bump asmVersion from 9.10 to 9.10.1 (#12163)
add 9215360cb1 Bump jlineVersion from 4.1.0 to 4.1.2 (#12161)
add 7fdad493bf Feat: Pull out maven-executor into its own project (#12004)
(#12186)
add 32c10fbe03 Bump net.sourceforge.pmd:pmd-core from 7.24.0 to 7.25.0
(#12197)
add ae66c1d6f7 Bump domtripVersion from 1.5.1 to 1.5.2 (#12196)
add 2fa13c9296 Bump xmlunitVersion from 2.11.0 to 2.12.0 (#12195)
add fab6a2603f Bump net.bytebuddy:byte-buddy from 1.18.8 to 1.18.10
(#12211)
add 3875903076 Bump ch.qos.logback:logback-classic from 1.5.33 to 1.5.34
(#12210)
add 12f42e6027 Bump actions/checkout from 6.0.2 to 6.0.3 (#12209)
add b9e7437989 Bump jlineVersion from 4.1.2 to 4.1.3 (#12194)
add 76712b8566 Fix deadlocks in request cache (unstable hashCode,
re-entrant self-deadlock, mutable properties) (#12166)
add 230bdb26e2 Use effective model to resolve properties from remote
parent POMs in mvnup (#12158) (#12222)
add 51e59bb30c [4.0.x] Fix mvnup plugin upgrade for versions locked by
parent build/plugins (#12223)
add a4aa7821c5 Remove invalid combine.self and combine.children attributes
instead of converting them (#12160) (#12224)
add 3ff51df5f0 Fix mvnup PLUGIN_UPGRADES inconsistencies for compiler and
exec plugins (#12172) (#12225)
add 2b0693424a Bump scala-maven-plugin upgrade target from 4.9.2 to 4.9.5
(#12173) (#12226)
add 8c648c75b7 Use request properties consistently for CI-friendly version
interpolation (#12184) (#12227)
add b9eadbd202 Bump exec-maven-plugin target to 3.5.0 and fix
PLUGIN_UPGRADES inconsistencies (#12200) (#12228)
add 3c62e2e759 Filter project repos with uninterpolated property
expressions (#12204) (#12229)
add 2941bf3e91 Fix mvnup effective model analysis for CI-friendly parent
versions (#12205) (#12230)
add 034800bcf9 Fix MavenITgh12184CIFriendlyParentVersionTest compilation
on 4.0.x
add c8abb9c5e4 Refactor JUnit extensions to avoid using static fields.
add 5ad8e2c798 [MNG-6772] Re-enable integration test for nested import
scope repository override (#11826) (#12231)
add 1bffa600b0 Fix @PreDestroy ClassNotFoundException from premature
ClassRealm disposal (#11825) (#12232)
add c951af7cde Fix #11796: Preserve default-phases bindings for standard
lifecycle phases (#11889) (#12233)
add cee05ae4d9 Fix #11856: Improve error message for prefix-based remote
repository filtering errors (#11888) (#12234)
add 79aad04e34 Fix Source.targetPath incorrectly aligned to basedir
(#12206) (#12235)
add f92777366f [GH-11772] Fail-fast consumer POM validation for non-4.0.0
model versions (#11780) (#12236)
add 85f63af0df fix reportSet inheritance in Maven 4 model building
add 9031f75c69 Bump org.jacoco:jacoco-maven-plugin from 0.8.14 to 0.8.15
add 174b01870e Bump com.fasterxml.woodstox:woodstox-core from 7.2.0 to
7.2.1
add e25a2a745b [#11767] Fix consumer POM builder failing to resolve BOM
imports from settings.xml profile repositories
add 282804f69d Fix #11973: Restore backward-compatible DefaultToolchain
constructor
add 98f5a8ff0f Merge maven-4.0.x: resolve conflict, apply grammar fixes
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml | 40 +-
.mvn/maven.config | 6 +-
apache-maven/pom.xml | 5 +-
apache-maven/src/assembly/maven/bin/mvn | 14 +-
.../main/appended-resources/META-INF/LICENSE.vm | 276 +++-
.../main/java/org/apache/maven/api/Constants.java | 52 +-
.../java/org/apache/maven/api/JavaToolchain.java | 2 +
.../org/apache/maven/api/feature/Features.java | 8 +-
.../maven/api/services/ModelBuilderRequest.java | 4 +-
api/maven-api-model/src/main/mdo/maven.mdo | 5 +-
.../java/org/apache/maven/api/xml/XmlNode.java | 38 +-
.../apache/maven/toolchain/DefaultToolchain.java | 22 +
.../apache/maven/toolchain/java/JavaToolchain.java | 7 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 11 +
.../maven/toolchain/java/JavaToolchainImpl.java | 12 +
.../legacy/DefaultUpdateCheckManagerTest.java | 4 +-
.../toolchain/java/JavaToolchainFactoryTest.java | 94 ++
.../model/validation/DefaultModelValidator.java | 73 +-
.../validation/DefaultModelValidatorTest.java | 4 +
.../inheritance/plugin-configuration-child.xml | 16 +
.../inheritance/plugin-configuration-expected.xml | 12 +
.../inheritance/plugin-configuration-parent.xml | 11 +
.../java/org/apache/maven/model/ModelTest.java | 13 +
.../plugin/descriptor/PluginDescriptorBuilder.java | 38 +-
impl/maven-cli/pom.xml | 9 +-
.../apache/maven/cling/invoker/LookupInvoker.java | 8 +-
.../maven/cling/invoker/mvnup/UpgradeContext.java | 2 +-
.../invoker/mvnup/goals/AbstractUpgradeGoal.java | 149 ++-
.../mvnup/goals/AbstractUpgradeStrategy.java | 231 +++-
.../mvnup/goals/CompatibilityFixStrategy.java | 786 +++++++----
.../maven/cling/invoker/mvnup/goals/DomUtils.java | 211 +++
.../maven/cling/invoker/mvnup/goals/GAV.java | 49 -
.../maven/cling/invoker/mvnup/goals/GAVUtils.java | 132 --
.../invoker/mvnup/goals/InferenceStrategy.java | 406 +++---
.../maven/cling/invoker/mvnup/goals/JDomUtils.java | 544 --------
.../invoker/mvnup/goals/ModelUpgradeStrategy.java | 211 +--
.../invoker/mvnup/goals/ModelVersionUtils.java | 85 +-
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 628 ++++-----
.../cling/invoker/mvnup/goals/PomDiscovery.java | 273 +---
.../invoker/mvnup/goals/StrategyOrchestrator.java | 193 +--
.../invoker/mvnup/goals/UpgradeConstants.java | 236 ----
.../cling/invoker/mvnup/goals/UpgradeStrategy.java | 12 +-
.../cling/invoker/mvnup/goals/package-info.java | 2 +-
.../mvnup/goals/AbstractUpgradeGoalTest.java | 266 +++-
.../mvnup/goals/CompatibilityFixStrategyTest.java | 1409 +++++++++++++++++++-
.../cling/invoker/mvnup/goals/DomUtilsTest.java | 725 ++++++++++
.../maven/cling/invoker/mvnup/goals/GAVTest.java | 149 ---
.../cling/invoker/mvnup/goals/GAVUtilsTest.java | 110 +-
.../invoker/mvnup/goals/InferenceStrategyTest.java | 257 ++--
.../cling/invoker/mvnup/goals/JDomUtilsTest.java | 453 -------
.../mvnup/goals/ModelUpgradeStrategyTest.java | 329 ++---
.../invoker/mvnup/goals/ModelVersionUtilsTest.java | 80 +-
.../mvnup/goals/PluginUpgradeStrategyTest.java | 631 +++++++--
.../cling/invoker/mvnup/goals/PomBuilder.java | 10 +-
.../mvnup/goals/StrategyOrchestratorTest.java | 2 +-
.../maven/cling/invoker/mvnup/goals/TestUtils.java | 11 +
.../main/java/org/apache/maven/DefaultMaven.java | 1 +
.../maven/exception/DefaultExceptionHandler.java | 34 +-
.../DefaultRepositorySystemSessionFactory.java | 100 +-
.../maven/internal/aether/TypeRegistryAdapter.java | 17 +-
.../internal/impl/DefaultLifecycleRegistry.java | 63 +-
.../impl/ConsumerPomArtifactTransformer.java | 2 +-
.../impl/DefaultConsumerPomBuilder.java | 115 +-
.../maven/plugin/DefaultExtensionRealmCache.java | 2 +-
.../maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../DefaultPluginDependenciesResolver.java | 2 +
.../maven/project/DefaultProjectBuilder.java | 55 +-
.../project/DefaultProjectBuildingHelper.java | 11 +
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 20 +-
.../maven/project/ProjectBuildingException.java | 84 +-
.../maven/project/SourceHandlingContext.java | 116 +-
.../org/apache/maven/project/SourceQueries.java | 84 ++
.../project/collector/DefaultProjectsSelector.java | 2 +-
.../session/scope/internal/SessionScopeModule.java | 4 +
.../exception/DefaultExceptionHandlerTest.java | 40 +
.../DefaultRepositorySystemSessionFactoryTest.java | 96 +-
.../impl/ConsumerPomBuilderTest.java | 164 ++-
.../maven/lifecycle/DefaultLifecyclesTest.java | 50 +
.../maven/plugin/DefaultRealmCacheDisposeTest.java | 85 ++
.../project/DefaultMavenProjectBuilderTest.java | 39 +
.../apache/maven/project/ProjectBuilderTest.java | 95 ++
.../project/ProjectBuildingExceptionTest.java | 163 +++
.../apache/maven/project/ResourceIncludeTest.java | 58 +
.../project-builder/resource-target-path}/pom.xml | 24 +-
.../project-builder/source-target-path}/pom.xml | 39 +-
.../org/test/parent-pom/1.0/parent-pom-1.0.pom | 31 +
.../consumer/{trivial => multi-module}/pom.xml | 38 +-
.../consumer/parent-with-conditions/pom.xml | 32 +
.../child/pom.xml | 12 +
.../pom.xml | 10 +
.../parent-version-inherited-from-remote/pom.xml | 12 +
.../org/apache/maven/di/impl/InjectorImpl.java | 7 +-
impl/maven-executor/pom.xml | 149 ---
.../java/org/apache/maven/api/cli/Executor.java | 75 --
.../apache/maven/api/cli/ExecutorException.java | 51 -
.../org/apache/maven/api/cli/ExecutorRequest.java | 518 -------
.../maven/cling/executor/ExecutorHelper.java | 83 --
.../apache/maven/cling/executor/ExecutorTool.java | 76 --
.../executor/embedded/EmbeddedMavenExecutor.java | 444 ------
.../cling/executor/forked/ForkedMavenExecutor.java | 226 ----
.../maven/cling/executor/internal/HelperImpl.java | 102 --
.../maven/cling/executor/internal/ToolboxTool.java | 170 ---
impl/maven-executor/src/site/site.xml | 35 -
.../apache/maven/cling/executor/Environment.java | 25 -
.../cling/executor/MavenExecutorTestSupport.java | 414 ------
.../embedded/EmbeddedMavenExecutorTest.java | 33 -
.../executor/forked/ForkedMavenExecutorTest.java | 33 -
.../maven/cling/executor/impl/ToolboxToolTest.java | 211 ---
impl/maven-impl/pom.xml | 5 +
.../maven/impl/DefaultDependencyResolver.java | 60 +-
.../maven/impl/DefaultJavaToolchainFactory.java | 20 +-
.../maven/impl/DefaultSettingsXmlFactory.java | 16 +-
.../maven/impl/DefaultToolchainsXmlFactory.java | 16 +-
.../maven/impl/cache/AbstractRequestCache.java | 13 +-
.../apache/maven/impl/cache/CachingSupplier.java | 20 +
.../maven/impl/model/DefaultModelBuilder.java | 85 +-
.../impl/model/DefaultModelPathTranslator.java | 8 +-
.../maven/impl/model/DefaultModelValidator.java | 165 ++-
.../apache/maven/impl/model/MavenModelMerger.java | 2 +-
.../resolver/DefaultArtifactDescriptorReader.java | 35 +
.../impl/standalone/RepositorySystemSupplier.java | 22 +-
.../impl/DefaultJavaToolchainFactoryTest.java | 97 ++
.../maven/impl/DefaultSettingsXmlFactoryTest.java | 108 ++
.../impl/DefaultToolchainsXmlFactoryTest.java | 108 ++
.../model/DefaultInheritanceAssemblerTest.java | 98 ++
.../maven/impl/model/DefaultModelBuilderTest.java | 120 +-
.../impl/model/DefaultModelPathTranslatorTest.java | 107 ++
.../impl/model/DefaultModelValidatorTest.java | 68 +-
.../maven/impl/model/ParentCycleDetectionTest.java | 63 +
.../poms/factory/ci-friendly-deps-no-prop.xml | 19 +
.../resources/poms/factory/ci-friendly-deps.xml | 30 +
...profiles-parent.xml => ci-friendly-version.xml} | 17 +-
...rops-and-profiles.xml => simple-standalone.xml} | 10 +-
.../raw-model/dm-with-chained-property-in-id.xml | 22 +-
.../profile-with-property-in-repository-url.xml | 59 +-
.../java/org/apache/maven/jline/FastTerminal.java | 6 +
.../maven/api/di/testing/MavenDIExtension.java | 50 +-
.../maven/api/plugin/testing/MojoExtension.java | 53 +-
.../testing/stubs/RepositorySystemSupplier.java | 25 +-
.../apache/maven/api/di/testing/SimpleDITest.java | 6 +-
.../maven/internal/xml/DefaultXmlService.java | 141 +-
.../apache/maven/internal/xml/XmlNodeImplTest.java | 799 +++++++++++
impl/pom.xml | 1 -
.../MavenITConsumerPomBomFromSettingsRepoTest.java | 115 ++
.../it/MavenITgh11140RepoDmUnresolvedTest.java | 13 +-
.../it/MavenITgh11140RepoInterpolationTest.java | 11 +-
.../maven/it/MavenITgh11772ConsumerPom410Test.java | 101 ++
.../it/MavenITgh11978PlaceholderInCliArgTest.java | 63 +
.../MavenITgh12184CIFriendlyParentVersionTest.java | 64 +
...mng11796DefaultPhasesStandardLifecycleTest.java | 61 +
...mng6772NestedImportScopeRepositoryOverride.java | 2 -
.../org/apache/maven/it/TestSuiteOrdering.java | 2 +-
.../pom.xml | 27 +-
.../apache/maven/its/cpbom/lib-a/2.0/lib-a-2.0.jar | Bin
.../maven/its/cpbom/lib-a/2.0/lib-a-2.0.pom} | 9 +-
.../maven/its/cpbom/the-bom/1.0/the-bom-1.0.pom | 19 +
.../settings-template.xml | 10 +-
.../child}/pom.xml | 19 +-
.../pom.xml | 26 +-
.../pom.xml | 9 +-
.../child}/pom.xml | 8 +-
.../pom.xml | 11 +-
.../consumer-project}/pom.xml | 10 +-
.../extension-plugin}/pom.xml | 8 +-
.../org/apache/maven/its/mng11796}/TouchMojo.java | 23 +-
.../main/resources/META-INF/plexus/components.xml | 12 +-
.../spy/src/main/java/mng5208/EventLoggerSpy.java | 3 +-
.../maven-it-plugin-plexus-utils-new/pom.xml | 2 +-
.../core-it-plugins/maven-it-plugin-site/pom.xml | 2 +-
its/core-it-support/maven-it-helper/pom.xml | 3 +-
.../main/java/org/apache/maven/it/Verifier.java | 205 ++-
its/pom.xml | 13 +-
pom.xml | 49 +-
src/graph/ReactorGraph.java | 59 +-
src/mdo/java/WrapperProperties.java | 6 +
src/mdo/model-v3.vm | 6 +-
src/mdo/writer-stax.vm | 59 +-
src/mdo/writer.vm | 54 +-
179 files changed, 10316 insertions(+), 6964 deletions(-)
create mode 100644
compat/maven-compat/src/test/java/org/apache/maven/toolchain/java/JavaToolchainFactoryTest.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/DomUtils.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/GAV.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/GAVUtils.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/JDomUtils.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeConstants.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/DomUtilsTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/GAVTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/JDomUtilsTest.java
create mode 100644
impl/maven-core/src/main/java/org/apache/maven/project/SourceQueries.java
create mode 100644
impl/maven-core/src/test/java/org/apache/maven/plugin/DefaultRealmCacheDisposeTest.java
create mode 100644
impl/maven-core/src/test/java/org/apache/maven/project/ProjectBuildingExceptionTest.java
copy {its/core-it-suite/src/test/resources/gh-11381 =>
impl/maven-core/src/test/projects/project-builder/resource-target-path}/pom.xml
(68%)
copy {its/core-it-suite/src/test/resources/gh-11381 =>
impl/maven-core/src/test/projects/project-builder/source-target-path}/pom.xml
(53%)
create mode 100644
impl/maven-core/src/test/remote-repo/org/test/parent-pom/1.0/parent-pom-1.0.pom
copy impl/maven-core/src/test/resources/consumer/{trivial =>
multi-module}/pom.xml (57%)
create mode 100644
impl/maven-core/src/test/resources/consumer/parent-with-conditions/pom.xml
create mode 100644
impl/maven-core/src/test/resources/projects/parent-version-inherited-from-remote-multimodule/child/pom.xml
create mode 100644
impl/maven-core/src/test/resources/projects/parent-version-inherited-from-remote-multimodule/pom.xml
create mode 100644
impl/maven-core/src/test/resources/projects/parent-version-inherited-from-remote/pom.xml
delete mode 100644 impl/maven-executor/pom.xml
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/api/cli/Executor.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/api/cli/ExecutorException.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/api/cli/ExecutorRequest.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/cling/executor/ExecutorHelper.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/cling/executor/ExecutorTool.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/cling/executor/embedded/EmbeddedMavenExecutor.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/cling/executor/forked/ForkedMavenExecutor.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/HelperImpl.java
delete mode 100644
impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java
delete mode 100644 impl/maven-executor/src/site/site.xml
delete mode 100644
impl/maven-executor/src/test/java/org/apache/maven/cling/executor/Environment.java
delete mode 100644
impl/maven-executor/src/test/java/org/apache/maven/cling/executor/MavenExecutorTestSupport.java
delete mode 100644
impl/maven-executor/src/test/java/org/apache/maven/cling/executor/embedded/EmbeddedMavenExecutorTest.java
delete mode 100644
impl/maven-executor/src/test/java/org/apache/maven/cling/executor/forked/ForkedMavenExecutorTest.java
delete mode 100644
impl/maven-executor/src/test/java/org/apache/maven/cling/executor/impl/ToolboxToolTest.java
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultJavaToolchainFactoryTest.java
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsXmlFactoryTest.java
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultToolchainsXmlFactoryTest.java
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInheritanceAssemblerTest.java
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelPathTranslatorTest.java
create mode 100644
impl/maven-impl/src/test/resources/poms/factory/ci-friendly-deps-no-prop.xml
create mode 100644
impl/maven-impl/src/test/resources/poms/factory/ci-friendly-deps.xml
copy
impl/maven-impl/src/test/resources/poms/factory/{props-and-profiles-parent.xml
=> ci-friendly-version.xml} (66%)
copy impl/maven-impl/src/test/resources/poms/factory/{props-and-profiles.xml
=> simple-standalone.xml} (82%)
copy
compat/maven-model-builder/src/test/resources/poms/validation/raw-model/repository-with-expression.xml
=>
impl/maven-impl/src/test/resources/poms/validation/raw-model/dm-with-chained-property-in-id.xml
(71%)
copy
its/core-it-suite/src/test/resources/mng-8525-maven-di-plugin/src/it/settings.xml
=>
impl/maven-impl/src/test/resources/poms/validation/raw-model/profile-with-property-in-repository-url.xml
(55%)
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11772ConsumerPom410Test.java
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11978PlaceholderInCliArgTest.java
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12184CIFriendlyParentVersionTest.java
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11796DefaultPhasesStandardLifecycleTest.java
copy
its/core-it-suite/src/test/resources/{mng-5639-import-scope-pom-resolution =>
gh-11767-consumer-pom-bom-from-settings-repo}/pom.xml (66%)
copy compat/maven-compat/src/test/repository-system/maven-core-2.1.0.jar =>
its/core-it-suite/src/test/resources/gh-11767-consumer-pom-bom-from-settings-repo/repo/org/apache/maven/its/cpbom/lib-a/2.0/lib-a-2.0.jar
(100%)
copy its/core-it-suite/src/test/resources/{mng-3038/test-other-deps/D2/pom.xml
=>
gh-11767-consumer-pom-bom-from-settings-repo/repo/org/apache/maven/its/cpbom/lib-a/2.0/lib-a-2.0.pom}
(51%)
create mode 100644
its/core-it-suite/src/test/resources/gh-11767-consumer-pom-bom-from-settings-repo/repo/org/apache/maven/its/cpbom/the-bom/1.0/the-bom-1.0.pom
copy its/core-it-suite/src/test/resources/{it0021 =>
gh-11767-consumer-pom-bom-from-settings-repo}/settings-template.xml (88%)
copy its/core-it-suite/src/test/resources/{gh-11321-parent-above-root/deps =>
gh-11772-consumer-pom-410/child}/pom.xml (73%)
copy its/core-it-suite/src/test/resources/{gh-11427-bom-consumer-pom =>
gh-11772-consumer-pom-410}/pom.xml (67%)
copy its/core-it-suite/src/test/resources/{gh-10937-pipes-maven-opts =>
gh-11978-placeholder-in-cli-arg}/pom.xml (86%)
copy its/core-it-suite/src/test/resources/{mng-6090-ci-friendly/module-1 =>
gh-12184-ci-friendly-parent-version/child}/pom.xml (88%)
copy its/core-it-suite/src/test/resources/{mng-6057-check-reactor-order =>
gh-12184-ci-friendly-parent-version}/pom.xml (85%)
copy
its/core-it-suite/src/test/resources/{mng-8299-custom-lifecycle/CustomLifecycleProject
=> mng-11796-default-phases-standard-lifecycle/consumer-project}/pom.xml (67%)
copy
its/core-it-suite/src/test/resources/{mng-8299-custom-lifecycle/CustomLifecyclePlugin
=> mng-11796-default-phases-standard-lifecycle/extension-plugin}/pom.xml (84%)
copy
its/{core-it-support/core-it-plugins/maven-it-plugin-optional-mojos/src/main/java/org/apache/maven/plugin/coreit
=>
core-it-suite/src/test/resources/mng-11796-default-phases-standard-lifecycle/extension-plugin/src/main/java/org/apache/maven/its/mng11796}/TouchMojo.java
(68%)
copy
its/core-it-suite/src/test/resources/{mng-8299-custom-lifecycle/CustomLifecyclePlugin
=>
mng-11796-default-phases-standard-lifecycle/extension-plugin}/src/main/resources/META-INF/plexus/components.xml
(55%)
