This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch backport/maven-4.0.x/pr-12105
in repository https://gitbox.apache.org/repos/asf/maven.git
from dc30cbfef5 [maven-4.0.x] Fix mvnup to replace deprecated ${basedir} in
repository URLs (#12105)
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)
new b57809c1f8 Merge remote-tracking branch 'origin/maven-4.0.x' into
backport/maven-4.0.x/pr-12105
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/appended-resources/META-INF/LICENSE.vm | 3 +-
.../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 +-
.../maven/cling/invoker/mvnup/UpgradeContext.java | 2 +-
.../invoker/mvnup/goals/AbstractUpgradeGoal.java | 45 +-
.../mvnup/goals/AbstractUpgradeStrategy.java | 94 ++-
.../mvnup/goals/CompatibilityFixStrategy.java | 490 ++++++--------
.../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 | 209 +++---
.../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 | 124 ++--
.../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 | 207 +++---
.../cling/invoker/mvnup/goals/PomBuilder.java | 10 +-
.../mvnup/goals/StrategyOrchestratorTest.java | 2 +-
.../maven/cling/invoker/mvnup/goals/TestUtils.java | 11 +
.../maven/project/DefaultProjectBuilder.java | 17 +-
.../org/apache/maven/project/MavenProject.java | 20 +-
.../maven/project/ProjectBuildingException.java | 84 ++-
.../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/model/DefaultModelBuilder.java | 26 +-
.../maven/impl/model/DefaultModelValidator.java | 101 ++-
.../impl/model/DefaultModelValidatorTest.java | 40 +-
.../maven/impl/model/ParentCycleDetectionTest.java | 63 ++
.../raw-model/dm-with-chained-property-in-id.xml | 22 +-
pom.xml | 17 +-
src/graph/ReactorGraph.java | 2 +-
src/mdo/java/WrapperProperties.java | 6 +
src/mdo/model-v3.vm | 6 +-
55 files changed, 3201 insertions(+), 3280 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
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%)
