This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MNG-7276
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard 6e25fc3 Fixed unused import.
discard b5acda4 Cleaned up.
discard 65dbef5 Continued.
discard cdf5971 Continued.
discard d18220d [MNG-7276] - Refactoring - Umbrella
add 3017b85 Refactor MavenSession#getPluginContext to be thread safe
(#575)
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 bb0fed9 [MNG-6914] rename .mvn hidden directory in source to mvn
add bf59026 [MNG-6914] rename MAVEN_LAUNCHER to LAUNCHER_CLASS (from
LAUNCHER_JAR)
add 5be4192 [MNG-6914] drop tar.gz archives for wrapper install
distributions
add b58d8b3 [MNG-6914] move mvnw scripts from maven/shared to
wrapper/shared
add ede86ab [MNG-6914] move apache-maven-wrapper to its own separate
Maven module
add 2f81b7d [MNG-6914] move assembly descriptors to src/assembly
add f46a913 fix javadoc errors
add 2c37a7a Simplify args help
new 42d212a [MNG-7276] - Refactoring - Umbrella
new 7de078f Continued.
new 45ebd37 Continued.
new 4daeffb Cleaned up.
new 013642b Fixed unused import.
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 (6e25fc3)
\
N -- N -- N refs/heads/MNG-7276 (013642b)
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.
The 5 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:
.github/workflows/maven.yml | 39 +++++++-----
CONTRIBUTING.md | 2 +-
Jenkinsfile | 6 +-
Jenkinsfile.its | 2 +-
.../pom.xml | 27 +++-----
.../src/assembly}/bin.xml | 22 +++----
.../src/assembly}/script.xml | 26 ++++----
.../src/assembly}/script/download | 0
.../src/assembly}/script/download.cmd | 0
.../shared/mvn}/wrapper/maven-wrapper.properties | 0
.../src/assembly/shared/mvnwDebug | 0
.../src/assembly/shared/mvnwDebug.cmd | 0
.../src/assembly/shared/mvnwlauncher | 2 +-
.../src/assembly/shared/mvnwlauncher.cmd | 2 +-
.../src/assembly}/source.xml | 35 +++++------
.../src/assembly}/source/download | 0
.../src/assembly}/source/download.cmd | 0
.../mvn}/wrapper/MavenWrapperDownloader.java | 0
apache-maven-wrapper/src/site/apt/index.apt.vm | 58 +++++++++++++++++
.../src/site/site.xml | 0
apache-maven/pom.xml | 12 ++--
apache-maven/src/assembly/{maven => }/bin.xml | 2 +-
.../src/assembly/{maven => }/component.xml | 0
apache-maven/src/assembly/{maven => }/dir.xml | 2 +-
apache-maven/src/assembly/shared/init | 2 +-
apache-maven/src/assembly/shared/mvnlauncher | 2 +-
apache-maven/src/assembly/shared/mvnlauncher.cmd | 2 +-
apache-maven/src/assembly/shared/run | 2 +-
apache-maven/src/assembly/shared/run.cmd | 2 +-
apache-maven/src/assembly/{maven => }/src.xml | 0
.../org/apache/maven/artifact/ArtifactUtils.java | 13 +++-
.../org/apache/maven/artifact/DefaultArtifact.java | 6 +-
.../artifact/repository/ArtifactRepository.java | 19 +++++-
.../MultipleArtifactsNotFoundException.java | 7 ++-
.../maven/artifact/versioning/Restriction.java | 5 +-
.../maven/artifact/versioning/VersionRange.java | 5 +-
.../legacy/metadata/ArtifactMetadata.java | 13 +++-
.../apache/maven/artifact/ArtifactUtilsTest.java | 16 ++---
.../apache/maven/artifact/DefaultArtifactTest.java | 5 +-
.../versioning/DefaultArtifactVersionTest.java | 4 +-
maven-bom/pom.xml | 10 +++
.../apache/maven/building/ProblemCollector.java | 2 +-
.../java/org/apache/maven/building/Source.java | 1 +
.../building/DefaultProblemCollectorTest.java | 3 +-
.../apache/maven/building/DefaultProblemTest.java | 3 +-
.../apache/maven/artifact/ArtifactScopeEnum.java | 5 +-
.../maven/artifact/manager/WagonManager.java | 3 +
.../metadata/DefaultRepositoryMetadataManager.java | 2 +-
.../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 ++++-
.../maven/AbstractMavenLifecycleParticipant.java | 9 +++
.../org/apache/maven/ArtifactFilterManager.java | 4 ++
.../main/java/org/apache/maven/DefaultMaven.java | 2 +-
.../apache/maven/ProjectDependenciesResolver.java | 8 +++
.../java/org/apache/maven/RepositoryUtils.java | 11 ++--
.../ArtifactMetadataRetrievalException.java | 16 ++++-
.../metadata/AbstractRepositoryMetadata.java | 2 +-
.../metadata/RepositoryMetadataManager.java | 2 +
.../metadata/io/DefaultMetadataReader.java | 4 +-
.../resolver/ArtifactResolutionResult.java | 11 ++--
.../maven/artifact/resolver/ResolutionNode.java | 4 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 8 +--
.../apache/maven/classrealm/ClassRealmRequest.java | 1 +
.../maven/classrealm/DefaultClassRealmManager.java | 2 +-
.../maven/exception/DefaultExceptionHandler.java | 5 +-
.../apache/maven/exception/ExceptionSummary.java | 2 +-
.../org/apache/maven/execution/MavenSession.java | 39 ++++++------
.../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 | 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 +-
.../ArtifactMetadataRetrievalException.java | 16 ++++-
.../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 ++++++++------
.../main/java/org/apache/maven/cli/CLIManager.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 10 ++-
.../internal/BootstrapCoreExtensionManager.java | 3 +-
.../building/DefaultBuildPomXMLFilterFactory.java | 5 +-
.../maven/model/building/DefaultModelBuilder.java | 16 ++---
.../maven/model/building/FileToRawModelMerger.java | 8 +--
.../org/apache/maven/model/building/Result.java | 6 +-
.../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 +--
.../org/apache/maven/model/merge/ModelMerger.java | 2 +-
.../apache/maven/plugin/descriptor/Parameter.java | 2 +-
.../maven/plugin/descriptor/PluginDescriptor.java | 2 +-
.../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 ++--
maven-wrapper/src/site/apt/index.apt | 4 +-
pom.xml | 7 ++-
src/site/xdoc/index.xml | 2 +-
src/site/xdoc/maven-deps.odg | Bin 22491 -> 22633 bytes
170 files changed, 674 insertions(+), 455 deletions(-)
rename apache-maven/maven-wrapper.pom => apache-maven-wrapper/pom.xml (74%)
rename {apache-maven/src/assembly/wrapper =>
apache-maven-wrapper/src/assembly}/bin.xml (82%)
rename {apache-maven/src/assembly/wrapper =>
apache-maven-wrapper/src/assembly}/script.xml (76%)
rename {apache-maven/src/assembly/wrapper =>
apache-maven-wrapper/src/assembly}/script/download (100%)
rename {apache-maven/src/assembly/wrapper =>
apache-maven-wrapper/src/assembly}/script/download.cmd (100%)
rename {apache-maven/src/assembly/wrapper/shared/.mvn =>
apache-maven-wrapper/src/assembly/shared/mvn}/wrapper/maven-wrapper.properties
(100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwDebug
(100%)
rename {apache-maven =>
apache-maven-wrapper}/src/assembly/shared/mvnwDebug.cmd (100%)
rename {apache-maven => apache-maven-wrapper}/src/assembly/shared/mvnwlauncher
(54%)
rename {apache-maven =>
apache-maven-wrapper}/src/assembly/shared/mvnwlauncher.cmd (54%)
rename {apache-maven/src/assembly/wrapper =>
apache-maven-wrapper/src/assembly}/source.xml (72%)
rename {apache-maven/src/assembly/wrapper =>
apache-maven-wrapper/src/assembly}/source/download (100%)
rename {apache-maven/src/assembly/wrapper =>
apache-maven-wrapper/src/assembly}/source/download.cmd (100%)
rename {apache-maven/src/assembly/wrapper/source/.mvn =>
apache-maven-wrapper/src/assembly/source/mvn}/wrapper/MavenWrapperDownloader.java
(100%)
create mode 100644 apache-maven-wrapper/src/site/apt/index.apt.vm
copy {apache-maven => apache-maven-wrapper}/src/site/site.xml (100%)
rename apache-maven/src/assembly/{maven => }/bin.xml (93%)
rename apache-maven/src/assembly/{maven => }/component.xml (100%)
rename apache-maven/src/assembly/{maven => }/dir.xml (93%)
rename apache-maven/src/assembly/{maven => }/src.xml (100%)
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%)
