This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch mojo-logging
in repository https://gitbox.apache.org/repos/asf/maven.git.
from 0135660 Merge remote-tracking branch 'origin/master' into mojo-logging
add e50d65d MNG-7295 - Remove redundant/unused import statements.
add 4fafe44 MNG-7296 - Remove redundant 'if' statement
add c825b97 (doc) Update GH build config - bump 17-ea to 17, use new
setup-java@2 action
add ccb76b0 (doc) Update dead link for Github PR docs
add fbb9d95 MNG-7293:fix resource leak due to Files.walk
add b9fb762 [MNG-7292] Unnecessarily escaped character
add d61fcf7 [MNG-7288] Remove redundant local variables
add 16afe06 [MNG-7290] Java8 improvements
add 2579622 fix indentation
add b31f3ae [MNG-7291] Avoid String concatenation in loops (#572)
add 4daa48e [MNG-7287] Simplify assertion with simpler and equivalent
calls
add 0080e84 [MNG-7297] Remove redundant type arguments (#581)
add 8852b87 [MNG-7270] Switch to shell alternative to "which"
add ffc2b99 [MNG-6389] Move the toolchains model to a separate artifactId
add 274388f [MNG-7303] - Replace Throwable.initCause() with constructor.
add 4c21e11 [MNG-7298] - Avoid redundant conditions.
add 62acc00 Merge remote-tracking branch 'origin/master' into mojo-logging
add 3e2ccb0 Status quo: remove LogFactory, leave all as it was for now
No new revisions were added by this update.
Summary of changes:
.github/workflows/maven.yml | 24 +++----
CONTRIBUTING.md | 2 +-
apache-maven/src/assembly/shared/init | 2 +-
apache-maven/src/assembly/wrapper/source.xml | 4 +-
.../org/apache/maven/artifact/ArtifactUtils.java | 4 +-
.../org/apache/maven/artifact/DefaultArtifact.java | 6 +-
.../maven/artifact/versioning/Restriction.java | 5 +-
.../maven/artifact/versioning/VersionRange.java | 2 +-
.../apache/maven/artifact/ArtifactUtilsTest.java | 16 ++---
.../apache/maven/artifact/DefaultArtifactTest.java | 5 +-
.../versioning/DefaultArtifactVersionTest.java | 4 +-
maven-bom/pom.xml | 10 +++
.../building/DefaultProblemCollectorTest.java | 3 +-
.../apache/maven/building/DefaultProblemTest.java | 3 +-
.../maven/profiles/DefaultProfileManager.java | 6 +-
.../java/org/apache/maven/project/ModelUtils.java | 4 +-
.../StringSearchModelInterpolator.java | 14 +----
.../maven/repository/MetadataResolutionResult.java | 8 +--
.../legacy/DefaultUpdateCheckManager.java | 2 +-
.../repository/legacy/LegacyRepositorySystem.java | 8 +--
.../legacy/WagonConfigurationException.java | 4 +-
.../resolver/DefaultLegacyArtifactCollector.java | 2 +-
.../metadata/DefaultGraphConflictResolver.java | 3 +-
.../repository/metadata/MetadataGraphVertex.java | 2 +-
.../deployer/SimpleArtifactMetadataSource.java | 1 -
.../resolver/DefaultArtifactResolverTest.java | 1 -
.../maven/project/TestMavenRepositorySystem.java | 2 -
.../inheritance/t12/ProjectInheritanceTest.java | 3 +-
.../maven/repository/legacy/PerLookupWagon.java | 3 -
maven-core/pom.xml | 14 ++++-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +-
.../java/org/apache/maven/RepositoryUtils.java | 6 +-
.../metadata/AbstractRepositoryMetadata.java | 2 +-
.../metadata/io/DefaultMetadataReader.java | 4 +-
.../resolver/ArtifactResolutionResult.java | 8 +--
.../apache/maven/bridge/MavenRepositorySystem.java | 4 +-
.../maven/classrealm/DefaultClassRealmManager.java | 2 +-
.../maven/exception/DefaultExceptionHandler.java | 5 +-
.../apache/maven/exception/ExceptionSummary.java | 2 +-
.../apache/maven/execution/ProfileActivation.java | 2 +-
.../org/apache/maven/execution/ReactorManager.java | 4 +-
.../scope/internal/MojoExecutionScopeModule.java | 4 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 5 +-
.../maven/graph/DefaultProjectDependencyGraph.java | 2 +-
.../lifecycle/internal/DependencyContext.java | 6 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 2 +-
.../maven/lifecycle/internal/MojoExecutor.java | 4 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 2 +-
.../maven/plugin/DefaultPluginRealmCache.java | 2 +-
.../maven/plugin/PluginParameterException.java | 8 +--
.../plugin/internal/DefaultMavenPluginManager.java | 11 ++--
.../maven/plugin/internal/MojoLogFactory.java | 6 +-
.../prefix/NoPluginFoundForPrefixException.java | 12 ++--
.../version/PluginVersionNotFoundException.java | 2 +-
.../version/PluginVersionResolutionException.java | 6 +-
.../project/DefaultDependencyResolutionResult.java | 2 +-
.../maven/project/DefaultMavenProjectHelper.java | 4 +-
.../maven/project/DefaultProjectRealmCache.java | 2 +-
.../maven/project/ExtensionDescriptorBuilder.java | 2 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../project/artifact/ActiveProjectArtifact.java | 6 +-
.../artifact/DefaultProjectArtifactsCache.java | 4 +-
.../project/artifact/MavenMetadataSource.java | 6 +-
.../maven/project/artifact/ProjectArtifact.java | 2 +-
.../maven/session/scope/internal/SessionScope.java | 2 +-
.../session/scope/internal/SessionScopeModule.java | 2 +-
.../settings/DefaultMavenSettingsBuilder.java | 2 +-
.../lifecycle/DelegatingMojoExecutionListener.java | 1 -
.../lifecycle/LifecycleExecutorSubModulesTest.java | 3 +-
.../maven/lifecycle/LifecycleExecutorTest.java | 2 -
.../internal/LifecycleDependencyResolverTest.java | 5 +-
.../stub/LifecycleTaskSegmentCalculatorStub.java | 2 -
.../org/apache/maven/plugin/PluginManagerTest.java | 2 -
.../apache/maven/project/PomConstructionTest.java | 26 ++++----
.../maven/toolchain/DefaultToolchainTest.java | 48 ++++++++------
.../internal/BootstrapCoreExtensionManager.java | 3 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 5 +-
.../maven/model/building/DefaultModelBuilder.java | 10 +--
.../maven/model/building/FileToRawModelMerger.java | 8 +--
.../org/apache/maven/model/building/Result.java | 4 +-
.../profile/activation/FileProfileActivator.java | 6 +-
.../activation/JdkVersionProfileActivator.java | 6 +-
.../OperatingSystemProfileActivator.java | 6 +-
.../activation/PropertyProfileActivator.java | 6 +-
.../StringSearchModelInterpolatorTest.java | 1 -
.../activation/AbstractProfileActivatorTest.java | 1 -
.../validation/DefaultModelValidatorTest.java | 8 +--
.../model/transform/AbstractEventXMLFilter.java | 32 +++++-----
.../maven/model/transform/DependencyKey.java | 7 +--
.../maven/model/transform/sax/SAXEventFactory.java | 10 +--
.../apache/maven/plugin/descriptor/Parameter.java | 2 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 2 +-
.../apache/maven/plugin/logging/LogFactory.java | 46 --------------
.../descriptor/PluginDescriptorBuilderTest.java | 29 +++++----
.../internal/ArtifactDescriptorReaderDelegate.java | 4 +-
.../internal/DefaultVersionResolverTest.java | 2 -
.../maven/settings/io/DefaultSettingsReader.java | 4 +-
maven-toolchain-builder/pom.xml | 70 +++++++++++++++++++++
.../building/DefaultToolchainsBuilder.java | 0
.../building/DefaultToolchainsBuildingRequest.java | 0
.../building/DefaultToolchainsBuildingResult.java | 0
.../toolchain/building/ToolchainsBuilder.java | 0
.../building/ToolchainsBuildingException.java | 0
.../building/ToolchainsBuildingRequest.java | 0
.../building/ToolchainsBuildingResult.java | 0
.../toolchain/io/DefaultToolchainsReader.java | 0
.../toolchain/io/DefaultToolchainsWriter.java | 0
.../toolchain/io/ToolchainsParseException.java | 0
.../maven/toolchain/io/ToolchainsReader.java | 0
.../maven/toolchain/io/ToolchainsWriter.java | 0
.../toolchain/merge/MavenToolchainMerger.java | 0
.../building/DefaultToolchainsBuilderTest.java | 2 +-
.../building/ToolchainsBuildingExceptionTest.java | 8 +--
.../toolchain/merge/MavenToolchainMergerTest.java | 0
.../org/apache/maven/toolchain/global.xml | 0
.../toolchain/model/toolchains-jdks-extend.xml | 0
.../toolchain/model/toolchains-jdks-extra.xml | 0
.../maven/toolchain/model/toolchains-jdks.xml | 0
.../resources/org/apache/maven/toolchain/user.xml | 0
maven-toolchain-model/pom.xml | 59 +++++++++++++++++
.../src/main/mdo/toolchains.mdo | 0
.../apache/maven/wrapper/DefaultDownloader.java | 6 +-
.../java/org/apache/maven/wrapper/Installer.java | 11 ++--
pom.xml | 5 ++
src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
125 files changed, 396 insertions(+), 372 deletions(-)
delete mode 100644
maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/LogFactory.java
create mode 100644 maven-toolchain-builder/pom.xml
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingRequest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuilder.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingException.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingRequest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsReader.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/DefaultToolchainsWriter.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsParseException.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsReader.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/io/ToolchainsWriter.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/main/java/org/apache/maven/toolchain/merge/MavenToolchainMerger.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/building/ToolchainsBuildingExceptionTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/java/org/apache/maven/toolchain/merge/MavenToolchainMergerTest.java
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/global.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extend.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks-extra.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/model/toolchains-jdks.xml
(100%)
rename {maven-core =>
maven-toolchain-builder}/src/test/resources/org/apache/maven/toolchain/user.xml
(100%)
create mode 100644 maven-toolchain-model/pom.xml
rename {maven-core => maven-toolchain-model}/src/main/mdo/toolchains.mdo (100%)
