This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch move-testing-package-master
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 42cb536e3b Move testing classes from org.apache.maven.api to
org.apache.maven.testing
add da75950645 [MNG-8604] Fix concurrent builder crash when reactor module
is used as plugin (#11820)
add 31aa6c7dc0 Fix thread-safety in DefaultModelValidator (#11734)
add 0a957afcb1 Fix NPE in DefaultModelBuilder when POM resolved from
repository (#11922)
add d7b705e9c2 Fix BUILD_CONSUMER profile activation for locally-resolved
parent POMs (#11799)
add bf482b6199 Fix MojoExtension.beforeEach to use merged model instead of
raw parsed model (#12242)
add 1512eff356 Bump actions/setup-java from 5.2.0 to 5.3.0 (#12278)
add f89fbe1675 Bump jlineVersion from 4.1.3 to 4.2.1 (#12279)
add eb404fa388 Move model SPI interfaces from maven-impl to maven-api-spi
(#12274)
add dd69872286 Move testing classes from org.apache.maven.api to
org.apache.maven.testing
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 (42cb536e3b)
\
N -- N -- N refs/heads/move-testing-package-master (dd69872286)
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 +-
.../model/DependencyManagementImporter.java | 1 +
.../model/DependencyManagementInjector.java | 1 +
.../api/services/model/InheritanceAssembler.java | 1 +
.../services/model/LifecycleBindingsInjector.java | 1 +
.../api/services/model/ModelInterpolator.java | 1 +
.../maven/api/services/model/ModelNormalizer.java | 1 +
.../api/services/model/ModelPathTranslator.java | 1 +
.../maven/api/services/model/ModelProcessor.java | 4 +-
.../maven/api/services/model/ModelResolver.java | 2 +
.../api/services/model/ModelResolverException.java | 1 +
.../api/services/model/ModelUrlNormalizer.java | 1 +
.../maven/api/services/model/ModelValidator.java | 1 +
.../api/services/model/ModelVersionParser.java | 0
.../maven/api/services/model/PathTranslator.java | 1 +
.../model/PluginConfigurationExpander.java | 1 +
.../services/model/PluginManagementInjector.java | 1 +
.../services/model/ProfileActivationContext.java | 3 +-
.../maven/api/services/model/ProfileActivator.java | 1 +
.../maven/api/services/model/ProfileInjector.java | 1 +
.../maven/api/services/model/ProfileSelector.java | 1 +
.../maven/api/services/model/RootDetector.java | 4 +-
.../maven/api/services/model/RootLocator.java | 8 ++-
.../maven/api/services/model/UrlNormalizer.java | 5 ++
.../model/validation/DefaultModelValidator.java | 7 +-
.../validation/DefaultModelValidatorTest.java | 64 +++++++++++++++++
.../internal/concurrent/BuildPlanExecutor.java | 27 ++++---
.../internal/concurrent/BuildPlanCreatorTest.java | 34 ++++-----
.../maven/impl/model/DefaultModelBuilder.java | 11 ++-
.../maven/impl/model/DefaultModelBuilderTest.java | 72 +++++++++++++++++++
...ent.xml => consumer-profile-property-child.xml} | 13 ++--
...nt.xml => consumer-profile-property-parent.xml} | 28 ++++++--
...mple-standalone.xml => resolved-dependency.xml} | 11 +--
.../apache/maven/testing/plugin/MojoExtension.java | 16 +++--
.../testing/plugin/MojoExtensionModelTest.java | 84 ++++++++++++++++++++++
...ITgh11798ConsumerPomProfileActivationTest.java} | 18 ++---
.../child}/pom.xml | 28 ++++----
.../pom.xml | 20 +++++-
.../its/gh11798/test-bom/1.0/test-bom-1.0.pom | 7 ++
pom.xml | 2 +-
40 files changed, 399 insertions(+), 91 deletions(-)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/DependencyManagementImporter.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/DependencyManagementInjector.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/InheritanceAssembler.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/LifecycleBindingsInjector.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelInterpolator.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelNormalizer.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelPathTranslator.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelProcessor.java
(96%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelResolver.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelResolverException.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelUrlNormalizer.java
(98%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelValidator.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ModelVersionParser.java
(100%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/PathTranslator.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/PluginConfigurationExpander.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/PluginManagementInjector.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ProfileActivationContext.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ProfileActivator.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ProfileInjector.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/ProfileSelector.java
(99%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/RootDetector.java
(92%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/RootLocator.java
(96%)
rename {impl/maven-impl =>
api/maven-api-spi}/src/main/java/org/apache/maven/api/services/model/UrlNormalizer.java
(93%)
copy
impl/maven-impl/src/test/resources/poms/factory/{props-and-profiles-parent.xml
=> consumer-profile-property-child.xml} (76%)
copy
impl/maven-impl/src/test/resources/poms/factory/{props-and-profiles-grand-parent.xml
=> consumer-profile-property-parent.xml} (58%)
copy impl/maven-impl/src/test/resources/poms/factory/{simple-standalone.xml =>
resolved-dependency.xml} (80%)
create mode 100644
impl/maven-testing/src/test/java/org/apache/maven/testing/plugin/MojoExtensionModelTest.java
copy
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng8561SourceRootTest.java
=> MavenITgh11798ConsumerPomProfileActivationTest.java} (59%)
copy
its/core-it-suite/src/test/resources/{mng-7982-transitive-dependency-management/c
=> gh-11798-consumer-pom-profile-activation/child}/pom.xml (69%)
copy its/core-it-suite/src/test/resources/{gh-11162-consumer-pom-scopes =>
gh-11798-consumer-pom-profile-activation}/pom.xml (76%)
create mode 100644
its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/repo/org/apache/maven/its/gh11798/test-bom/1.0/test-bom-1.0.pom