This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvnup
in repository https://gitbox.apache.org/repos/asf/maven.git
discard e6db367d25 feat: improve indentation detection to support different
XML formatting styles
discard 05331bb82f chore: ensure pluginManagement is added before plugins
section
discard 86542b4628 chore: enhance Maven upgrade tools with additional
compatibility fixes
discard 68ca50fcdc Add test to verify duplicate plugins in pluginManagement
are handled
discard 55e706fa81 Add support for fixing duplicate dependencies in
dependencyManagement
discard d599d7e5e8 Improve BaseUpgradeGoal to fix Maven 4 compatibility issues
discard 4c7f2f6153 feat: add parent POM plugin detection with proper XML
formatting
discard f828473e7d Remove duplicate headers
discard 1258b0d03f feat: Implement comprehensive Maven upgrade tool with
plugin compatibility
add 5d8fe27c83 [MNG-8737] Bump xmlunitVersion from 2.10.1 to 2.10.2 (#2391)
add 5e41b2b395 [MNG-8754] Upgrade Maven Bom Builder Plugin (#2408)
add 1587f8db87 [MNG-8755] Bump com.fasterxml.woodstox:woodstox-core from
7.1.0 to 7.1.1 (#2409)
add 0eafb72297 [MNG-8755] Bump jlineVersion from 3.30.3 to 3.30.4 (#2405)
add 85af2c71b8 [MNG-8757] Bump org.codehaus.mojo:exec-maven-plugin from
3.5.0 to 3.5.1 (#2397)
add f7b19bc72c [MNG-8759] Restore toString method in DefaultJavaToolchain
add e19aa49020 [MNG-8761] Add Maven 3 MavenToolchainsXpp3Reader/Writer
add 33a6ffea64 [MNG-8763] Remove name from site bannerLeft
add 3b59e6b78e [MNG-8764] Sort injected lists by @Priority annotation
add 9326e5ad6f [MNG-8765] Implement comprehensive Maven upgrade tool
(mvnup) with Maven 4 compatibility
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 (e6db367d25)
\
N -- N -- N refs/heads/mvnup (9326e5ad6f)
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/pom.xml | 9 +-
.../apache/maven/api/cli/mvnup/UpgradeOptions.java | 6 +
.../maven/toolchain/ToolchainManagerFactory.java | 10 +
compat/maven-toolchain-model/pom.xml | 4 +
.../model/io/xpp3/MavenToolchainsXpp3Reader.java} | 123 +-
.../model/io/xpp3/MavenToolchainsXpp3Writer.java} | 38 +-
.../invoker/mvnup/CommonsCliUpgradeOptions.java | 11 +
.../maven/cling/invoker/mvnup/UpgradeContext.java | 124 ++
.../invoker/mvnup/goals/AbstractUpgradeGoal.java | 291 +++
.../mvnup/goals/AbstractUpgradeStrategy.java | 95 +
.../maven/cling/invoker/mvnup/goals/Apply.java | 15 +-
.../cling/invoker/mvnup/goals/BaseUpgradeGoal.java | 2234 --------------------
.../maven/cling/invoker/mvnup/goals/Check.java | 16 +-
.../mvnup/goals/CompatibilityFixStrategy.java | 555 +++++
.../maven/cling/invoker/mvnup/goals/GAV.java} | 53 +-
.../maven/cling/invoker/mvnup/goals/GAVUtils.java | 132 ++
.../maven/cling/invoker/mvnup/goals/Help.java | 53 +-
.../invoker/mvnup/goals/InferenceStrategy.java | 617 ++++++
.../maven/cling/invoker/mvnup/goals/JDomUtils.java | 465 ++++
.../invoker/mvnup/goals/ModelUpgradeStrategy.java | 246 +++
.../invoker/mvnup/goals/ModelVersionUtils.java | 228 ++
.../invoker/mvnup/goals/ParentPomResolver.java | 208 +-
.../mvnup/goals/{Apply.java => PluginUpgrade.java} | 32 +-
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 585 +++++
.../invoker/mvnup/{ => goals}/PomDiscovery.java | 54 +-
.../invoker/mvnup/goals/StrategyOrchestrator.java | 179 ++
.../invoker/mvnup/goals/UpgradeConstants.java | 234 ++
.../cling/invoker/mvnup/goals/UpgradeResult.java | 119 ++
.../cling/invoker/mvnup/goals/UpgradeStrategy.java | 91 +
.../cling/invoker/mvnup/goals/package-info.java | 81 +
.../maven/cling/invoker/mvnup/jdom/Artifacts.java | 32 -
.../maven/cling/invoker/mvnup/jdom/IOConsumer.java | 26 -
.../maven/cling/invoker/mvnup/jdom/IOSupplier.java | 25 -
.../maven/cling/invoker/mvnup/jdom/JDomCfg.java | 43 -
.../invoker/mvnup/jdom/JDomContentHelper.java | 165 --
.../cling/invoker/mvnup/jdom/JDomDocumentIO.java | 139 --
.../invoker/mvnup/jdom/JDomExtensionsCfg.java | 54 -
.../invoker/mvnup/jdom/JDomExtensionsEditor.java | 101 -
.../invoker/mvnup/jdom/JDomExtensionsSource.java | 48 -
.../mvnup/jdom/JDomExtensionsTransformer.java | 93 -
.../maven/cling/invoker/mvnup/jdom/JDomPomCfg.java | 216 --
.../invoker/mvnup/jdom/JDomPomCleanupHelper.java | 260 ---
.../cling/invoker/mvnup/jdom/JDomPomEditor.java | 576 -----
.../invoker/mvnup/jdom/JDomPomTransformer.java | 167 --
.../mvnup/jdom/JDomTransformationContext.java | 52 -
.../maven/cling/invoker/mvnup/jdom/JDomUtils.java | 651 ------
.../maven/cling/invoker/mvnup/jdom/Sink.java | 67 -
.../maven/cling/invoker/mvnup/jdom/Source.java | 35 -
.../cling/invoker/mvnup/jdom/package-info.java | 16 -
.../mvnup/goals/AbstractUpgradeGoalTest.java | 332 +++
.../maven/cling/invoker/mvnup/goals/ApplyTest.java | 425 +---
.../maven/cling/invoker/mvnup/goals/CheckTest.java | 139 ++
.../mvnup/goals/CompatibilityFixStrategyTest.java | 314 +++
.../mvnup/goals/DependencyInferenceTest.java | 373 ----
.../invoker/mvnup/goals/FinalRefactoringSummary.md | 173 ++
.../maven/cling/invoker/mvnup/goals/GAVTest.java | 149 ++
.../cling/invoker/mvnup/goals/GAVUtilsTest.java | 437 ++++
.../maven/cling/invoker/mvnup/goals/HelpTest.java | 26 +-
.../invoker/mvnup/goals/InferenceStrategyTest.java | 694 ++++++
.../JDomUtilsTest.java} | 45 +-
.../invoker/mvnup/goals/Maven400InferenceTest.java | 387 ----
.../mvnup/goals/Maven4CompatibilityFixesTest.java | 497 -----
.../mvnup/goals/ModelUpgradeStrategyTest.java | 316 +++
.../invoker/mvnup/goals/ModelVersionUtilsTest.java | 453 ++++
.../mvnup/goals/MvnDirectoryCreationTest.java | 161 --
.../mvnup/goals/ParameterizedTestExamples.java | 163 ++
.../invoker/mvnup/goals/ParentInferenceTest.java | 371 ----
.../mvnup/goals/PluginManagementOrderTest.java | 283 ---
.../invoker/mvnup/goals/PluginOptionsTest.java | 294 ---
.../mvnup/goals/PluginUpgradeStrategyTest.java | 583 +++++
.../invoker/mvnup/goals/PluginUpgradeTest.java | 673 ------
.../cling/invoker/mvnup/goals/PomBuilder.java | 188 ++
.../mvnup/goals/StrategyOrchestratorTest.java | 280 +++
.../maven/cling/invoker/mvnup/goals/TestUtils.java | 236 +++
.../invoker/mvnup/goals/UpgradeResultTest.java | 223 ++
.../goals/UpgradeWorkflowIntegrationTest.java | 251 +++
.../org/apache/maven/di/impl/InjectorImpl.java | 8 +-
.../org/apache/maven/di/impl/InjectorImplTest.java | 70 +
.../maven/impl/DefaultJavaToolchainFactory.java | 5 +
its/src/site/site.xml | 4 +-
pom.xml | 6 +-
src/site/site.xml | 4 +-
82 files changed, 9549 insertions(+), 8688 deletions(-)
copy
compat/{maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java
=>
maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/io/xpp3/MavenToolchainsXpp3Reader.java}
(52%)
copy
compat/{maven-settings/src/main/java/org/apache/maven/settings/io/xpp3/SettingsXpp3Writer.java
=>
maven-toolchain-model/src/main/java/org/apache/maven/toolchain/model/io/xpp3/MavenToolchainsXpp3Writer.java}
(61%)
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeGoal.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeStrategy.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/BaseUpgradeGoal.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/CompatibilityFixStrategy.java
copy
impl/{maven-core/src/main/java/org/apache/maven/artifact/resolver/filter/ScopeArtifactFilter.java
=>
maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/GAV.java}
(53%)
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/GAVUtils.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategy.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/JDomUtils.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategy.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtils.java
copy
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/{Apply.java
=> PluginUpgrade.java} (60%)
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategy.java
rename impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/{ =>
goals}/PomDiscovery.java (86%)
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/StrategyOrchestrator.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeConstants.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeResult.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeStrategy.java
create mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/package-info.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/Artifacts.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/IOConsumer.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/IOSupplier.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomCfg.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomContentHelper.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomDocumentIO.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomExtensionsCfg.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomExtensionsEditor.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomExtensionsSource.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomExtensionsTransformer.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomPomCfg.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomPomCleanupHelper.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomPomEditor.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomPomTransformer.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomTransformationContext.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/JDomUtils.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/Sink.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/Source.java
delete mode 100644
impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/jdom/package-info.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeGoalTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/CheckTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/CompatibilityFixStrategyTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/DependencyInferenceTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/FinalRefactoringSummary.md
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/GAVTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/GAVUtilsTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/InferenceStrategyTest.java
rename
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/{jdom/IndentationDetectionTest.java
=> goals/JDomUtilsTest.java} (88%)
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/Maven400InferenceTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/Maven4CompatibilityFixesTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelUpgradeStrategyTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ModelVersionUtilsTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/MvnDirectoryCreationTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ParameterizedTestExamples.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/ParentInferenceTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginManagementOrderTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginOptionsTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeStrategyTest.java
delete mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PluginUpgradeTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/PomBuilder.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/StrategyOrchestratorTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/TestUtils.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeResultTest.java
create mode 100644
impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeWorkflowIntegrationTest.java
