This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MNG-7758-next-try
in repository https://gitbox.apache.org/repos/asf/maven.git
omit 0ff0d74c05 [MNG-7758] Report dependency problems for all repository -
plugins
omit e935461b6a [MNG-7758] Report dependency problems for all repository
add 5d139bdd12 [MNG-8151] Merge DependencyCollector into DependencyResolver
add 8d483f922b [MNG-8152] Implement @SessionScoped and
@MojoExecutionScoped from the DI API
add b852f74084 [MNG-8134] Add a @Resolution annotation to mojos to inject
project dependencies collection / resolution result
add c4bf01445d Bump commons-cli:commons-cli from 1.5.0 to 1.8.0
add 75a234c0f6 Bump org.junit:junit-bom from 5.10.1 to 5.10.2
add 8483603ae1 [MNG-7758] Report dependency problems for all repository
add ca4c13a2e8 [MNG-7758] Report dependency problems for all repository -
plugins
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 (0ff0d74c05)
\
N -- N -- N refs/heads/MNG-7758-next-try (ca4c13a2e8)
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:
.../src/main/java/org/apache/maven/api/Node.java | 2 +-
.../main/java/org/apache/maven/api/Session.java | 18 +-
.../apache/maven/api/plugin/annotations/Mojo.java | 35 ++-
.../maven/api/plugin/annotations/Resolution.java | 74 +++++
.../maven/api/services/DependencyCollector.java | 107 -------
.../api/services/DependencyCollectorException.java | 43 ---
.../api/services/DependencyCollectorRequest.java | 310 ---------------------
.../api/services/DependencyCollectorResult.java | 51 ----
.../maven/api/services/DependencyResolver.java | 147 ++++++++--
.../api/services/DependencyResolverRequest.java | 291 +++++++++++++++----
.../api/services/DependencyResolverResult.java | 25 +-
.../maven/api/services/ProjectBuilderResult.java | 2 +-
.../apache/maven/api/di/MojoExecutionScoped.java | 2 -
.../org/apache/maven/api/di/SessionScoped.java | 2 -
api/maven-api-plugin/src/main/mdo/plugin.mdo | 38 +++
.../maven/internal/impl/AbstractSession.java | 28 +-
.../internal/impl/DefaultDependencyCollector.java | 109 --------
.../internal/impl/DefaultDependencyResolver.java | 182 ++++++++++++
.../impl/DefaultDependencyResolverResult.java | 11 +-
.../maven/internal/impl/standalone/ApiRunner.java | 2 +-
.../scope/internal/MojoExecutionScope.java | 16 +-
.../internal/impl/DefaultDependencyResolver.java | 110 --------
.../maven/internal/impl/DefaultProjectBuilder.java | 18 +-
.../maven/internal/impl/SisuDiBridgeModule.java | 19 ++
.../plugin/internal/DefaultMavenPluginManager.java | 85 ++++++
.../maven/session/scope/internal/SessionScope.java | 16 +-
.../META-INF/maven/org.apache.maven.api.di.Inject | 2 +-
.../main/java/org/apache/maven/di/Injector.java | 3 +
.../org/apache/maven/di/impl/InjectorImpl.java | 9 +-
.../maven/plugin/descriptor/MojoDescriptor.java | 6 +-
.../plugin/descriptor/PluginDescriptorBuilder.java | 6 -
pom.xml | 4 +-
32 files changed, 913 insertions(+), 860 deletions(-)
create mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Resolution.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollector.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorException.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java
delete mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyCollector.java
create mode 100644
maven-api-impl/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java
