This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
from 7161cfa189 [MNG-8153] Add back missing classes from the v3 api (#1577)
new 5d139bdd12 [MNG-8151] Merge DependencyCollector into DependencyResolver
new 8d483f922b [MNG-8152] Implement @SessionScoped and
@MojoExecutionScoped from the DI API
new b852f74084 [MNG-8134] Add a @Resolution annotation to mojos to inject
project dependencies collection / resolution result
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
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 -
31 files changed, 911 insertions(+), 858 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
