This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch fix/condition-parser-arithmetic-delimiters
in repository https://gitbox.apache.org/repos/asf/maven.git


    omit 0aeb2bdb78 Fix #12052: tokenize arithmetic operators as delimiters in 
ConditionParser
     add 22ca766fcf Bump org.codehaus.plexus:plexus-classworlds from 2.9.0 to 
2.11.0
     add 8974945509 Bump org.apache.maven:maven-parent from 47 to 48 (#12027)
     add 8c36c76ae0 Fix #12045: fix mvnup plugin upgrade strategy for inherited 
plugins from remote parent POMs
     add cee3c33c74 Fix #11920: skip expression validation for profile 
repository URLs
     add b5ed8ae6e5 Bump parent to 48 - cleanups
     add a05cab9101 Bump slf4jVersion from 2.0.17 to 2.0.18 (#12056)
     add 9332ad3d55 Filter transitive repositories with uninterpolated IDs 
(#12049) (#12050)
     add 698356845b Bump org.apache.maven.reporting:maven-reporting-exec from 
2.0.0 to 2.0.1 (#12065)
     add 7bfc861e57 fix: propagate addResource() to model Build for Maven 3 
compat (#11868)
     add 498e0fd5d8 fix: restore buildConfiguration() callback in deprecated 
build() methods (#11869)
     add 4108a98359 Fix #12075: skip expression validation for 
distributionManagement repository IDs (#12076)
     add cfcd638823 Fix #12074: prevent false parent cycle with shade plugin's 
dependency-reduced-pom.xml (#12078)
     add 9450f6e494 Fix #12085: add regression tests for version inheritance 
from remote parent (#12090)
     add 04bd42a657 Use maven-api Version for mvnup plugin version comparison 
(#12072)
     add 4f3ee14c86 Fix #12087: add surefire and failsafe plugins to 
PluginUpgradeStrategy (#12089)
     add b3753714f9 Upgrade extra-enforcer-rules in mvnup plugin dependency 
handling (#12051)
     add cecd7eefcb Fix consumer POM serialization of prefixed XML attributes 
(fixes #11760)
     add ba9378d62c Fix #11885: Disable ANSI colors when stdout is piped or 
redirected on JDK 22+ (#11887)
     add e2f84736be Update binary distribution LICENSE with complete Apache 
License 2.0 text
     add e6a9c4216b Fix mvn script expanding ${...} in CLI arguments (#11983)
     add 8df3ae6ff7 Add maven-surefire-report-plugin to PluginUpgradeStrategy 
(#12113)
     add 3e38c39b60 Fix #11899: Default addLocationInformation to false in 
Settings and Toolchains XML writers (#11984)
     add 2c317cbe71 Bump domtripVersion from 0.4.1 to 1.5.1 (#12057)
     add 30ce01c714 Bump org.codehaus.plexus:plexus-classworlds from 2.11.0 to 
2.12.0 (#12124)
     add ef8ae39f6d Resolver 2018 (#12112)
     add 2ea66c89ed Bump jlineVersion from 4.0.14 to 4.1.0 (#12017)
     add cd78eb56d6 Bump org.junit:junit-bom from 6.0.3 to 6.1.0 (#12130)
     add bb28b1748c Filter transitive dependencies with uninterpolated 
expressions (#12084)
     add 66e3222059 Fix mvnup to replace deprecated ${basedir} in repository 
URLs (#12105)
     add bbc4aaf385 mvnup: upgrade enforcer plugin minimum and add new plugin 
upgrades (#12119)
     add 8d918723d5 Fix incompatible extensions in mvnup for Maven 4 
compatibility (#12120)
     add d9707470aa Bump com.fasterxml.woodstox:woodstox-core from 7.1.1 to 
7.2.0 (#12129)
     add 8115238b1a Bump asmVersion from 9.9.1 to 9.10 (#12128)
     add f101f3fc07 Fix #12086: filter transitive repos and deps with 
uninterpolated expressions (#12088)
     add 5e5bf758f3 Fix logging setup/teardown order (#11901)
     add b9d73e0acb Add comprehensive Javadoc to XmlNodeBuilder (#11925)
     add 6753e1d57b Fix domtrip API breakage after 1.5.1 upgrade (#12139)
     add da5bf8b5fe Bump eu.maveniverse.maven.mimir:testing from 0.11.3 to 
0.11.4 (#12140)
     add b44a6d2dda Fix gh-11740: Add missing null check in validateProfileId() 
(#11741)
     add b3ece83a06 fix: error == null to error != null in isError (#11733)
     add e568c73876 Nuance the message about filename-based automodules 
detected on the module path (#11857)
     add 17d7e46113 Bump org.ow2.asm:asm from 9.10 to 9.10.1 (#12149)
     add b50f8978f7 Extract shared session infrastructure into 
AbstractUpgradeStrategy
     add 5583525a1d Fix #12080: mvnup - comment out dependencies with undefined 
property expressions
     add 431bb396ff Fix mvnup recommending non-existent 
maven-enforcer-plugin:3.5.2 (#12155)
     add 763a243ea3 Bump domtripVersion from 1.5.1 to 1.5.2 (#12183)
     add 70d2e60543 Bump com.github.siom79.japicmp:japicmp-maven-plugin (#12168)
     add 15d19f2f62 Feat: Pull out maven-executor into its own project (#12004)
     add 52c4d43737 Refactor JUnit extensions to avoid using static fields. 
(#11829)
     add d2dab2cbda Bump actions/checkout from 6.0.2 to 6.0.3 (#12207)
     add a52f476d75 Bump xmlunitVersion from 2.11.0 to 2.12.0 (#12190)
     add df007ff7d0 Filter project repos with uninterpolated property 
expressions (#12204)
     add 3741c6ff30 Bump exec-maven-plugin target to 3.5.0 and fix 
PLUGIN_UPGRADES inconsistencies (#12200)
     add 55ee0a3f71 Use request properties consistently for CI-friendly version 
interpolation (#12184)
     add c89ecbd8a9 Upgrade domtrip from 1.5.1 to 1.5.2 (#12174)
     add 7d10613e82 Bump scala-maven-plugin upgrade target from 4.9.2 to 4.9.5 
(#12173)
     add c4efc192f6 Remove invalid combine.self and combine.children attributes 
instead of converting them (#12160)
     add 13f160863f Fix mvnup plugin upgrade for versions locked by parent's 
build/plugins (#12165)
     add 565c5b2ef3 Use effective model to resolve properties from remote 
parent POMs in mvnup (#12158)
     add c7d96d3e5d Fix mvnup PLUGIN_UPGRADES inconsistencies for compiler and 
exec plugins (#12172)
     add 504785b7d3 Fix mvnup effective model analysis for CI-friendly parent 
versions (#12205)
     add bf5ee83fa3 [MNG-6772] Re-enable integration test for nested import 
scope repository override (#11826)
     add 98728cb5b3 Fix @PreDestroy ClassNotFoundException from premature 
ClassRealm disposal (#11825)
     add 87775095e8 Fix #11796: Preserve default-phases bindings for standard 
lifecycle phases (#11889)
     add b4042581ab Fix #11856: Improve error message for prefix-based remote 
repository filtering errors (#11888)
     add dac6ab14a1 Fix Source.targetPath incorrectly aligned to basedir 
(#12206)
     add e48cb83eec [GH-11772] Fail-fast consumer POM validation for non-4.0.0 
model versions (#11780)
     add d0eae8adbc Bump net.bytebuddy:byte-buddy from 1.18.8 to 1.18.10 
(#12241)
     add a166e3faad Fix Javadoc parameter description
     add d58c96bc36 fix reportSet inheritance in Maven 4 model building
     add 8197c8b779 Bump org.codehaus.plexus:plexus-utils
     add f2356c28b3 Maven 3.9.16 - update doap file
     add bc227d39de Bump net.sourceforge.pmd:pmd-core from 7.24.0 to 7.25.0
     add 3656bff80a [#11767] Fix consumer POM builder failing to resolve BOM 
imports from settings.xml profile repositories
     add 2c11aeed48 Fix #11973: Restore backward-compatible DefaultToolchain 
constructor
     add 8ab6a6140b [MNG-11133] Fix mixin property precedence - mixins should 
override parent properties (#11141)
     add 3f908024ad document supported values (#11810) (#12252)
     add 123b43ad1a Add XmlService classloader fallback for ServiceLoader 
discovery (#12237)
     add cc0e5d6398 Fix #11715: preserve 4.1.0 namespace/schema in 
help:effective-pom (#11742)
     add 9a029b6bee Handle missing package metadata in model ids (#12146)
     add ac41d64c9a Support sealed parameter implementation hints (#12117)
     add 09fdd6a6e8 Fix ConditionParser to handle newlines before && operator 
(#12038)
     add 64e02b360d Bump ch.qos.logback:logback-classic from 1.5.32 to 1.5.34
     add 36a4228a31 Bump eu.maveniverse.maven.mimir:testing from 0.11.4 to 
0.12.0
     add 845617769a Update Mimir version in workflow
     add b1a4e3b445 Bump jlineVersion from 4.1.0 to 4.1.3
     add 992871b38c Bump com.fasterxml.woodstox:woodstox-core from 7.2.0 to 
7.2.1
     add 2d77e4a3b4 Bump org.apache:apache from 37 to 38
     add 26fce45633 Bump org.jacoco:jacoco-maven-plugin from 0.8.14 to 0.8.15
     add 31d3e74a01 Fix #12052: tokenize arithmetic operators as delimiters in 
ConditionParser

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   (0aeb2bdb78)
            \
             N -- N -- N   
refs/heads/fix/condition-parser-arithmetic-delimiters (31d3e74a01)

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                        |   18 +-
 .mvn/maven.config                                  |    5 +-
 apache-maven/src/assembly/maven/bin/mvn            |   14 +-
 .../main/appended-resources/META-INF/LICENSE.vm    |  273 +++-
 .../main/java/org/apache/maven/api/Constants.java  |   53 +-
 .../org/apache/maven/api/feature/Features.java     |    7 +
 .../maven/api/services/MavenBuilderException.java  |    9 +-
 api/maven-api-model/src/main/mdo/maven.mdo         |    3 +-
 .../java/org/apache/maven/api/xml/XmlNode.java     |   38 +-
 .../java/org/apache/maven/api/xml/XmlService.java  |   10 +-
 .../repository/metadata/ArtifactMetadata.java      |    2 +-
 .../apache/maven/toolchain/DefaultToolchain.java   |   22 +
 .../legacy/DefaultUpdateCheckManagerTest.java      |    4 +-
 .../repository/metadata/ArtifactMetadataTest.java  |   68 +
 .../java/org/apache/maven/cli/MavenCliTest.java    |    5 +-
 .../maven/model/building/DefaultModelBuilder.java  |   12 +-
 .../model/plugin/DefaultReportingConverter.java    |    9 +-
 .../model/superpom/DefaultSuperPomProvider.java    |    9 +-
 .../plugin/DefaultReportingConverterTest.java      |   16 +-
 .../superpom/DefaultSuperPomProviderTest.java      |   16 +-
 .../inheritance/plugin-configuration-child.xml     |   16 +
 .../inheritance/plugin-configuration-expected.xml  |   12 +
 .../inheritance/plugin-configuration-parent.xml    |   11 +
 .../java/org/apache/maven/model/InputLocation.java |    5 +-
 .../maven/model/io/xpp3/MavenXpp3Writer.java       |   16 +
 .../java/org/apache/maven/model/ModelTest.java     |   41 +
 .../plugin/descriptor/PluginDescriptorBuilder.java |   38 +-
 doap_Maven.rdf                                     |   11 +
 .../apache/maven/cling/invoker/LookupInvoker.java  |   18 +-
 .../invoker/mvnup/goals/AbstractUpgradeGoal.java   |  104 ++
 .../mvnup/goals/AbstractUpgradeStrategy.java       |  147 ++-
 .../mvnup/goals/CompatibilityFixStrategy.java      |  397 +++++-
 .../maven/cling/invoker/mvnup/goals/DomUtils.java  |   10 +-
 .../invoker/mvnup/goals/InferenceStrategy.java     |   81 +-
 .../invoker/mvnup/goals/ModelUpgradeStrategy.java  |   38 +-
 .../invoker/mvnup/goals/ModelVersionUtils.java     |    8 +-
 .../invoker/mvnup/goals/PluginUpgradeStrategy.java |  487 ++++---
 .../cling/invoker/mvnup/goals/PomDiscovery.java    |    4 +-
 .../mvnup/goals/AbstractUpgradeGoalTest.java       |  261 ++++
 .../mvnup/goals/CompatibilityFixStrategyTest.java  | 1357 +++++++++++++++++++-
 .../cling/invoker/mvnup/goals/DomUtilsTest.java    |    8 +-
 .../cling/invoker/mvnup/goals/GAVUtilsTest.java    |   16 +-
 .../invoker/mvnup/goals/InferenceStrategyTest.java |  106 +-
 .../mvnup/goals/ModelUpgradeStrategyTest.java      |  167 +--
 .../invoker/mvnup/goals/ModelVersionUtilsTest.java |    6 +-
 .../mvnup/goals/PluginUpgradeStrategyTest.java     |  494 ++++++-
 .../main/java/org/apache/maven/DefaultMaven.java   |    1 +
 .../internal/EnhancedConfigurationConverter.java   |   57 +-
 .../maven/exception/DefaultExceptionHandler.java   |   34 +-
 .../DefaultRepositorySystemSessionFactory.java     |  103 +-
 .../internal/impl/DefaultLifecycleRegistry.java    |   70 +-
 .../maven/internal/impl/DefaultProjectManager.java |    6 +-
 .../impl/DefaultConsumerPomBuilder.java            |   88 +-
 .../java/org/apache/maven/lifecycle/Lifecycle.java |   13 +-
 .../internal/concurrent/BuildPlanExecutor.java     |   29 +-
 .../maven/plugin/DefaultExtensionRealmCache.java   |    2 +-
 .../maven/plugin/DefaultPluginRealmCache.java      |    2 +-
 .../DefaultPluginDependenciesResolver.java         |    2 +
 .../maven/project/DefaultProjectBuilder.java       |    8 +
 .../project/DefaultProjectBuildingHelper.java      |   11 +
 .../maven/project/DefaultProjectRealmCache.java    |    2 +-
 .../org/apache/maven/project/MavenProject.java     |   20 +-
 .../session/scope/internal/SessionScopeModule.java |    4 +
 .../configuration/DefaultBeanConfiguratorTest.java |   98 ++
 .../exception/DefaultExceptionHandlerTest.java     |   40 +
 .../DefaultRepositorySystemSessionFactoryTest.java |   96 +-
 .../impl/DefaultLifecycleRegistryTest.java         |   16 +-
 .../internal/impl/DefaultProjectManagerTest.java   |    4 +-
 .../impl/ConsumerPomBuilderTest.java               |   78 ++
 .../maven/lifecycle/DefaultLifecyclesTest.java     |   50 +
 .../maven/plugin/DefaultRealmCacheDisposeTest.java |   85 ++
 .../project/DefaultMavenProjectBuilderTest.java    |   39 +
 .../apache/maven/project/ProjectBuilderTest.java   |  139 +-
 .../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/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     |    4 +-
 impl/maven-executor/pom.xml                        |  149 ---
 .../org/apache/maven/cling/executor/Executor.java  |   75 --
 .../maven/cling/executor/ExecutorException.java    |   51 -
 .../maven/cling/executor/ExecutorHelper.java       |   80 --
 .../maven/cling/executor/ExecutorRequest.java      |  518 --------
 .../apache/maven/cling/executor/ExecutorTool.java  |   74 --
 .../executor/embedded/EmbeddedMavenExecutor.java   |  457 -------
 .../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   |  412 ------
 .../embedded/EmbeddedMavenExecutorTest.java        |   33 -
 .../executor/forked/ForkedMavenExecutorTest.java   |   33 -
 .../maven/cling/executor/impl/ToolboxToolTest.java |  211 ---
 impl/maven-impl/pom.xml                            |    5 +
 .../maven/impl/DefaultSettingsXmlFactory.java      |   16 +-
 .../apache/maven/impl/DefaultSuperPomProvider.java |    9 +-
 .../maven/impl/DefaultToolchainsXmlFactory.java    |   16 +-
 .../org/apache/maven/impl/PathModularization.java  |   15 +-
 .../apache/maven/impl/PathModularizationCache.java |    8 +-
 .../maven/impl/model/DefaultModelBuilder.java      |   95 +-
 .../impl/model/DefaultModelPathTranslator.java     |    8 +-
 .../maven/impl/model/DefaultModelValidator.java    |   69 +-
 .../apache/maven/impl/model/MavenModelMerger.java  |    2 +-
 .../maven/impl/model/profile/ConditionParser.java  |   24 +-
 .../resolver/DefaultArtifactDescriptorReader.java  |   49 +
 .../impl/standalone/RepositorySystemSupplier.java  |   22 +-
 .../maven/impl/DefaultSettingsXmlFactoryTest.java  |  108 ++
 .../maven/impl/DefaultSuperPomProviderTest.java    |   16 +-
 .../impl/DefaultToolchainsXmlFactoryTest.java      |  108 ++
 .../model/DefaultInheritanceAssemblerTest.java     |   98 ++
 .../maven/impl/model/DefaultModelBuilderTest.java  |  120 +-
 .../impl/model/DefaultModelPathTranslatorTest.java |  107 ++
 .../impl/model/DefaultModelValidatorTest.java      |   43 +-
 .../maven/impl/model/ParentCycleDetectionTest.java |   63 +
 .../impl/model/profile/ConditionParserTest.java    |   48 +
 .../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     |   48 +-
 .../maven/api/plugin/testing/MojoExtension.java    |   60 +-
 .../testing/stubs/RepositorySystemSupplier.java    |   25 +-
 .../apache/maven/api/di/testing/SimpleDITest.java  |    6 +-
 .../maven/internal/xml/DefaultXmlService.java      |  146 ++-
 .../apache/maven/internal/xml/XmlNodeBuilder.java  |  174 ++-
 .../apache/maven/internal/xml/XmlNodeImplTest.java |  799 ++++++++++++
 .../maven/internal/xml/XmlServiceLoadingTest.java  |   31 +-
 impl/pom.xml                                       |    1 -
 .../MavenITConsumerPomBomFromSettingsRepoTest.java |  115 ++
 .../it/MavenITgh11140RepoDmUnresolvedTest.java     |   13 +-
 .../it/MavenITgh11140RepoInterpolationTest.java    |   11 +-
 ...> MavenITgh11378SealedParameterConfigTest.java} |   33 +-
 ...> MavenITgh11715EffectivePomNamespaceTest.java} |   22 +-
 .../maven/it/MavenITgh11772ConsumerPom410Test.java |   97 ++
 .../it/MavenITgh11978PlaceholderInCliArgTest.java  |   59 +
 .../MavenITgh12184CIFriendlyParentVersionTest.java |   60 +
 ...va => MavenITmng11133MixinsPrecedenceTest.java} |   25 +-
 ...ng11796DefaultPhasesStandardLifecycleTest.java} |   32 +-
 ...mng6772NestedImportScopeRepositoryOverride.java |    2 -
 .../.mvn/.placeholder                              |    1 +
 .../consumer/pom.xml                               |   27 +-
 .../plugin/pom.xml                                 |   30 +-
 .../org/apache/maven/its/gh11378/TestMojo.java}    |   42 +-
 .../pom.xml                                        |    2 +-
 .../src/test/resources/gh-11715/pom.xml            |   10 +
 .../pom.xml                                        |   25 +-
 .../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}       |    7 +-
 .../maven/its/cpbom/the-bom/1.0/the-bom-1.0.pom    |   19 +
 .../settings-template.xml}                         |   14 +-
 .../child}/pom.xml                                 |   19 +-
 .../pom.xml                                        |   26 +-
 .../pom.xml                                        |    9 +-
 .../child}/pom.xml                                 |    8 +-
 .../pom.xml                                        |   11 +-
 .../mixins/mixin.xml}                              |   11 +-
 .../mixin-2 => mng-11133-mixins/parent}/pom.xml    |   11 +-
 .../child => mng-11133-mixins/project}/pom.xml     |   19 +-
 .../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 +-
 .../mng-5224/maven-it-plugin-settings/pom.xml      |    2 +-
 .../core-it-plugins/maven-it-plugin-site/pom.xml   |    2 +-
 its/core-it-support/maven-it-helper/pom.xml        |    2 +-
 .../main/java/org/apache/maven/it/Verifier.java    |   71 +-
 its/pom.xml                                        |   13 +-
 pom.xml                                            |   36 +-
 src/mdo/writer-stax.vm                             |   59 +-
 src/mdo/writer.vm                                  |   54 +-
 src/site/site.xml                                  |    6 -
 179 files changed, 7792 insertions(+), 4190 deletions(-)
 create mode 100644 
compat/maven-compat/src/test/java/org/apache/maven/repository/metadata/ArtifactMetadataTest.java
 copy 
its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java
 => 
compat/maven-model-builder/src/test/java/org/apache/maven/model/plugin/DefaultReportingConverterTest.java
 (75%)
 copy 
its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java
 => 
compat/maven-model-builder/src/test/java/org/apache/maven/model/superpom/DefaultSuperPomProviderTest.java
 (75%)
 copy 
its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java
 => 
impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultLifecycleRegistryTest.java
 (75%)
 create mode 100644 
impl/maven-core/src/test/java/org/apache/maven/plugin/DefaultRealmCacheDisposeTest.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
 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/cling/executor/Executor.java
 delete mode 100644 
impl/maven-executor/src/main/java/org/apache/maven/cling/executor/ExecutorException.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/ExecutorRequest.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/DefaultSettingsXmlFactoryTest.java
 copy 
its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java
 => 
impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSuperPomProviderTest.java
 (75%)
 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%)
 copy 
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5768CliExecutionIdTest.java
 => 
impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlServiceLoadingTest.java
 (53%)
 create mode 100644 
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java
 copy 
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITgh11314PluginInjectionTest.java
 => MavenITgh11378SealedParameterConfigTest.java} (57%)
 copy 
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITgh11384RecursiveVariableReferenceTest.java
 => MavenITgh11715EffectivePomNamespaceTest.java} (63%)
 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
 copy 
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java
 => MavenITmng11133MixinsPrecedenceTest.java} (62%)
 copy 
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng8220ExtensionWithDITest.java
 => MavenITmng11796DefaultPhasesStandardLifecycleTest.java} (50%)
 create mode 100644 
its/core-it-suite/src/test/resources/gh-11378-sealed-parameter-config/.mvn/.placeholder
 copy its/core-it-suite/src/test/resources/{gh-11314-v3-mojo-injection => 
gh-11378-sealed-parameter-config}/consumer/pom.xml (53%)
 copy its/core-it-suite/src/test/resources/{gh-11314-v3-mojo-injection => 
gh-11378-sealed-parameter-config}/plugin/pom.xml (62%)
 copy 
its/core-it-suite/src/test/resources/{mng-8525-maven-di-plugin/src/main/java/org/apache/maven/plugins/HelloMojo.java
 => 
gh-11378-sealed-parameter-config/plugin/src/main/java/org/apache/maven/its/gh11378/TestMojo.java}
 (52%)
 copy its/core-it-suite/src/test/resources/{gh-11314-v3-mojo-injection => 
gh-11378-sealed-parameter-config}/pom.xml (92%)
 create mode 100644 its/core-it-suite/src/test/resources/gh-11715/pom.xml
 copy 
its/core-it-suite/src/test/resources/{mng-5639-import-scope-pom-resolution => 
gh-11767-consumer-pom-bom-from-settings-repo}/pom.xml (69%)
 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}
 (66%)
 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/{mng-3970/test-3/settings.xml => 
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-5102-mixins/path/mixins/mixin-1.xml 
=> mng-11133-mixins/mixins/mixin.xml} (81%)
 copy its/core-it-suite/src/test/resources/{mng-5102-mixins/gav/mixin-2 => 
mng-11133-mixins/parent}/pom.xml (75%)
 copy its/core-it-suite/src/test/resources/{mng-5102-mixins/path/child => 
mng-11133-mixins/project}/pom.xml (71%)
 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-suite/src/test/resources/{mng-4338/maven-it-plugin-optional-mojos/src/main/java/org/apache/maven/plugin/coreit
 => 
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%)

Reply via email to