This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch
dependabot/maven/maven-4.0.x/eu.maveniverse.maven.mimir-testing-0.12.0
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 6235315eb9 Update Mimir version in workflow
discard 947157f7e8 Bump eu.maveniverse.maven.mimir:testing from 0.11.2 to
0.12.0
add 32c10fbe03 Bump net.sourceforge.pmd:pmd-core from 7.24.0 to 7.25.0
(#12197)
add ae66c1d6f7 Bump domtripVersion from 1.5.1 to 1.5.2 (#12196)
add 2fa13c9296 Bump xmlunitVersion from 2.11.0 to 2.12.0 (#12195)
add fab6a2603f Bump net.bytebuddy:byte-buddy from 1.18.8 to 1.18.10
(#12211)
add 3875903076 Bump ch.qos.logback:logback-classic from 1.5.33 to 1.5.34
(#12210)
add 12f42e6027 Bump actions/checkout from 6.0.2 to 6.0.3 (#12209)
add b9e7437989 Bump jlineVersion from 4.1.2 to 4.1.3 (#12194)
add 76712b8566 Fix deadlocks in request cache (unstable hashCode,
re-entrant self-deadlock, mutable properties) (#12166)
add 230bdb26e2 Use effective model to resolve properties from remote
parent POMs in mvnup (#12158) (#12222)
add 51e59bb30c [4.0.x] Fix mvnup plugin upgrade for versions locked by
parent build/plugins (#12223)
add a4aa7821c5 Remove invalid combine.self and combine.children attributes
instead of converting them (#12160) (#12224)
add 3ff51df5f0 Fix mvnup PLUGIN_UPGRADES inconsistencies for compiler and
exec plugins (#12172) (#12225)
add 2b0693424a Bump scala-maven-plugin upgrade target from 4.9.2 to 4.9.5
(#12173) (#12226)
add 8c648c75b7 Use request properties consistently for CI-friendly version
interpolation (#12184) (#12227)
add b9eadbd202 Bump exec-maven-plugin target to 3.5.0 and fix
PLUGIN_UPGRADES inconsistencies (#12200) (#12228)
add 3c62e2e759 Filter project repos with uninterpolated property
expressions (#12204) (#12229)
add 2941bf3e91 Fix mvnup effective model analysis for CI-friendly parent
versions (#12205) (#12230)
add 034800bcf9 Fix MavenITgh12184CIFriendlyParentVersionTest compilation
on 4.0.x
add c8abb9c5e4 Refactor JUnit extensions to avoid using static fields.
add 5ad8e2c798 [MNG-6772] Re-enable integration test for nested import
scope repository override (#11826) (#12231)
add 1bffa600b0 Fix @PreDestroy ClassNotFoundException from premature
ClassRealm disposal (#11825) (#12232)
add c951af7cde Fix #11796: Preserve default-phases bindings for standard
lifecycle phases (#11889) (#12233)
add cee05ae4d9 Fix #11856: Improve error message for prefix-based remote
repository filtering errors (#11888) (#12234)
add 79aad04e34 Fix Source.targetPath incorrectly aligned to basedir
(#12206) (#12235)
add f92777366f [GH-11772] Fail-fast consumer POM validation for non-4.0.0
model versions (#11780) (#12236)
add 85f63af0df fix reportSet inheritance in Maven 4 model building
add 9031f75c69 Bump org.jacoco:jacoco-maven-plugin from 0.8.14 to 0.8.15
add 174b01870e Bump com.fasterxml.woodstox:woodstox-core from 7.2.0 to
7.2.1
add e25a2a745b [#11767] Fix consumer POM builder failing to resolve BOM
imports from settings.xml profile repositories
add 282804f69d Fix #11973: Restore backward-compatible DefaultToolchain
constructor
add 4efba7210b document supported values (#11810)
add 8bedea9479 Fix MavenITConsumerPomBomFromSettingsRepoTest missing super
constructor call (#12253)
add ec69fbf852 Avoid reflective InputSource modelId mutation (#12147)
add aa3783fcff Add XmlService classloader fallback for ServiceLoader
discovery (#12254)
add 5bdb653170 Fix #11715: preserve 4.1.0 namespace/schema in
help:effective-pom (#12255)
add 6fcfcc4623 Handle missing package metadata in model ids (#12257)
add 9dfe909594 Fix ConditionParser to handle newlines before && operator
(#12259)
add 80d8359825 Bump eu.maveniverse.maven.mimir:testing from 0.11.2 to
0.12.0
add 40101d9f52 Update Mimir version in workflow
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 (6235315eb9)
\
N -- N -- N
refs/heads/dependabot/maven/maven-4.0.x/eu.maveniverse.maven.mimir-testing-0.12.0
(40101d9f52)
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/workflows/maven.yml | 6 +-
.../main/java/org/apache/maven/api/Constants.java | 15 +
.../org/apache/maven/api/feature/Features.java | 8 +-
.../maven/api/services/ModelBuilderRequest.java | 4 +-
api/maven-api-model/src/main/mdo/maven.mdo | 2 +-
.../java/org/apache/maven/api/xml/XmlService.java | 10 +-
.../apache/maven/toolchain/DefaultToolchain.java | 22 +
.../model/plugin/DefaultReportingConverter.java | 9 +-
.../model/superpom/DefaultSuperPomProvider.java | 9 +-
.../plugin/DefaultReportingConverterTest.java} | 20 +-
.../superpom/DefaultSuperPomProviderTest.java} | 20 +-
.../inheritance/plugin-configuration-child.xml | 16 +
.../inheritance/plugin-configuration-expected.xml | 12 +
.../inheritance/plugin-configuration-parent.xml | 11 +
.../maven/model/io/xpp3/MavenXpp3Writer.java | 16 +
.../java/org/apache/maven/model/ModelTest.java | 41 ++
.../mvnup/goals/CompatibilityFixStrategy.java | 164 ++++-
.../invoker/mvnup/goals/PluginUpgradeStrategy.java | 165 +++--
.../mvnup/goals/CompatibilityFixStrategyTest.java | 711 +++++++++++++++++++++
.../mvnup/goals/PluginUpgradeStrategyTest.java | 167 ++++-
.../maven/exception/DefaultExceptionHandler.java | 34 +-
.../internal/impl/DefaultLifecycleRegistry.java | 70 +-
.../impl/DefaultConsumerPomBuilder.java | 89 ++-
.../maven/plugin/DefaultExtensionRealmCache.java | 2 +-
.../maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../project/DefaultProjectBuildingHelper.java | 11 +
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../exception/DefaultExceptionHandlerTest.java | 40 ++
.../impl/DefaultLifecycleRegistryTest.java | 20 +-
.../impl/ConsumerPomBuilderTest.java | 78 +++
.../maven/lifecycle/DefaultLifecyclesTest.java | 50 ++
.../maven/plugin/DefaultRealmCacheDisposeTest.java | 85 +++
.../apache/maven/project/ProjectBuilderTest.java | 95 +++
.../project-builder/resource-target-path}/pom.xml | 24 +-
.../project-builder/source-target-path}/pom.xml | 39 +-
.../consumer/parent-with-conditions/pom.xml | 32 +
impl/maven-impl/pom.xml | 5 +
.../apache/maven/impl/DefaultModelXmlFactory.java | 153 ++++-
.../apache/maven/impl/DefaultSuperPomProvider.java | 9 +-
.../maven/impl/cache/AbstractRequestCache.java | 13 +-
.../apache/maven/impl/cache/CachingSupplier.java | 20 +
.../maven/impl/model/DefaultModelBuilder.java | 70 +-
.../impl/model/DefaultModelPathTranslator.java | 8 +-
.../maven/impl/model/DefaultModelValidator.java | 8 +-
.../apache/maven/impl/model/MavenModelMerger.java | 2 +-
.../maven/impl/model/profile/ConditionParser.java | 21 +-
.../maven/impl/DefaultModelXmlFactoryTest.java | 127 ++++
.../maven/impl/DefaultSuperPomProviderTest.java | 20 +-
.../model/DefaultInheritanceAssemblerTest.java | 98 +++
.../maven/impl/model/DefaultModelBuilderTest.java | 114 ++++
.../impl/model/DefaultModelPathTranslatorTest.java | 107 ++++
.../impl/model/DefaultModelValidatorTest.java | 26 +-
.../impl/model/profile/ConditionParserTest.java | 48 ++
.../poms/factory/ci-friendly-deps-no-prop.xml | 19 +
.../resources/poms/factory/ci-friendly-deps.xml | 30 +
...profiles-parent.xml => ci-friendly-version.xml} | 17 +-
...rops-and-profiles.xml => simple-standalone.xml} | 10 +-
.../maven/api/di/testing/MavenDIExtension.java | 50 +-
.../maven/api/plugin/testing/MojoExtension.java | 53 +-
.../apache/maven/api/di/testing/SimpleDITest.java | 6 +-
.../maven/internal/xml/XmlServiceLoadingTest.java | 40 +-
.../MavenITConsumerPomBomFromSettingsRepoTest.java | 119 ++++
.../it/MavenITgh11140RepoDmUnresolvedTest.java | 13 +-
.../it/MavenITgh11140RepoInterpolationTest.java | 11 +-
...> MavenITgh11715EffectivePomNamespaceTest.java} | 26 +-
.../maven/it/MavenITgh11772ConsumerPom410Test.java | 101 +++
.../MavenITgh12184CIFriendlyParentVersionTest.java | 64 ++
...mng11796DefaultPhasesStandardLifecycleTest.java | 61 ++
...mng6772NestedImportScopeRepositoryOverride.java | 2 -
.../src/test/resources/gh-11715/pom.xml | 10 +
.../pom.xml | 27 +-
.../apache/maven/its/cpbom/lib-a/2.0/lib-a-2.0.jar | Bin
.../maven/its/cpbom/lib-a/2.0/lib-a-2.0.pom} | 9 +-
.../maven/its/cpbom/the-bom/1.0/the-bom-1.0.pom | 19 +
.../settings-template.xml | 10 +-
.../child}/pom.xml | 19 +-
.../pom.xml | 26 +-
.../child}/pom.xml | 8 +-
.../pom.xml | 11 +-
.../consumer-project}/pom.xml | 10 +-
.../extension-plugin}/pom.xml | 8 +-
.../org/apache/maven/its/mng11796}/TouchMojo.java | 23 +-
.../main/resources/META-INF/plexus/components.xml | 12 +-
pom.xml | 16 +-
84 files changed, 3322 insertions(+), 458 deletions(-)
copy
compat/{maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
=>
maven-model-builder/src/test/java/org/apache/maven/model/plugin/DefaultReportingConverterTest.java}
(75%)
copy
compat/{maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
=>
maven-model-builder/src/test/java/org/apache/maven/model/superpom/DefaultSuperPomProviderTest.java}
(75%)
copy
compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
=>
impl/maven-core/src/test/java/org/apache/maven/internal/impl/DefaultLifecycleRegistryTest.java
(75%)
create mode 100644
impl/maven-core/src/test/java/org/apache/maven/plugin/DefaultRealmCacheDisposeTest.java
copy {its/core-it-suite/src/test/resources/gh-11381 =>
impl/maven-core/src/test/projects/project-builder/resource-target-path}/pom.xml
(68%)
copy {its/core-it-suite/src/test/resources/gh-11381 =>
impl/maven-core/src/test/projects/project-builder/source-target-path}/pom.xml
(53%)
create mode 100644
impl/maven-core/src/test/resources/consumer/parent-with-conditions/pom.xml
copy
compat/maven-embedder/src/examples/simple-project/src/test/java/org/apache/maven/embedder/AppTest.java
=>
impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSuperPomProviderTest.java
(75%)
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultInheritanceAssemblerTest.java
create mode 100644
impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelPathTranslatorTest.java
create mode 100644
impl/maven-impl/src/test/resources/poms/factory/ci-friendly-deps-no-prop.xml
create mode 100644
impl/maven-impl/src/test/resources/poms/factory/ci-friendly-deps.xml
copy
impl/maven-impl/src/test/resources/poms/factory/{props-and-profiles-parent.xml
=> ci-friendly-version.xml} (66%)
copy impl/maven-impl/src/test/resources/poms/factory/{props-and-profiles.xml
=> simple-standalone.xml} (82%)
copy
compat/maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java
=>
impl/maven-xml/src/test/java/org/apache/maven/internal/xml/XmlServiceLoadingTest.java
(53%)
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITConsumerPomBomFromSettingsRepoTest.java
copy
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITgh11384RecursiveVariableReferenceTest.java
=> MavenITgh11715EffectivePomNamespaceTest.java} (60%)
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11772ConsumerPom410Test.java
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh12184CIFriendlyParentVersionTest.java
create mode 100644
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng11796DefaultPhasesStandardLifecycleTest.java
create mode 100644 its/core-it-suite/src/test/resources/gh-11715/pom.xml
copy
its/core-it-suite/src/test/resources/{mng-5639-import-scope-pom-resolution =>
gh-11767-consumer-pom-bom-from-settings-repo}/pom.xml (66%)
copy compat/maven-compat/src/test/repository-system/maven-core-2.1.0.jar =>
its/core-it-suite/src/test/resources/gh-11767-consumer-pom-bom-from-settings-repo/repo/org/apache/maven/its/cpbom/lib-a/2.0/lib-a-2.0.jar
(100%)
copy its/core-it-suite/src/test/resources/{mng-3038/test-other-deps/D2/pom.xml
=>
gh-11767-consumer-pom-bom-from-settings-repo/repo/org/apache/maven/its/cpbom/lib-a/2.0/lib-a-2.0.pom}
(51%)
create mode 100644
its/core-it-suite/src/test/resources/gh-11767-consumer-pom-bom-from-settings-repo/repo/org/apache/maven/its/cpbom/the-bom/1.0/the-bom-1.0.pom
copy its/core-it-suite/src/test/resources/{it0021 =>
gh-11767-consumer-pom-bom-from-settings-repo}/settings-template.xml (88%)
copy its/core-it-suite/src/test/resources/{gh-11321-parent-above-root/deps =>
gh-11772-consumer-pom-410/child}/pom.xml (73%)
copy its/core-it-suite/src/test/resources/{gh-11427-bom-consumer-pom =>
gh-11772-consumer-pom-410}/pom.xml (67%)
copy its/core-it-suite/src/test/resources/{mng-6090-ci-friendly/module-1 =>
gh-12184-ci-friendly-parent-version/child}/pom.xml (88%)
copy its/core-it-suite/src/test/resources/{mng-6057-check-reactor-order =>
gh-12184-ci-friendly-parent-version}/pom.xml (85%)
copy
its/core-it-suite/src/test/resources/{mng-8299-custom-lifecycle/CustomLifecycleProject
=> mng-11796-default-phases-standard-lifecycle/consumer-project}/pom.xml (67%)
copy
its/core-it-suite/src/test/resources/{mng-8299-custom-lifecycle/CustomLifecyclePlugin
=> mng-11796-default-phases-standard-lifecycle/extension-plugin}/pom.xml (84%)
copy
its/{core-it-support/core-it-plugins/maven-it-plugin-optional-mojos/src/main/java/org/apache/maven/plugin/coreit
=>
core-it-suite/src/test/resources/mng-11796-default-phases-standard-lifecycle/extension-plugin/src/main/java/org/apache/maven/its/mng11796}/TouchMojo.java
(68%)
copy
its/core-it-suite/src/test/resources/{mng-8299-custom-lifecycle/CustomLifecyclePlugin
=>
mng-11796-default-phases-standard-lifecycle/extension-plugin}/src/main/resources/META-INF/plexus/components.xml
(55%)
