This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch maven-4.0.x-test-fixes
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 2bb8344c2f Merge PR #12100: Fix #12087: add surefire and failsafe
plugins to PluginUpgradeStrategy
discard 7ebfd4b1d2 Merge PR #12099: Fix #12080: mvnup - comment out
dependencies with undefined property expressions
discard d6b6935a91 Merge PR #12082: Switch mvnup to domtrip on 4.0.x
discard 2dabbdc550 Merge PR #12098: Fix #12086: filter transitive repos and
deps with uninterpolated expressions
discard ef4f073094 Merge PR #12096: Fix #12075: skip expression validation for
distributionManagement repository IDs
discard fc428351dd Merge PR #12095: Fix mvn script expanding ${...} in CLI
arguments
discard 521d71697a Merge PR #12094: restore buildConfiguration() callback in
deprecated build() methods
discard 069b51e45c Merge PR #12093: propagate addResource() to model Build for
Maven 3 compat
discard af03a7e676 Merge PR #12079: Fix #12074: prevent false parent cycle
with shade plugin
discard 8f5368eccb Merge PR #12073: Use ComparableVersion for mvnup plugin
version comparison
omit 5963f0abcc Fix #12087: add surefire and failsafe plugins to
PluginUpgradeStrategy
discard 1403fc87e5 Fix #12080: mvnup - comment out dependencies with undefined
property expressions
discard 41016d48cc Fix #12086: filter transitive repos with uninterpolated
expressions
discard a56dfd9997 Filter transitive dependencies with uninterpolated
expressions
omit 7595bdd6bc Fix #12075: skip expression validation for
distributionManagement repository IDs
omit a45d213586 Add IT for mvn script expanding ${...} in CLI arguments
omit b41303b2b1 Fix mvn script expanding ${...} in CLI arguments
omit 0d81b4d548 fix: restore buildConfiguration() callback in deprecated
build() methods
omit 33bfd7931a fix: only sync Build.resources for <sources> projects
omit 1b40da8f01 fix: sync Build.resources from sources set for Maven 3
compat
omit 10e6853152 fix: propagate addResource() to model Build for Maven 3
compat
omit a404c0d093 Fix #12074: prevent false parent cycle with shade plugin's
dependency-reduced-pom.xml
omit 26314587cb Use maven-api Version for mvnup plugin version comparison
omit dd67f6b748 Filter transitive repositories with uninterpolated IDs
(#12049) (#12050)
omit 2a1cf481ae Port inherited plugin detection tests to domtrip API
omit 0bbb7d3396 Switch mvnup to domtrip (#11432)
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
new 6f1c53b5a4 Use effective model to resolve properties from remote
parent POMs in mvnup
new 8d1f0124fa Fix mvnup plugin upgrade for versions locked by parent's
build/plugins
new 680cd1d141 Remove invalid combine.self and combine.children attributes
instead of converting them
new 3a2cfcdb0e Fix deadlock in AbstractRequestCache.requests() due to
unstable hashCode
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 (2bb8344c2f)
\
N -- N -- N refs/heads/maven-4.0.x-test-fixes (3a2cfcdb0e)
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.
The 4 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:
apache-maven/src/assembly/maven/bin/mvn | 2 +-
.../main/appended-resources/META-INF/LICENSE.vm | 273 ++++-
.../main/java/org/apache/maven/api/Constants.java | 37 +-
.../java/org/apache/maven/api/xml/XmlNode.java | 38 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 4 +-
.../model/validation/DefaultModelValidator.java | 73 +-
.../validation/DefaultModelValidatorTest.java | 4 +
.../java/org/apache/maven/model/ModelTest.java | 13 +
.../apache/maven/cling/invoker/LookupInvoker.java | 8 +-
.../invoker/mvnup/goals/AbstractUpgradeGoal.java | 104 ++
.../mvnup/goals/AbstractUpgradeStrategy.java | 147 ++-
.../mvnup/goals/CompatibilityFixStrategy.java | 205 ++--
.../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 | 461 ++++-----
.../cling/invoker/mvnup/goals/PomDiscovery.java | 4 +-
.../mvnup/goals/AbstractUpgradeGoalTest.java | 261 +++++
.../mvnup/goals/CompatibilityFixStrategyTest.java | 1074 +++++++++++++++++++-
.../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 | 302 +++++-
.../main/java/org/apache/maven/DefaultMaven.java | 1 +
.../DefaultRepositorySystemSessionFactory.java | 100 +-
.../maven/internal/aether/TypeRegistryAdapter.java | 17 +-
.../DefaultPluginDependenciesResolver.java | 2 +
.../maven/project/DefaultProjectBuilder.java | 9 +-
.../maven/project/ProjectBuildingException.java | 84 +-
.../project/collector/DefaultProjectsSelector.java | 2 +-
.../session/scope/internal/SessionScopeModule.java | 4 +
.../DefaultRepositorySystemSessionFactoryTest.java | 96 +-
.../project/DefaultMavenProjectBuilderTest.java | 39 +
.../project/ProjectBuildingExceptionTest.java | 163 +++
.../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/cache/AbstractRequestCache.java | 4 +-
.../maven/impl/model/DefaultModelValidator.java | 97 +-
.../impl/standalone/RepositorySystemSupplier.java | 22 +-
.../maven/impl/DefaultSettingsXmlFactoryTest.java | 108 ++
.../impl/DefaultToolchainsXmlFactoryTest.java | 108 ++
.../impl/model/DefaultModelValidatorTest.java | 25 +
.../java/org/apache/maven/jline/FastTerminal.java | 6 +
.../testing/stubs/RepositorySystemSupplier.java | 25 +-
.../maven/internal/xml/DefaultXmlService.java | 141 ++-
.../apache/maven/internal/xml/XmlNodeImplTest.java | 799 +++++++++++++++
.../it/MavenITgh11978PlaceholderInCliArgTest.java | 66 +-
.../spy/src/main/java/mng5208/EventLoggerSpy.java | 3 +-
.../core-it-plugins/maven-it-plugin-site/pom.xml | 2 +-
its/pom.xml | 2 +-
pom.xml | 12 +-
src/mdo/java/WrapperProperties.java | 6 +
src/mdo/model-v3.vm | 6 +-
src/mdo/writer-stax.vm | 59 +-
src/mdo/writer.vm | 54 +-
63 files changed, 4713 insertions(+), 956 deletions(-)
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
