This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a change to branch MNG-8572-di-type-handler
in repository https://gitbox.apache.org/repos/asf/maven.git


 discard e4f688fa79 [MNG-8572] Support DI beans in build extensions
     add 3330cdb24a [MNGSITE-393] Remove Maven 1 and 2 references (#2276)
     add fffdf0ed2a [MNG-8694] Fix version interpolation and ternary operator 
(#2272)
     add 5d28926894 [MNG-8674] Deprecate mergeId in the Maven 3 model and 
remove it in the new model (#2233)
     add 3706aa1e5c [MNG-8670] Fix concurrent builder missing/wrong project 
events (#2251)
     add ea0e902934 [MNG-8572] Support DI beans in build extensions

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   (e4f688fa79)
            \
             N -- N -- N   refs/heads/MNG-8572-di-type-handler (ea0e902934)

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:
 api/maven-api-model/src/main/mdo/maven.mdo         |  40 ++-
 .../internal/concurrent/BuildPlanExecutor.java     | 293 ++++++++++++++-------
 .../lifecycle/internal/concurrent/BuildStep.java   |  23 +-
 .../project/DefaultMavenProjectBuilderTest.java    |  16 ++
 .../pom.xml                                        |  17 ++
 .../maven/impl/model/DefaultInterpolator.java      |   4 +
 .../maven/impl/model/DefaultModelBuilder.java      |  25 +-
 .../maven/impl/model/DefaultInterpolatorTest.java  |  46 ++++
 ...t.java => MavenITmng8648ProjectEventsTest.java} |  34 ++-
 .../org/apache/maven/it/TestSuiteOrdering.java     |   2 +-
 .../its/mng8572/extension/CustomTypeProvider.java  |   1 +
 .../apache/maven/its/mng8648/ProjectEventSpy.java  |  11 +-
 .../src/test/resources/mng-8648/project/pom.xml    |   2 +
 .../project/{subproject-a => subproject-c}/pom.xml |   2 +-
 .../project/subproject-c/src/main/java/Foo.java}   |   4 +-
 .../project/subproject-d}/pom.xml                  |  14 +-
 16 files changed, 369 insertions(+), 165 deletions(-)
 create mode 100644 
impl/maven-core/src/test/resources/projects/pom-parent-version-from-nested-properties/pom.xml
 rename 
its/core-it-suite/src/test/java/org/apache/maven/it/{MavenITmng8648ProjectStartedEventsTest.java
 => MavenITmng8648ProjectEventsTest.java} (55%)
 copy its/core-it-suite/src/test/resources/mng-8648/project/{subproject-a => 
subproject-c}/pom.xml (91%)
 copy 
its/core-it-suite/src/test/resources/{cyclic-import-scope/v3/componentA/src/main/java/cyclic/Av3.java
 => mng-8648/project/subproject-c/src/main/java/Foo.java} (95%)
 copy its/core-it-suite/src/test/resources/{mng-8340/child2 => 
mng-8648/project/subproject-d}/pom.xml (68%)

Reply via email to