This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7206
in repository https://gitbox.apache.org/repos/asf/maven.git.
omit 1678009 [MNG-7206] Properly prioritize JVM options from MAVEN_OPTS
and jvm.config
add f793d86 [MWRAPPER-14] remove Maven Wrapper from core
add 3d4d6d8 fix wrong dependencies
add 951b5ee Fix SLF4J license link
add 0a8bd72 [MNG-7370] Upgrade Maven Wagon to 3.5.1
add d8445a5 Improve PR template
add 2cb4fe9 [MNG-7377] Add .vscode/ to .gitignore
add 46d57bd [MNG-7374] Mutating RelocatedArtifact does not retain type
add 706d931 [MNG-7369] Maven BOM doesn't need to package as a JAR
add d6b9108 [MNG-6917] upgrade maven-wrapper-plugin to 3.1.0
add 2670c00 [MNG-5561] Plugin relocation loses configuration
add b477357 [MNG-6326] Make the build fail if core extensions can not be
loaded (#648)
add e5b0831 [MNG-7263] refactor lifecycle providers to ease documentation
add 711d5fb [MNG-7263] introduce AbstractLifecycleProvider
add 94af1d9 [MNG-7263] improve AbstractLifecycleProvider
add a7375a0 [MNG-7263] use constants instead of copy/paste
add a53083d [MNG-7264] refactor packaging bindings providers to ease
maintenance
add 7180d68 Proposal to change abstract provider
add e617d51 [MNG-7264] packaging plugins bindings cannot be empty
add 8bde888 [MNG-7267] update lifecycle documentation after switch from
Plexus XML
add f30a0ab [MNG-7267] update artifact handlers documentation
add c229278 rework javadoc
add 4476026 [MNG-7217] Update Commons CLI to version 1.5.0
add faf5d5d [MNG-7347] SessionScoped beans should be singletons for a
given session (#621)
add 7a772fe [MNG-7362] DefaultArtifactResolver has spurious "Failure
detected" INFO log
add 18725ec [MNG-7380] Don't log non-threadsafe warning if only building
a single module
add c0a49c7 [MNG-7384] Upgrade Maven JAR Plugin to 3.2.2
add ab4fec0 [MNG-7381] Shorten parallel builder thread name to
artifactId, conditionally with groupId
add 9d4b2b2 [MNG-7345] Fix exported packages (#618)
add 76452c7 [MNG-7339] Verify Maven can build itself less often
add 1af8513 [MNG-7385] improve repository metadata documentation
add dbfe809 [MNG-7386] Make sure the ModelMerger$MergingList can be
serialized
add 6b60710 [MNG-7349] Limit relocation warning message to direct
dependencies only
add 1d47323 [MNG-6727] Using version range in parent and CI Friendly
Version fails
add 6ca13af [MNG-7408] explain Maven 3 reporting plugin version selection
add a472975 [MNG-7400] Allow more WorkspaceReaders to participate
add cc51006 [MNG-6776] Inconsistent list of parameters for MojoDescriptor
(#584)
add 0be5e40 [MNG-7406] Do not include formatted details in Exception
message
add 62cf29b [MNG-7407] Introduce a ModelVersionProcessor component to
make CI Friendly Versions pluggable
add 2798ee9 [MNG-7395] Support interpolation in extensions.xml
add b2a21f1 [MNG-7244] Remove deprecated WARNING for usage of pom.X
placeholders
add 03df5f7 [MNG-7390] Allow selecting modules outside the cwd into the
reactor using --projects
add 69d6c6d [MNG-7417] Several classes do not set properties properly for
building requests
add e327be3 [MNG-7402] BuildListCalculator never detaches the classloader
add 1e33a57 [MNG-5180] Versioning's snapshot version list is not included
in metadata merge
add 5394e75 (refactoring) Resolve usage of deprecated method
add 83bbbb3 [MNG-6960] Use RuntimeInformation instead of reading
properties
add 09e5154 Remove unused import
add 48be53a [MNG-7428] Upgrade Maven Parent to 35
add e1d359a [MNG-7330] Revert MNG-7329
add 1fff173 [MNG-7428] Upgrade Maven Parent to 35
add 20b6cec [MNG-7304] Use try-with-resources statement
add 48fc4c9 [MNG-7299] Simplify conditional expressions
new e8c35ae [MNG-7206] Properly prioritize JVM options from MAVEN_OPTS
and jvm.config
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 (1678009)
\
N -- N -- N refs/heads/MNG-7206 (e8c35ae)
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 1 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/pull_request_template.md | 19 +-
.github/workflows/maven.yml | 28 +-
.github/workflows/maven_build_itself.yml | 4 +-
.gitignore | 1 +
Jenkinsfile | 14 +-
Jenkinsfile.its | 4 +-
apache-maven-wrapper/pom.xml | 128 ---------
apache-maven-wrapper/src/assembly/bin.xml | 85 ------
apache-maven-wrapper/src/assembly/script.xml | 77 ------
apache-maven-wrapper/src/assembly/script/download | 51 ----
.../src/assembly/script/download.cmd | 32 ---
.../shared/mvn/wrapper/maven-wrapper.properties | 17 --
apache-maven-wrapper/src/assembly/shared/mvnwDebug | 35 ---
.../src/assembly/shared/mvnwDebug.cmd | 44 ----
.../src/assembly/shared/mvnwlauncher | 3 -
.../src/assembly/shared/mvnwlauncher.cmd | 3 -
apache-maven-wrapper/src/assembly/source.xml | 82 ------
apache-maven-wrapper/src/assembly/source/download | 34 ---
.../src/assembly/source/download.cmd | 21 --
.../source/mvn/wrapper/MavenWrapperDownloader.java | 131 ----------
apache-maven-wrapper/src/site/apt/index.apt.vm | 58 -----
apache-maven-wrapper/src/site/site.xml | 31 ---
apache-maven/pom.xml | 8 -
apache-maven/src/assembly/component.xml | 1 -
.../licenses/MIT-jsoup-1.12.1.txt | 23 --
.../licenses/MIT-slf4j-api-1.7.32.txt | 2 +-
.../legacy/metadata/ArtifactMetadata.java | 8 +-
maven-bom/pom.xml | 15 +-
.../artifact/resolver/DefaultArtifactResolver.java | 1 -
.../legacy/DefaultUpdateCheckManager.java | 54 +---
.../main/java/org/apache/maven/DefaultMaven.java | 107 +++++---
.../providers/EarArtifactHandlerProvider.java | 3 +
.../providers/EjbArtifactHandlerProvider.java | 3 +
.../EjbClientArtifactHandlerProvider.java | 3 +
.../providers/JarArtifactHandlerProvider.java | 3 +
.../JavaSourceArtifactHandlerProvider.java | 3 +
.../providers/JavadocArtifactHandlerProvider.java | 3 +
.../MavenPluginArtifactHandlerProvider.java | 3 +
.../providers/PomArtifactHandlerProvider.java | 3 +
.../providers/RarArtifactHandlerProvider.java | 3 +
.../providers/TestJarArtifactHandlerProvider.java | 3 +
.../providers/WarArtifactHandlerProvider.java | 3 +
.../apache/maven/graph/DefaultGraphBuilder.java | 14 +-
.../DefaultRepositorySystemSessionFactory.java | 32 +--
.../java/org/apache/maven/lifecycle/Lifecycle.java | 2 +-
.../lifecycle/internal/BuildListCalculator.java | 16 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 16 +-
.../internal/DefaultMojoExecutionConfigurator.java | 4 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 13 +-
.../maven/lifecycle/internal/LifecycleStarter.java | 3 +-
.../maven/lifecycle/internal/ReactorContext.java | 14 +-
.../lifecycle/internal/builder/BuilderCommon.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 32 ++-
.../apache/maven/lifecycle/mapping/Lifecycle.java | 3 +-
.../maven/lifecycle/mapping/LifecycleMojo.java | 4 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 4 +-
.../providers/EarLifecycleMappingProvider.java | 83 ------
.../providers/EjbLifecycleMappingProvider.java | 95 -------
.../providers/JarLifecycleMappingProvider.java | 95 -------
.../MavenPluginLifecycleMappingProvider.java | 100 -------
.../providers/PomLifecycleMappingProvider.java | 71 -----
.../providers/RarLifecycleMappingProvider.java | 95 -------
.../providers/WarLifecycleMappingProvider.java | 95 -------
.../providers/AbstractLifecycleProvider.java | 71 +++++
.../providers/CleanLifecycleProvider.java | 54 ++--
.../providers/DefaultLifecycleProvider.java | 87 +++----
.../lifecycle/providers/SiteLifecycleProvider.java | 58 ++---
.../providers/WrapperLifecycleProvider.java | 52 ++--
.../AbstractLifecycleMappingProvider.java | 69 +++++
.../packaging/EarLifecycleMappingProvider.java} | 43 ++-
.../packaging/EjbLifecycleMappingProvider.java | 53 ++++
.../packaging/JarLifecycleMappingProvider.java | 53 ++++
.../MavenPluginLifecycleMappingProvider.java | 55 ++++
.../packaging/PomLifecycleMappingProvider.java} | 35 ++-
.../packaging/RarLifecycleMappingProvider.java | 53 ++++
.../packaging/WarLifecycleMappingProvider.java | 53 ++++
.../DefaultPluginDependenciesResolver.java | 12 +
.../DefaultProjectDependenciesResolver.java | 16 ++
.../maven/project/ProjectBuildingException.java | 39 +--
.../project/artifact/MavenMetadataSource.java | 1 +
.../maven/session/scope/internal/SessionScope.java | 137 +++++-----
.../main/resources/META-INF/maven/extension.xml | 3 +-
maven-core/src/site/apt/artifact-handlers.apt | 2 +-
maven-core/src/site/apt/default-bindings.apt.vm | 24 +-
maven-core/src/site/apt/lifecycles.apt.vm | 20 +-
.../maven/AbstractCoreMavenComponentTestCase.java | 3 +-
.../DefaultBuildResumptionDataRepositoryTest.java | 10 +-
.../internal/stub/BuildPluginManagerStub.java | 2 +-
.../lifecycle/internal/stub/MojoExecutorStub.java | 9 +-
.../project/DefaultMavenProjectBuilderTest.java | 146 ++++++++++-
.../apache/maven/project/PomConstructionTest.java | 22 +-
.../apache/maven/project/ProjectBuilderTest.java | 11 +-
.../ProjectBuildingResultWithLocationMatcher.java | 91 +++++++
...ectBuildingResultWithProblemMessageMatcher.java | 84 ++++++
.../session/scope/internal/SessionScopeTest.java | 81 ++++++
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../pom.xml | 3 +-
.../pom.xml | 5 +-
.../child/pom.xml | 4 +-
.../pom.xml | 0
.../child/pom.xml | 4 +-
.../pom.xml | 0
.../child/pom.xml | 5 +-
.../pom.xml | 0
.../main/java/org/apache/maven/cli/CLIManager.java | 6 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 124 +++------
.../internal/BootstrapCoreExtensionManager.java | 62 +++--
.../cli/internal/ExtensionResolutionException.java | 20 +-
maven-embedder/src/main/mdo/core-extensions.mdo | 26 ++
.../java/org/apache/maven/cli/CLIManagerTest.java | 50 ----
.../java/org/apache/maven/cli/MavenCliTest.java | 79 +++++-
.../maven/model/building/DefaultModelBuilder.java | 20 +-
.../model/building/DefaultModelBuilderFactory.java | 13 +-
.../AbstractStringBasedModelInterpolator.java | 45 +---
.../DefaultModelVersionProcessor.java | 69 +++++
.../ModelVersionProcessor.java} | 27 +-
.../StringSearchModelInterpolator.java | 10 +-
.../StringVisitorModelInterpolator.java | 5 +-
.../profile/activation/FileProfileActivator.java | 2 +-
.../OperatingSystemProfileActivator.java | 8 +-
.../activation/PropertyProfileActivator.java | 8 +-
.../model/validation/DefaultModelValidator.java | 30 +--
.../AbstractModelInterpolatorTest.java | 37 ++-
.../StringSearchModelInterpolatorTest.java | 8 +-
.../StringVisitorModelInterpolatorTest.java | 2 +-
.../validation/DefaultModelValidatorTest.java | 7 +-
.../org/apache/maven/model/merge/ModelMerger.java | 9 +-
maven-model/src/main/mdo/maven.mdo | 7 +-
.../apache/maven/model/merge/ModelMergerTest.java | 21 ++
.../maven/plugin/descriptor/MojoDescriptor.java | 83 ++----
.../plugin/descriptor/MojoDescriptorTest.java | 53 ++++
maven-repository-metadata/pom.xml | 5 +
.../src/main/mdo/metadata.mdo | 115 +++++---
maven-repository-metadata/src/site/apt/index.apt | 32 ++-
.../artifact/repository/metadata/MetadataTest.java | 289 +++++++++++++++++++++
.../internal/DefaultArtifactDescriptorReader.java | 31 +--
.../repository/internal/RelocatedArtifact.java | 45 +++-
maven-wrapper/pom.xml | 65 -----
.../apache/maven/wrapper/BootstrapMainStarter.java | 64 -----
.../apache/maven/wrapper/DefaultDownloader.java | 190 --------------
.../java/org/apache/maven/wrapper/Downloader.java | 54 ----
.../java/org/apache/maven/wrapper/Installer.java | 231 ----------------
.../main/java/org/apache/maven/wrapper/Logger.java | 41 ---
.../org/apache/maven/wrapper/MavenWrapperMain.java | 107 --------
.../org/apache/maven/wrapper/PathAssembler.java | 131 ----------
.../apache/maven/wrapper/WrapperConfiguration.java | 116 ---------
.../org/apache/maven/wrapper/WrapperExecutor.java | 178 -------------
maven-wrapper/src/site/apt/index.apt | 30 ---
maven-wrapper/src/site/site.xml | 38 ---
.../org/apache/maven/wrapper/DownloaderTest.java | 71 -----
.../org/apache/maven/wrapper/InstallerTest.java | 214 ---------------
.../apache/maven/wrapper/PathAssemblerTest.java | 115 --------
.../apache/maven/wrapper/WrapperExecutorTest.java | 202 --------------
.../org/apache/maven/wrapper/wrapper.properties | 21 --
pom.xml | 31 +--
src/site/resources/images/maven-deps.png | Bin 160957 -> 140323 bytes
src/site/xdoc/index.xml | 73 +++---
src/site/xdoc/maven-deps.odg | Bin 22633 -> 19994 bytes
160 files changed, 2320 insertions(+), 4429 deletions(-)
delete mode 100644 apache-maven-wrapper/pom.xml
delete mode 100644 apache-maven-wrapper/src/assembly/bin.xml
delete mode 100644 apache-maven-wrapper/src/assembly/script.xml
delete mode 100755 apache-maven-wrapper/src/assembly/script/download
delete mode 100755 apache-maven-wrapper/src/assembly/script/download.cmd
delete mode 100644
apache-maven-wrapper/src/assembly/shared/mvn/wrapper/maven-wrapper.properties
delete mode 100644 apache-maven-wrapper/src/assembly/shared/mvnwDebug
delete mode 100644 apache-maven-wrapper/src/assembly/shared/mvnwDebug.cmd
delete mode 100755 apache-maven-wrapper/src/assembly/shared/mvnwlauncher
delete mode 100755 apache-maven-wrapper/src/assembly/shared/mvnwlauncher.cmd
delete mode 100644 apache-maven-wrapper/src/assembly/source.xml
delete mode 100644 apache-maven-wrapper/src/assembly/source/download
delete mode 100644 apache-maven-wrapper/src/assembly/source/download.cmd
delete mode 100644
apache-maven-wrapper/src/assembly/source/mvn/wrapper/MavenWrapperDownloader.java
delete mode 100644 apache-maven-wrapper/src/site/apt/index.apt.vm
delete mode 100644 apache-maven-wrapper/src/site/site.xml
delete mode 100644
apache-maven/src/main/appended-resources/licenses/MIT-jsoup-1.12.1.txt
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/EarLifecycleMappingProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/EjbLifecycleMappingProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/JarLifecycleMappingProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/MavenPluginLifecycleMappingProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/PomLifecycleMappingProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/RarLifecycleMappingProvider.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/mapping/providers/WarLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/AbstractLifecycleProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/AbstractLifecycleMappingProvider.java
copy
maven-core/src/main/java/org/apache/maven/{artifact/handler/providers/EarArtifactHandlerProvider.java
=> lifecycle/providers/packaging/EarLifecycleMappingProvider.java} (51%)
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java
copy
maven-core/src/main/java/org/apache/maven/{execution/scope/internal/MojoExecutionScopeCoreModule.java
=> lifecycle/providers/packaging/PomLifecycleMappingProvider.java} (59%)
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java
create mode 100644
maven-core/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java
create mode 100644
maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java
create mode 100644
maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java
create mode 100644
maven-core/src/test/java/org/apache/maven/session/scope/internal/SessionScopeTest.java
copy
maven-core/src/test/resources/projects/{parent-version-range-external-child-version-expression
=> parent-version-range-external-child-pom-parent-version-expression}/pom.xml
(67%)
copy
maven-core/src/test/resources/projects/{parent-version-range-external-child-version-expression
=> parent-version-range-external-child-pom-version-expression}/pom.xml (69%)
rename
maven-core/src/test/resources/projects/{parent-version-range-external-child-version-expression
=>
parent-version-range-external-child-project-parent-version-expression}/pom.xml
(67%)
copy
maven-core/src/test/resources/projects/{parent-version-range-external-child-without-version
=> parent-version-range-external-child-project-version-expression}/pom.xml
(69%)
copy
maven-core/src/test/resources/projects/{parent-version-range-external-child-without-version
=> parent-version-range-external-child-revision-expression}/pom.xml (70%)
copy
maven-core/src/test/resources/projects/{parent-version-range-local-child-version-expression
=>
parent-version-range-local-child-project-parent-version-expression}/child/pom.xml
(68%)
rename
maven-core/src/test/resources/projects/{parent-version-range-local-child-version-expression
=> parent-version-range-local-child-project-parent-version-expression}/pom.xml
(100%)
rename
maven-core/src/test/resources/projects/{parent-version-range-local-child-version-expression
=> parent-version-range-local-child-project-version-expression}/child/pom.xml
(70%)
copy maven-core/src/test/resources/projects/{parent-version-range-local-valid
=> parent-version-range-local-child-project-version-expression}/pom.xml (100%)
copy
maven-core/src/test/resources/projects/{parent-version-range-local-child-without-version
=> parent-version-range-local-child-revision-expression}/child/pom.xml (71%)
copy maven-core/src/test/resources/projects/{parent-version-range-local-valid
=> parent-version-range-local-child-revision-expression}/pom.xml (100%)
copy
maven-core/src/main/java/org/apache/maven/plugin/PluginResolutionException.java
=>
maven-embedder/src/main/java/org/apache/maven/cli/internal/ExtensionResolutionException.java
(64%)
delete mode 100644
maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
create mode 100644
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
copy
maven-model-builder/src/main/java/org/apache/maven/model/{path/ModelUrlNormalizer.java
=> interpolation/ModelVersionProcessor.java} (56%)
create mode 100644
maven-plugin-api/src/test/java/org/apache/maven/plugin/descriptor/MojoDescriptorTest.java
create mode 100644
maven-repository-metadata/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTest.java
delete mode 100644 maven-wrapper/pom.xml
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/BootstrapMainStarter.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/DefaultDownloader.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/Downloader.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/Installer.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/Logger.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/MavenWrapperMain.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/PathAssembler.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperConfiguration.java
delete mode 100644
maven-wrapper/src/main/java/org/apache/maven/wrapper/WrapperExecutor.java
delete mode 100644 maven-wrapper/src/site/apt/index.apt
delete mode 100644 maven-wrapper/src/site/site.xml
delete mode 100644
maven-wrapper/src/test/java/org/apache/maven/wrapper/DownloaderTest.java
delete mode 100644
maven-wrapper/src/test/java/org/apache/maven/wrapper/InstallerTest.java
delete mode 100644
maven-wrapper/src/test/java/org/apache/maven/wrapper/PathAssemblerTest.java
delete mode 100644
maven-wrapper/src/test/java/org/apache/maven/wrapper/WrapperExecutorTest.java
delete mode 100644
maven-wrapper/src/test/resources/org/apache/maven/wrapper/wrapper.properties
