This is an automated email from the ASF dual-hosted git repository. elharo pushed a change to branch utils in repository https://gitbox.apache.org/repos/asf/maven.git
from 40d2375cd9 Reduce public API surface add d4be73bb1e [MNG-8513] Be stricter about xml combination modes (#2038) add 28f6047464 [MNG-8514] Improve VersionRangeResolverResult (#2039) add 82f159adb9 [MNG-8510] Remove Utils class from maven-di (#2040) add 8af006a931 [MNG-8515] Replace plexus interpolator with the new interpolator service add f5a407cf79 [MNG-8515] Use specialized methods add 81b7565c20 [MNG-8484] Use List.copyOf to make a defensive immutable copy of the input collection add f2e7808afa merge master No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/api/cli/Options.java | 6 +-- .../org/apache/maven/api/cli/mvn/MavenOptions.java | 9 ++-- .../maven/api/cli/mvnenc/EncryptOptions.java | 7 ++- .../apache/maven/api/cli/mvnsh/ShellOptions.java | 7 ++- .../main/java/org/apache/maven/api/Session.java | 17 +++++++ .../api/services/ArtifactDeployerRequest.java | 3 +- .../api/services/ArtifactInstallerRequest.java | 3 +- .../api/services/ArtifactResolverRequest.java | 2 +- .../org/apache/maven/api/services/BaseRequest.java | 10 ---- .../api/services/DependencyResolverRequest.java | 4 +- .../apache/maven/api/services/Interpolator.java | 29 +++++------ .../maven/api/services/SettingsBuilderRequest.java | 14 +++--- .../api/services/VersionRangeResolverResult.java | 39 ++++++++++++++- .../maven/cli/ExtensionConfigurationModule.java | 12 ++--- .../main/java/org/apache/maven/cli/MavenCli.java | 14 +++--- .../internal/BootstrapCoreExtensionManager.java | 12 ++--- .../apache/maven/cli/props/MavenProperties.java | 8 +-- .../maven/cli/props/MavenPropertiesLoader.java | 14 +++--- .../extensions/BootstrapCoreExtensionManager.java | 12 ++--- .../extensions/ExtensionConfigurationModule.java | 12 ++--- .../org/apache/maven/cling/invoker/BaseParser.java | 9 ++-- .../apache/maven/cling/invoker/InvokerUtils.java | 24 +++++++-- .../apache/maven/cling/invoker/LookupInvoker.java | 4 +- .../invoker/PlexusContainerCapsuleFactory.java | 4 +- .../cling/invoker/mvn/CommonsCliMavenOptions.java | 22 ++++---- .../cling/invoker/mvn/LayeredMavenOptions.java | 6 +-- .../invoker/mvnenc/CommonsCliEncryptOptions.java | 21 ++++---- .../invoker/mvnsh/CommonsCliShellOptions.java | 22 ++++---- .../apache/maven/cling/props/MavenProperties.java | 8 +-- .../maven/cling/props/MavenPropertiesLoader.java | 14 +++--- .../src/main/java/org/apache/maven/di/Key.java | 19 ++++--- .../org/apache/maven/di/impl/ReflectionUtils.java | 58 ++++++++++++++++------ .../main/java/org/apache/maven/di/impl/Utils.java | 52 ------------------- .../maven/internal/impl/AbstractSession.java | 8 +++ .../impl/DefaultPluginConfigurationExpander.java | 4 +- .../internal/impl/DefaultSettingsBuilder.java | 8 +-- .../internal/impl/DefaultToolchainsBuilder.java | 4 +- .../internal/impl/model/DefaultInterpolator.java | 39 +++++++-------- .../internal/impl/model/DefaultModelBuilder.java | 3 +- .../impl/model/DefaultModelInterpolator.java | 7 +-- .../impl/model/DefaultModelNormalizer.java | 4 +- .../impl/model/DefaultModelPathTranslator.java | 4 +- .../impl/model/profile/ConditionParser.java | 6 +-- .../model/profile/ConditionProfileActivator.java | 4 +- .../impl/resolver/DefaultModelResolver.java | 19 +++---- .../impl/model/DefaultInterpolatorTest.java | 6 +-- .../impl/model/profile/ConditionParserTest.java | 4 +- .../org/apache/maven/internal/xml/XmlNodeImpl.java | 39 +++++++++++++-- src/mdo/transformer.vm | 10 ++-- 49 files changed, 364 insertions(+), 302 deletions(-) delete mode 100644 impl/maven-di/src/main/java/org/apache/maven/di/impl/Utils.java