This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch opaque-earth
in repository https://gitbox.apache.org/repos/asf/maven.git
omit a5fd3896ff Fix #12086: filter transitive repos and deps with
uninterpolated expressions
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 dc2b5f2fb3 Fix #12086: filter transitive repos and deps with
uninterpolated expressions
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 (a5fd3896ff)
\
N -- N -- N refs/heads/opaque-earth (dc2b5f2fb3)
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 | 38 +-
.../java/org/apache/maven/api/xml/XmlNode.java | 38 +-
.../legacy/DefaultUpdateCheckManagerTest.java | 4 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 38 +-
.../apache/maven/cling/invoker/LookupInvoker.java | 8 +-
.../mvnup/goals/AbstractUpgradeStrategy.java | 11 +-
.../mvnup/goals/CompatibilityFixStrategy.java | 65 +-
.../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 | 127 ++--
.../cling/invoker/mvnup/goals/PomDiscovery.java | 4 +-
.../mvnup/goals/CompatibilityFixStrategyTest.java | 6 +-
.../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 | 256 ++++++-
.../main/java/org/apache/maven/DefaultMaven.java | 1 +
.../DefaultRepositorySystemSessionFactory.java | 103 +--
.../DefaultPluginDependenciesResolver.java | 2 +
.../maven/project/DefaultProjectBuilder.java | 8 +
.../org/apache/maven/project/MavenProject.java | 20 +-
.../session/scope/internal/SessionScopeModule.java | 4 +
.../DefaultRepositorySystemSessionFactoryTest.java | 96 +--
.../project/DefaultMavenProjectBuilderTest.java | 39 +
.../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/DefaultSettingsXmlFactory.java | 16 +-
.../maven/impl/DefaultToolchainsXmlFactory.java | 16 +-
.../maven/impl/model/DefaultModelBuilder.java | 24 +-
.../maven/impl/model/DefaultModelValidator.java | 4 +-
.../resolver/DefaultArtifactDescriptorReader.java | 14 +
.../impl/standalone/RepositorySystemSupplier.java | 22 +-
.../maven/impl/DefaultSettingsXmlFactoryTest.java | 108 +++
.../impl/DefaultToolchainsXmlFactoryTest.java | 108 +++
.../impl/model/DefaultModelValidatorTest.java | 15 +-
.../maven/impl/model/ParentCycleDetectionTest.java | 63 ++
.../raw-model/dm-with-chained-property-in-id.xml | 22 +-
.../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 | 59 ++
.../pom.xml | 9 +-
.../core-it-plugins/maven-it-plugin-site/pom.xml | 2 +-
its/pom.xml | 2 +-
pom.xml | 10 +-
src/mdo/writer-stax.vm | 59 +-
src/mdo/writer.vm | 54 +-
57 files changed, 2689 insertions(+), 607 deletions(-)
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%)
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%)