This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.google.inject-guice-7.0.0 in repository https://gitbox.apache.org/repos/asf/maven.git
discard 7aeb1351ca --- updated-dependencies: - dependency-name: com.google.inject:guice dependency-type: direct:development update-type: version-update:semver-major ... add e92f645c27 [maven-release-plugin] prepare release maven-4.0.0-beta-3 add 6e9889b1ad [maven-release-plugin] prepare for next development iteration add dd9679450e [MNG-7902] Sort plugins in the validation report (#1510) add 40448e758b Allow to manually execute GitHub Action add e7ca0684cc Use Maven Wrapper to build add 1af5368b23 Remove unhelpful links that don't describe failure reasons from output (#1545) add 5e97703456 [MNG-8136] Update Eclipse Sisu to 0.9.0.M3 (#1546) add 0456c7c629 Caplital OS name can not activate profile add 808884a85d Fix typo in validation message add 9ce85ef4f4 [MNG-8066] Default exception handler does not handle recursion (#1558) add 9db546ddb9 [MNG-8142] Hidden bug: JDK profile activator throw NumberFormatEx (#1557) add dd670bf9a1 [MNG-8140] Always tell why model was discarded as "invalid" (#1555) add 33010af039 Move modelVersion inference to model builder so that it is also effective on consumer models (#1566) add bea3e72cdb [MNG-8141] Model Builder report issues during build (#1569) add 7161cfa189 [MNG-8153] Add back missing classes from the v3 api (#1577) 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 e9ece0c9c9 Remove commons-io dependency add 1ca6d7f11b --- updated-dependencies: - dependency-name: com.google.inject:guice dependency-type: direct:development update-type: version-update:semver-major ... 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 (7aeb1351ca) \ N -- N -- N refs/heads/dependabot/maven/com.google.inject-guice-7.0.0 (1ca6d7f11b) 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 | 23 +- .github/workflows/maven_build_itself.yml | 8 +- apache-maven/pom.xml | 2 +- .../main/appended-resources/META-INF/LICENSE.vm | 2 + .../main/appended-resources/licenses/EPL-2.0.txt | 277 ++++++++++++++++++ api/maven-api-core/pom.xml | 2 +- .../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 +- api/maven-api-di/pom.xml | 2 +- .../apache/maven/api/di/MojoExecutionScoped.java | 2 - .../org/apache/maven/api/di/SessionScoped.java | 2 - api/maven-api-meta/pom.xml | 2 +- api/maven-api-metadata/pom.xml | 2 +- api/maven-api-model/pom.xml | 2 +- api/maven-api-plugin/pom.xml | 2 +- api/maven-api-plugin/src/main/mdo/plugin.mdo | 38 +++ api/maven-api-settings/pom.xml | 2 +- api/maven-api-spi/pom.xml | 2 +- api/maven-api-toolchain/pom.xml | 2 +- api/maven-api-xml/pom.xml | 2 +- api/pom.xml | 2 +- maven-api-impl/pom.xml | 2 +- .../maven/internal/impl/AbstractSession.java | 28 +- .../internal/impl/DefaultDependencyCollector.java | 109 -------- .../internal/impl/DefaultDependencyResolver.java | 182 ++++++++++++ .../impl/DefaultDependencyResolverResult.java | 11 +- .../internal/impl/model/BuildModelTransformer.java | 13 - .../model/DefaultDependencyManagementImporter.java | 2 +- .../internal/impl/model/DefaultModelBuilder.java | 6 + .../internal/impl/model/DefaultModelValidator.java | 17 +- .../impl/model/DefaultProfileSelector.java | 2 +- .../model/profile/JdkVersionProfileActivator.java | 12 +- .../resolver/DefaultArtifactDescriptorReader.java | 25 +- .../maven/internal/impl/standalone/ApiRunner.java | 2 +- maven-artifact/pom.xml | 2 +- maven-bom/pom.xml | 4 +- maven-builder-support/pom.xml | 2 +- maven-compat/pom.xml | 2 +- maven-core/pom.xml | 7 +- .../maven/exception/DefaultExceptionHandler.java | 27 +- .../scope/internal/MojoExecutionScope.java | 16 +- .../internal/aether/LoggingRepositoryListener.java | 12 +- .../internal/impl/DefaultDependencyResolver.java | 110 -------- .../maven/internal/impl/DefaultProjectBuilder.java | 18 +- .../maven/internal/impl/SisuDiBridgeModule.java | 19 ++ .../plugin/internal/DefaultMavenPluginManager.java | 85 ++++++ .../internal/DefaultPluginValidationManager.java | 8 +- .../maven/session/scope/internal/SessionScope.java | 16 +- .../META-INF/maven/org.apache.maven.api.di.Inject | 2 +- .../exception/DefaultExceptionHandlerTest.java | 16 ++ .../impl/ConsumerPomBuilderTest.java | 2 +- .../apache/maven/project/ProjectBuilderTest.java | 5 +- maven-di/pom.xml | 2 +- .../main/java/org/apache/maven/di/Injector.java | 3 + .../org/apache/maven/di/impl/InjectorImpl.java | 9 +- maven-embedder/pom.xml | 7 +- .../maven/cli/CLIManagerDocumentationTest.java | 10 +- .../maven/cli/event/ExecutionEventLoggerTest.java | 13 +- maven-jline/pom.xml | 2 +- maven-model-builder/pom.xml | 2 +- .../DefaultDependencyManagementImporter.java | 2 +- .../model/profile/DefaultProfileSelector.java | 3 +- .../activation/JdkVersionProfileActivator.java | 10 +- .../OperatingSystemProfileActivator.java | 8 +- .../model/profile/DefaultProfileSelectorTest.java | 72 +++++ .../activation/JdkVersionProfileActivatorTest.java | 25 ++ .../OperatingSystemProfileActivatorTest.java | 14 + maven-model/pom.xml | 2 +- maven-plugin-api/pom.xml | 2 +- .../maven/plugin/descriptor/MojoDescriptor.java | 6 +- .../plugin/descriptor/PluginDescriptorBuilder.java | 6 - .../apache/maven/plugin/lifecycle/Execution.java | 104 +++++++ .../apache/maven/plugin/lifecycle/Lifecycle.java | 109 ++++++++ .../plugin/lifecycle/LifecycleConfiguration.java | 104 +++++++ .../org/apache/maven/plugin/lifecycle/Phase.java | 129 +++++++++ maven-repository-metadata/pom.xml | 2 +- maven-resolver-provider/pom.xml | 2 +- maven-settings-builder/pom.xml | 2 +- maven-settings/pom.xml | 2 +- maven-slf4j-provider/pom.xml | 2 +- maven-slf4j-wrapper/pom.xml | 2 +- maven-toolchain-builder/pom.xml | 2 +- maven-toolchain-model/pom.xml | 2 +- maven-xml-impl/pom.xml | 2 +- pom.xml | 23 +- 95 files changed, 1951 insertions(+), 979 deletions(-) create mode 100644 apache-maven/src/main/appended-resources/licenses/EPL-2.0.txt 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 create mode 100644 maven-model-builder/src/test/java/org/apache/maven/model/profile/DefaultProfileSelectorTest.java create mode 100644 maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Execution.java create mode 100644 maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Lifecycle.java create mode 100644 maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/LifecycleConfiguration.java create mode 100644 maven-plugin-api/src/main/java/org/apache/maven/plugin/lifecycle/Phase.java