This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch backport-12083-to-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git
omit 0a439bdc41 Fix Spotless formatting in CompatibilityFixStrategy
omit 242d9909dc Fix #12080: mvnup - comment out dependencies with undefined
property expressions
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 2c8539a063 Fix #12080: mvnup - comment out dependencies with undefined
property expressions
add c75b417978 Fix Spotless formatting in CompatibilityFixStrategy
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 (0a439bdc41)
\
N -- N -- N refs/heads/backport-12083-to-4.0.x (c75b417978)
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:
apache-maven/src/assembly/maven/bin/mvn | 14 +-
.../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 +-
.../invoker/mvnup/goals/AbstractUpgradeGoal.java | 104 +++
.../mvnup/goals/AbstractUpgradeStrategy.java | 11 +-
.../mvnup/goals/CompatibilityFixStrategy.java | 77 +-
.../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 | 68 +-
.../cling/invoker/mvnup/goals/PomDiscovery.java | 4 +-
.../mvnup/goals/AbstractUpgradeGoalTest.java | 261 +++++++
.../mvnup/goals/CompatibilityFixStrategyTest.java | 211 +++++-
.../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 | 52 +-
.../main/java/org/apache/maven/DefaultMaven.java | 1 +
.../DefaultRepositorySystemSessionFactory.java | 100 +--
.../DefaultPluginDependenciesResolver.java | 2 +
.../session/scope/internal/SessionScopeModule.java | 4 +
.../DefaultRepositorySystemSessionFactoryTest.java | 96 +--
.../maven/impl/DefaultSettingsXmlFactory.java | 16 +-
.../maven/impl/DefaultToolchainsXmlFactory.java | 16 +-
.../resolver/DefaultArtifactDescriptorReader.java | 35 +
.../impl/standalone/RepositorySystemSupplier.java | 22 +-
.../maven/impl/DefaultSettingsXmlFactoryTest.java | 108 +++
.../impl/DefaultToolchainsXmlFactoryTest.java | 108 +++
.../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 | 63 ++
.../pom.xml | 9 +-
.../core-it-plugins/maven-it-plugin-site/pom.xml | 2 +-
its/pom.xml | 2 +-
pom.xml | 12 +-
src/mdo/writer-stax.vm | 59 +-
src/mdo/writer.vm | 54 +-
44 files changed, 2718 insertions(+), 556 deletions(-)
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
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%)
