This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch plume-football
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 1a05b2451f [MNG-11642] Remove requires static for jline-terminal-ffm
discard c14811794b [MNG-11642] Fix DI annotation processor and nullable
collection handling
discard d5630968d5 [MNG-11642] Add JPMS module support to Maven 4
add 485fa0f0b9 Bump actions/upload-artifact from 7.0.0 to 7.0.1 (#11931)
add b8636bd93a Bump eu.maveniverse.maven.plugins:bom-builder3 from 1.3.2
to 1.3.3 (#11912)
add 2e18d8f42b Bump jlineVersion from 4.0.10 to 4.0.11 (#11902)
add 77e7dc636d Bump actions/cache from 5.0.4 to 5.0.5 (#11942)
add 9285ab3a22 Bump com.github.siom79.japicmp:japicmp-maven-plugin (#11941)
add 7830270297 Bump jlineVersion from 4.0.11 to 4.0.12 (#11940)
add 6fdf4f4dcb Bump com.google.guava:guava from 33.5.0-jre to 33.6.0-jre
(#11950)
add 868037111d Update to Mimir 0.11.3 (#11960)
add 528a0f001a Promote java version in JavaToolchain
add d573d13ac3 Bump com.github.siom79.japicmp:japicmp-maven-plugin (#11961)
add a5558f892d Maven 3.9.15 - update doap file
add 388337b329 Feat: collapse maven-executor and apply fixes (#11976)
add 695abe0002 Bump net.sourceforge.pmd:pmd-core from 7.23.0 to 7.24.0
(#11988)
add 1762cf66de Remove extracted Mac OS JLine binaries from Maven distro
add d27af1a895 Add dependabot ignore for JLine 4.x on 3.10.x
add 229cfe56c2 Bump jlineVersion from 4.0.12 to 4.0.14 (#12001)
add 9cedc78f34 improve align in dependency graph
add dd92d2c20c Bump com.github.siom79.japicmp:japicmp-maven-plugin (#12020)
add 606f9477e0 Export scope package from resolver-api 2.x
add 22ca766fcf Bump org.codehaus.plexus:plexus-classworlds from 2.9.0 to
2.11.0
add 8974945509 Bump org.apache.maven:maven-parent from 47 to 48 (#12027)
add 8c36c76ae0 Fix #12045: fix mvnup plugin upgrade strategy for inherited
plugins from remote parent POMs
add cee3c33c74 Fix #11920: skip expression validation for profile
repository URLs
add b5ed8ae6e5 Bump parent to 48 - cleanups
add a05cab9101 Bump slf4jVersion from 2.0.17 to 2.0.18 (#12056)
add 9332ad3d55 Filter transitive repositories with uninterpolated IDs
(#12049) (#12050)
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 66e3222059 Fix mvnup to replace deprecated ${basedir} in repository
URLs (#12105)
add bbc4aaf385 mvnup: upgrade enforcer plugin minimum and add new plugin
upgrades (#12119)
add 8d918723d5 Fix incompatible extensions in mvnup for Maven 4
compatibility (#12120)
add d9707470aa Bump com.fasterxml.woodstox:woodstox-core from 7.1.1 to
7.2.0 (#12129)
add 8115238b1a Bump asmVersion from 9.9.1 to 9.10 (#12128)
add f101f3fc07 Fix #12086: filter transitive repos and deps with
uninterpolated expressions (#12088)
add 2bfeb5184f [MNG-11642] Add JPMS module support to Maven 4
add 6966e9a554 [MNG-11642] Fix DI annotation processor and nullable
collection handling
add bacac8602a [MNG-11642] Remove requires static for jline-terminal-ffm
add a1e8373c04 Fix domtrip API change: children() -> childElements()
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 (1a05b2451f)
\
N -- N -- N refs/heads/plume-football (a1e8373c04)
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:
.github/dependabot.yml | 5 +-
.github/workflows/maven.yml | 30 +-
apache-maven/pom.xml | 5 +-
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/JavaToolchain.java | 2 +
.../maven/api/services/MavenBuilderException.java | 9 +-
.../java/org/apache/maven/api/xml/XmlNode.java | 38 +-
.../apache/maven/toolchain/java/JavaToolchain.java | 7 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 11 +
.../maven/toolchain/java/JavaToolchainImpl.java | 12 +
.../legacy/DefaultUpdateCheckManagerTest.java | 4 +-
.../toolchain/java/JavaToolchainFactoryTest.java | 94 +++
.../java/org/apache/maven/cli/MavenCliTest.java | 5 +-
.../maven/model/building/DefaultModelBuilder.java | 12 +-
.../java/org/apache/maven/model/InputLocation.java | 5 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 38 +-
doap_Maven.rdf | 11 +
.../apache/maven/cling/invoker/LookupInvoker.java | 8 +-
.../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 | 192 +++--
.../cling/invoker/mvnup/goals/PomDiscovery.java | 4 +-
.../mvnup/goals/AbstractUpgradeGoalTest.java | 261 +++++++
.../mvnup/goals/CompatibilityFixStrategyTest.java | 203 +++++-
.../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 | 339 ++++++++-
.../main/java/org/apache/maven/DefaultMaven.java | 1 +
.../DefaultRepositorySystemSessionFactory.java | 103 +--
.../maven/internal/impl/DefaultProjectManager.java | 6 +-
.../java/org/apache/maven/lifecycle/Lifecycle.java | 13 +-
.../internal/concurrent/BuildPlanExecutor.java | 29 +-
.../DefaultPluginDependenciesResolver.java | 2 +
.../maven/project/DefaultProjectBuilder.java | 8 +
.../org/apache/maven/project/MavenProject.java | 20 +-
.../session/scope/internal/SessionScopeModule.java | 4 +
.../main/resources/META-INF/maven/extension.xml | 1 +
.../DefaultRepositorySystemSessionFactoryTest.java | 96 +--
.../project/DefaultMavenProjectBuilderTest.java | 39 +
.../apache/maven/project/ProjectBuilderTest.java | 44 +-
.../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 +
.../org/apache/maven/di/impl/InjectorImpl.java | 4 +-
.../{api/cli => cling/executor}/Executor.java | 2 +-
.../cli => cling/executor}/ExecutorException.java | 2 +-
.../maven/cling/executor/ExecutorHelper.java | 3 -
.../cli => cling/executor}/ExecutorRequest.java | 2 +-
.../apache/maven/cling/executor/ExecutorTool.java | 2 -
.../executor/embedded/EmbeddedMavenExecutor.java | 23 +-
.../cling/executor/forked/ForkedMavenExecutor.java | 8 +-
.../maven/cling/executor/internal/HelperImpl.java | 6 +-
.../maven/cling/executor/internal/ToolboxTool.java | 4 +-
.../cling/executor/MavenExecutorTestSupport.java | 2 -
.../embedded/EmbeddedMavenExecutorTest.java | 2 +-
.../executor/forked/ForkedMavenExecutorTest.java | 2 +-
.../maven/cling/executor/impl/ToolboxToolTest.java | 4 +-
.../maven/impl/DefaultJavaToolchainFactory.java | 20 +-
.../maven/impl/DefaultSettingsXmlFactory.java | 16 +-
.../maven/impl/DefaultToolchainsXmlFactory.java | 16 +-
.../maven/impl/model/DefaultModelBuilder.java | 28 +-
.../maven/impl/model/DefaultModelValidator.java | 67 +-
.../resolver/DefaultArtifactDescriptorReader.java | 49 ++
.../impl/standalone/RepositorySystemSupplier.java | 22 +-
.../impl/DefaultJavaToolchainFactoryTest.java | 97 +++
.../maven/impl/DefaultSettingsXmlFactoryTest.java | 108 +++
.../impl/DefaultToolchainsXmlFactoryTest.java | 108 +++
.../maven/impl/model/DefaultModelBuilderTest.java | 6 +-
.../impl/model/DefaultModelValidatorTest.java | 21 +-
.../maven/impl/model/ParentCycleDetectionTest.java | 63 ++
.../raw-model/dm-with-chained-property-in-id.xml | 22 +-
.../profile-with-property-in-repository-url.xml | 59 +-
.../java/org/apache/maven/jline/FastTerminal.java | 6 +
.../maven/api/plugin/testing/MojoExtension.java | 7 +-
.../testing/stubs/RepositorySystemSupplier.java | 25 +-
.../maven/internal/xml/DefaultXmlService.java | 146 +++-
.../apache/maven/internal/xml/XmlNodeImplTest.java | 799 +++++++++++++++++++++
.../it/MavenITgh11978PlaceholderInCliArgTest.java | 59 ++
.../pom.xml | 9 +-
.../core-it-plugins/maven-it-plugin-site/pom.xml | 2 +-
.../main/java/org/apache/maven/it/Verifier.java | 4 +-
its/pom.xml | 6 +-
pom.xml | 29 +-
src/graph/ReactorGraph.java | 57 +-
src/mdo/writer-stax.vm | 59 +-
src/mdo/writer.vm | 54 +-
src/site/site.xml | 6 -
99 files changed, 3930 insertions(+), 847 deletions(-)
create mode 100644
compat/maven-compat/src/test/java/org/apache/maven/toolchain/java/JavaToolchainFactoryTest.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
rename impl/maven-executor/src/main/java/org/apache/maven/{api/cli =>
cling/executor}/Executor.java (98%)
rename impl/maven-executor/src/main/java/org/apache/maven/{api/cli =>
cling/executor}/ExecutorException.java (97%)
rename impl/maven-executor/src/main/java/org/apache/maven/{api/cli =>
cling/executor}/ExecutorRequest.java (99%)
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultJavaToolchainFactoryTest.java
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%)
