This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch dependabot/maven/maven-4.0.x/jlineVersion-4.1.0
in repository https://gitbox.apache.org/repos/asf/maven.git
from 47e803c884 Add setSize(Sized) to FastTerminal for JLine 4.1.0
compatibility
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 82272924f6 Merge remote-tracking branch 'origin/maven-4.0.x' into
dependabot/maven/maven-4.0.x/jlineVersion-4.1.0
No new revisions were added by this update.
Summary of changes:
apache-maven/src/assembly/maven/bin/mvn | 14 +-
.../main/appended-resources/META-INF/LICENSE.vm | 276 ++++++-
.../java/org/apache/maven/api/xml/XmlNode.java | 38 +-
.../model/validation/DefaultModelValidator.java | 73 +-
.../validation/DefaultModelValidatorTest.java | 4 +
.../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 | 45 +-
.../mvnup/goals/AbstractUpgradeStrategy.java | 94 ++-
.../mvnup/goals/CompatibilityFixStrategy.java | 488 ++++++-------
.../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 | 389 +++++-----
.../maven/cling/invoker/mvnup/goals/JDomUtils.java | 544 --------------
.../invoker/mvnup/goals/ModelUpgradeStrategy.java | 209 +++---
.../invoker/mvnup/goals/ModelVersionUtils.java | 85 ++-
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 311 ++++----
.../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 | 5 +-
.../mvnup/goals/CompatibilityFixStrategyTest.java | 60 +-
.../cling/invoker/mvnup/goals/DomUtilsTest.java | 725 +++++++++++++++++++
.../maven/cling/invoker/mvnup/goals/GAVTest.java | 149 ----
.../cling/invoker/mvnup/goals/GAVUtilsTest.java | 102 ++-
.../invoker/mvnup/goals/InferenceStrategyTest.java | 257 +++----
.../cling/invoker/mvnup/goals/JDomUtilsTest.java | 453 ------------
.../mvnup/goals/ModelUpgradeStrategyTest.java | 312 ++++----
.../invoker/mvnup/goals/ModelVersionUtilsTest.java | 80 +--
.../mvnup/goals/PluginUpgradeStrategyTest.java | 478 +++++++++---
.../cling/invoker/mvnup/goals/PomBuilder.java | 10 +-
.../mvnup/goals/StrategyOrchestratorTest.java | 2 +-
.../maven/cling/invoker/mvnup/goals/TestUtils.java | 11 +
.../maven/internal/aether/TypeRegistryAdapter.java | 17 +-
.../maven/project/DefaultProjectBuilder.java | 17 +-
.../org/apache/maven/project/MavenProject.java | 20 +-
.../maven/project/ProjectBuildingException.java | 84 ++-
.../project/collector/DefaultProjectsSelector.java | 2 +-
.../project/DefaultMavenProjectBuilderTest.java | 39 +
.../project/ProjectBuildingExceptionTest.java | 163 +++++
.../apache/maven/project/ResourceIncludeTest.java | 58 ++
.../org/test/parent-pom/1.0/parent-pom-1.0.pom | 31 +
.../child/pom.xml | 12 +
.../pom.xml | 10 +
.../parent-version-inherited-from-remote/pom.xml | 12 +
.../maven/impl/DefaultDependencyResolver.java | 60 +-
.../maven/impl/DefaultSettingsXmlFactory.java | 16 +-
.../maven/impl/DefaultToolchainsXmlFactory.java | 16 +-
.../maven/impl/model/DefaultModelBuilder.java | 30 +-
.../maven/impl/model/DefaultModelValidator.java | 165 +++--
.../maven/impl/DefaultSettingsXmlFactoryTest.java | 108 +++
.../impl/DefaultToolchainsXmlFactoryTest.java | 108 +++
.../maven/impl/model/DefaultModelBuilderTest.java | 6 +-
.../impl/model/DefaultModelValidatorTest.java | 46 +-
.../maven/impl/model/ParentCycleDetectionTest.java | 63 ++
.../raw-model/dm-with-chained-property-in-id.xml | 22 +-
.../profile-with-property-in-repository-url.xml | 59 +-
.../maven/internal/xml/DefaultXmlService.java | 141 +++-
.../apache/maven/internal/xml/XmlNodeImplTest.java | 799 +++++++++++++++++++++
.../it/MavenITgh11978PlaceholderInCliArgTest.java | 63 ++
.../pom.xml | 9 +-
.../spy/src/main/java/mng5208/EventLoggerSpy.java | 3 +-
its/pom.xml | 6 +-
pom.xml | 27 +-
src/graph/ReactorGraph.java | 2 +-
src/mdo/java/WrapperProperties.java | 6 +
src/mdo/model-v3.vm | 6 +-
src/mdo/writer-stax.vm | 59 +-
src/mdo/writer.vm | 54 +-
75 files changed, 5306 insertions(+), 3425 deletions(-)
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/test/java/org/apache/maven/project/ProjectBuildingExceptionTest.java
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/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
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
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/MavenITgh11978PlaceholderInCliArgTest.java
copy its/core-it-suite/src/test/resources/{gh-10937-pipes-maven-opts =>
gh-11978-placeholder-in-cli-arg}/pom.xml (86%)
