This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch explicit-module-path in repository https://gitbox.apache.org/repos/asf/maven.git
commit 2759e5506ddb2c3c28f8ad3f0cf2fced509bef70 Merge: b72d1ce132 a37cf3d37f Author: Guillaume Nodet <[email protected]> AuthorDate: Wed Feb 7 01:29:23 2024 +0100 Merge remote-tracking branch 'origin/master' into explicit-module-path # Conflicts: # api/maven-api-core/src/main/java/org/apache/maven/api/DependencyScope.java # api/maven-api-core/src/main/java/org/apache/maven/api/ExtensibleEnum.java # api/maven-api-core/src/main/java/org/apache/maven/api/Language.java # api/maven-api-core/src/main/java/org/apache/maven/api/Packaging.java # api/maven-api-core/src/main/java/org/apache/maven/api/PathScope.java # api/maven-api-core/src/main/java/org/apache/maven/api/ProjectScope.java # api/maven-api-core/src/main/java/org/apache/maven/api/Session.java # api/maven-api-core/src/main/java/org/apache/maven/api/Type.java # api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyResolverRequest.java # maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java # maven-core/src/main/java/org/apache/maven/artifact/handler/manager/DefaultArtifactHandlerManager.java # maven-core/src/main/java/org/apache/maven/internal/aether/TypeRegistryAdapter.java # maven-core/src/main/java/org/apache/maven/internal/impl/DefaultDependencyResolver.java # maven-core/src/main/java/org/apache/maven/internal/impl/DefaultType.java # maven-core/src/main/java/org/apache/maven/internal/impl/DefaultTypeRegistry.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/BomTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/EarTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/EjbClientTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/EjbTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/JarTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/JavaSourceTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/JavadocTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/MavenPluginTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/ParTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/PomTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/RarTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/TestJarTypeProvider.java # maven-core/src/main/java/org/apache/maven/internal/impl/types/WarTypeProvider.java .github/workflows/maven.yml | 7 + api/maven-api-core/pom.xml | 4 +- .../java/org/apache/maven/api/DependencyScope.java | 17 +- .../main/java/org/apache/maven/api/Language.java | 3 + .../main/java/org/apache/maven/api/Packaging.java | 3 + .../main/java/org/apache/maven/api/PathScope.java | 10 +- .../java/org/apache/maven/api/ProjectScope.java | 5 + .../apache/maven/api/di/MojoExecutionScoped.java | 4 +- .../org/apache/maven/api/di/SessionScoped.java | 4 +- .../maven/api/plugin/annotations/Execute.java | 2 +- .../apache/maven/api/plugin/annotations/Mojo.java | 2 +- .../maven/api/plugin/annotations/Parameter.java | 2 +- api/{maven-api-core => maven-api-di}/pom.xml | 26 +- .../main/java/org/apache/maven/api/di/Inject.java} | 18 +- .../main/java/org/apache/maven/api/di/Named.java} | 21 +- .../java/org/apache/maven/api/di/Priority.java} | 17 +- .../java/org/apache/maven/api/di/Provides.java} | 15 +- .../java/org/apache/maven/api/di/Qualifier.java} | 18 +- .../main/java/org/apache/maven/api/di/Scope.java} | 18 +- .../java/org/apache/maven/api/di/Singleton.java} | 14 +- .../main/java/org/apache/maven/api/di/Typed.java} | 20 +- api/pom.xml | 1 + maven-core/pom.xml | 4 + .../internal/EnhancedComponentConfigurator.java | 26 +- .../scope/internal/MojoExecutionScopeModule.java | 2 +- .../plugin/internal/DefaultMavenPluginManager.java | 316 ++++++++------ .../session/scope/internal/SessionScopeModule.java | 2 +- .../maven/session/scope/SessionScopeProxyTest.java | 2 +- maven-di/pom.xml | 51 +++ .../main/java/org/apache/maven/di/Injector.java | 47 +- .../src/main/java/org/apache/maven/di/Key.java | 161 +++++++ .../src/main/java/org/apache/maven/di/Scope.java | 26 +- .../java/org/apache/maven/di/impl/Binding.java | 188 ++++++++ .../apache/maven/di/impl/BindingInitializer.java | 58 +++ .../java/org/apache/maven/di/impl/DIException.java | 33 +- .../org/apache/maven/di/impl/InjectorImpl.java | 357 ++++++++++++++++ .../org/apache/maven/di/impl/ReflectionUtils.java | 381 +++++++++++++++++ .../java/org/apache/maven/di/impl/TypeUtils.java | 379 +++++++++++++++++ .../main/java/org/apache/maven/di/impl/Types.java | 471 +++++++++++++++++++++ .../main/java/org/apache/maven/di/impl/Utils.java | 53 +++ .../di/processor/IndexAnnotationProcessor.java | 152 +++++++ .../services/javax.annotation.processing.Processor | 1 + .../test/java/org/apache/maven/di/impl/DITest.java | 277 ++++++++++++ .../test/java/org/apache/maven/di/impl/TypeT.java | 83 ++++ .../org/apache/maven/di/impl/TypeUtilsTest.java | 157 +++++++ .../maven/model/building/DefaultModelProblem.java | 12 +- .../DefaultDependencyManagementImporter.java | 75 +++- .../model/building/DefaultModelBuilderTest.java | 228 +++++++++- .../test/resources/poms/depmgmt/distant-import.xml | 23 + .../src/test/resources/poms/depmgmt/import.xml | 22 + .../src/test/resources/poms/depmgmt/junit-0.1.xml | 22 + .../src/test/resources/poms/depmgmt/junit-0.2.xml | 22 + .../test/resources/poms/depmgmt/other-import.xml | 22 + .../test/resources/poms/depmgmt/root-dep-first.xml | 28 ++ .../test/resources/poms/depmgmt/root-dep-last.xml | 28 ++ .../poms/depmgmt/root-distance-explicit.xml | 35 ++ .../test/resources/poms/depmgmt/root-distance.xml | 30 ++ .../resources/poms/depmgmt/root-two-imports.xml | 30 ++ pom.xml | 11 + 59 files changed, 3695 insertions(+), 351 deletions(-)
