This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7556
in repository https://gitbox.apache.org/repos/asf/maven.git
omit 4eaa461af [MNG-7556] Clean up notion between user properties and
system properties
add ae655e0e8 [MNG-7553] v4 api enhancements
add 8b57a3abc [MNG-6801] MavenXpp3Writer doesn't retain order of
properties (#811)
add 3bc2cf6a7 [MNG-7547] Simpler G level metadata generation (#806)
add 3f90e7028 Restore compatibility on SettingsBuilder, ToolchainsBuilder
and MojoDescriptorCreator (#820)
add 78edd4312 [MNG-7106] Accept same lower and upper bound in version spec
string (#825)
add c3361ab62 Fix javadoc issues
add 49d1ec166 Restore the serializable aspect of the Model
add c178b2fc1 [MNG-7098] Keep the project counter intact when resuming a
multi-module project. (#804)
add 2b6977a85 Fix site generation (#828)
add f84d8338a Fix modello-plugin-velocity which breaks the release plugin
add 0d973fb62 [maven-release-plugin] prepare release maven-4.0.0-alpha-1
add 66851463f [maven-release-plugin] prepare for next development iteration
add a492c9a4f Fix the repackaged plexus-utils groupId (#829)
add 550f0c90f Restore compatibility for the maven-release-plugin
add c07700ffc [maven-release-plugin] prepare release maven-4.0.0-alpha-2
add 77312f323 [maven-release-plugin] prepare for next development iteration
add d857c3a91 [MNG-7566] Allow a Maven plugin to require a Java version
(#827)
add daa8e1690 [MNG-7570] Plugin descriptor can carry the required Maven
version (#832)
add 18eff3bae Restore compatibility with 3.x (#836)
add 0d70f7295 Fix references to old snapshots
add 79b6dd0ba [MNG-6609] expose packaging via property "project.packaging"
(#835)
add cb424b93e [MNG-7582] Reformat apiv4 javadoc according to usual rules
add e13176829 DOC - spelling fix in maven.mdo file (#851)
add 31b3af084 [MNG-7584] The properties-maven-plugin fails to load project
properties (#856)
new 48ff3f4d0 [MNG-7556] Clean up notion between user properties and
system properties
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 (4eaa461af)
\
N -- N -- N refs/heads/MNG-7556 (48ff3f4d0)
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/workflows/maven_build_itself.yml | 4 +-
apache-maven/pom.xml | 2 +-
api/maven-api-core/pom.xml | 10 +-
.../main/java/org/apache/maven/api/Artifact.java | 15 +--
.../org/apache/maven/api/ArtifactCoordinate.java | 10 +-
.../main/java/org/apache/maven/api/Dependency.java | 8 +-
.../org/apache/maven/api/DependencyCoordinate.java | 2 +-
.../src/main/java/org/apache/maven/api/Event.java | 10 +-
.../main/java/org/apache/maven/api/Listener.java | 1 +
.../main/java/org/apache/maven/api/Metadata.java | 41 ------
.../src/main/java/org/apache/maven/api/Node.java | 4 +-
.../main/java/org/apache/maven/api/Repository.java | 4 +-
.../org/apache/maven/api/RepositoryMetadata.java | 31 -----
.../main/java/org/apache/maven/api/Session.java | 18 ++-
.../java/org/apache/maven/api/SessionData.java | 20 +--
.../main/java/org/apache/maven/api/Toolchain.java | 4 +-
.../java/org/apache/maven/api/VersionRange.java | 4 +-
.../java/org/apache/maven/api/plugin/Mojo.java | 2 +-
.../org/apache/maven/api/plugin/MojoException.java | 12 +-
.../services/ArtifactCoordinateFactoryRequest.java | 23 ++--
.../api/services/ArtifactDeployerException.java | 2 +-
.../api/services/ArtifactDeployerRequest.java | 14 ++-
.../maven/api/services/ArtifactFactoryRequest.java | 10 +-
.../maven/api/services/ArtifactInstaller.java | 8 +-
.../api/services/ArtifactInstallerException.java | 2 +-
.../api/services/ArtifactInstallerRequest.java | 12 +-
.../apache/maven/api/services/ArtifactManager.java | 13 --
.../maven/api/services/ArtifactResolver.java | 6 +-
.../api/services/ArtifactResolverException.java | 4 +-
.../api/services/ArtifactResolverRequest.java | 15 ++-
.../org/apache/maven/api/services/BaseRequest.java | 2 +-
.../maven/api/services/DependencyCollector.java | 30 ++---
.../api/services/DependencyCollectorException.java | 4 +-
.../api/services/DependencyCollectorRequest.java | 47 +++----
.../api/services/DependencyCollectorResult.java | 4 +-
.../api/services/DependencyCoordinateFactory.java | 2 +-
.../DependencyCoordinateFactoryRequest.java | 26 ++--
.../maven/api/services/LocalRepositoryManager.java | 5 -
.../apache/maven/api/services/LookupException.java | 6 +-
.../apache/maven/api/services/MessageBuilder.java | 2 +-
.../apache/maven/api/services/ProjectBuilder.java | 26 ++--
.../api/services/ProjectBuilderException.java | 4 +-
.../maven/api/services/ProjectBuilderRequest.java | 20 +--
.../maven/api/services/ProjectBuilderResult.java | 8 +-
.../maven/api/services/PrompterException.java | 4 +-
.../apache/maven/api/services/VersionParser.java | 12 +-
.../maven/api/services/VersionParserException.java | 4 +-
.../apache/maven/api/services/xml/XmlFactory.java | 30 +++++
.../maven/api/services/xml/XmlReaderException.java | 4 +-
.../maven/api/services/xml/XmlReaderRequest.java | 2 +-
.../maven/api/services/xml/XmlWriterException.java | 4 +-
api/maven-api-meta/pom.xml | 2 +-
.../maven/api/annotations/NotThreadSafe.java | 2 +-
api/maven-api-model/pom.xml | 5 +-
.../maven/api/model/ImmutableCollections.java | 17 ++-
.../org/apache/maven/api/model/InputLocation.java | 15 ++-
.../org/apache/maven/api/model/InputSource.java | 4 +
.../org/apache/maven/api/model/package-info.java | 4 +-
api/maven-api-model/src/main/mdo/maven.mdo | 10 +-
api/maven-api-model/src/main/mdo/model.vm | 52 ++++++--
api/maven-api-settings/pom.xml | 5 +-
.../maven/api/settings/ImmutableCollections.java | 13 +-
api/maven-api-settings/src/main/mdo/model.vm | 56 +++++++--
api/maven-api-settings/src/main/mdo/settings.mdo | 4 +-
api/maven-api-toolchain/pom.xml | 9 +-
.../maven/api/toolchain/ImmutableCollections.java | 13 +-
api/maven-api-toolchain/src/main/mdo/model.vm | 56 +++++++--
api/maven-api-xml/pom.xml | 4 +-
api/modello-plugin-velocity/pom.xml | 22 ++--
api/pom.xml | 2 +-
maven-artifact/pom.xml | 4 +-
.../maven/artifact/versioning/VersionRange.java | 12 +-
.../artifact/versioning/VersionRangeTest.java | 8 ++
maven-bom/pom.xml | 4 +-
maven-builder-support/pom.xml | 2 +-
maven-compat/pom.xml | 4 +-
.../artifact/manager/DefaultWagonManager.java | 8 +-
.../repository/legacy/LegacyRepositorySystem.java | 8 +-
maven-core/pom.xml | 6 +-
.../main/java/org/apache/maven/DefaultMaven.java | 2 +
.../DefaultPluginsMetadataInfoProvider.java | 137 --------------------
.../DefaultRepositorySystemSessionFactory.java | 10 +-
.../maven/internal/impl/AbstractSession.java | 42 -------
.../impl/DefaultArtifactCoordinateFactory.java | 2 +
.../internal/impl/DefaultArtifactDeployer.java | 15 +--
.../internal/impl/DefaultArtifactFactory.java | 2 +
.../internal/impl/DefaultArtifactInstaller.java | 23 ++--
.../internal/impl/DefaultArtifactManager.java | 45 +++----
.../internal/impl/DefaultArtifactResolver.java | 4 +
.../internal/impl/DefaultDependencyCollector.java | 2 +
.../impl/DefaultDependencyCoordinateFactory.java | 2 +
.../impl/DefaultLocalRepositoryManager.java | 24 +---
.../apache/maven/internal/impl/DefaultLookup.java | 7 ++
.../impl/DefaultMessageBuilderFactory.java | 5 +
.../internal/impl/DefaultModelXmlFactory.java | 36 +++++-
.../maven/internal/impl/DefaultProjectBuilder.java | 4 +
.../maven/internal/impl/DefaultProjectManager.java | 7 ++
.../maven/internal/impl/DefaultPrompter.java | 7 ++
.../internal/impl/DefaultRepositoryFactory.java | 7 ++
.../apache/maven/internal/impl/DefaultSession.java | 87 +++----------
.../maven/internal/impl/DefaultSessionFactory.java | 23 +---
.../internal/impl/DefaultSettingsXmlFactory.java | 5 +
.../internal/impl/DefaultToolchainManager.java | 7 ++
.../internal/impl/DefaultToolchainsXmlFactory.java | 6 +
.../maven/internal/impl/DefaultTypeRegistry.java | 7 ++
.../maven/internal/impl/DefaultVersionParser.java | 5 +
.../DefaultLifecycleExecutionPlanCalculator.java | 4 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 4 +-
.../maven/lifecycle/internal/MojoExecutor.java | 2 +-
.../maven/plugin/DefaultPluginDescriptorCache.java | 1 +
.../apache/maven/plugin/MavenPluginManager.java | 4 +-
...r.java => MavenPluginPrerequisitesChecker.java} | 20 +--
.../maven/plugin/PluginIncompatibleException.java | 6 +-
.../PluginParameterExpressionEvaluatorV4.java | 6 +-
.../plugin/internal/DefaultMavenPluginManager.java | 58 ++++++---
...ava => MavenPluginJavaPrerequisiteChecker.java} | 41 +++---
.../MavenPluginMavenPrerequisiteChecker.java | 75 +++++++++++
.../internal/DefaultPluginVersionResolver.java | 4 +-
.../session/scope/internal/SessionScopeModule.java | 2 +
.../settings/DefaultMavenSettingsBuilder.java | 1 -
.../maven/settings/MavenSettingsBuilder.java | 1 -
.../org/apache/maven/settings/SettingsUtils.java | 12 ++
.../main/resources/META-INF/maven/extension.xml | 1 +
.../maven/AbstractCoreMavenComponentTestCase.java | 33 ++---
.../org/apache/maven/internal/impl/TestApi.java | 36 +++---
.../maven/lifecycle/LifecycleExecutorTest.java | 2 +-
maven-embedder/pom.xml | 4 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 3 +-
.../SettingsXmlConfigurationProcessor.java | 27 ++--
.../maven/cli/event/ExecutionEventLogger.java | 6 +-
.../maven/cli/event/ExecutionEventLoggerTest.java | 103 +++++++++++++--
maven-model-builder/pom.xml | 6 +-
.../maven/model/building/DefaultModelBuilder.java | 9 +-
.../inheritance/DefaultInheritanceAssembler.java | 2 +-
.../model/interpolation/MavenBuildTimestamp.java | 12 ++
.../model/profile/ProfileActivationContext.java | 6 +
.../activation/JdkVersionProfileActivator.java | 14 ++-
maven-model-transform/pom.xml | 8 +-
maven-model/pom.xml | 9 +-
.../java/org/apache/maven/model/BaseObject.java | 3 +-
.../org/apache/maven/model/WrapperProperties.java | 43 ++++++-
maven-model/src/main/mdo/reader-ex.vm | 3 +-
maven-model/src/main/mdo/reader.vm | 3 +-
maven-model/src/main/mdo/writer-ex.vm | 12 +-
maven-model/src/main/mdo/writer.vm | 12 +-
.../org/apache/maven/model/SerializationTest.java | 65 ++++++++++
.../org/apache/maven/model/v4/ModelXmlTest.java | 69 +++++++++++
maven-model/{ => src/test/resources/xml}/pom.xml | 0
maven-plugin-api/pom.xml | 15 +--
.../maven/plugin/descriptor/PluginDescriptor.java | 12 ++
.../plugin/descriptor/PluginDescriptorBuilder.java | 13 ++
.../plugin/lifecycle/ImmutableCollections.java | 13 +-
maven-plugin-api/src/main/mdo/plugin.mdo | 138 ++++++++++++---------
maven-plugin-api/src/main/mdo/writer.vm | 8 +-
maven-repository-metadata/pom.xml | 4 +-
.../artifact/repository/metadata/MetadataTest.java | 4 +-
maven-resolver-provider/pom.xml | 4 +-
.../repository/internal/LocalSnapshotMetadata.java | 2 +-
.../internal/LocalSnapshotMetadataGenerator.java | 6 +-
.../maven/repository/internal/PluginsMetadata.java | 41 +++---
.../internal/PluginsMetadataGenerator.java | 91 ++++++++++----
.../internal/PluginsMetadataGeneratorFactory.java | 20 +--
.../internal/PluginsMetadataInfoProvider.java | 47 -------
.../internal/RemoteSnapshotMetadata.java | 2 +-
.../internal/RemoteSnapshotMetadataGenerator.java | 6 +-
.../internal/SnapshotMetadataGeneratorFactory.java | 10 +-
.../repository/internal/VersionsMetadata.java | 2 +-
.../internal/VersionsMetadataGenerator.java | 4 +-
.../internal/VersionsMetadataGeneratorFactory.java | 10 +-
maven-settings-builder/pom.xml | 4 +-
.../settings/building/DefaultSettingsBuilder.java | 5 +-
.../building/DefaultSettingsBuildingResult.java | 2 +-
.../settings/building/SettingsBuildingResult.java | 2 +-
.../settings/crypto/DefaultSettingsDecrypter.java | 12 +-
.../crypto/DefaultSettingsDecryptionRequest.java | 6 +-
.../crypto/DefaultSettingsDecryptionResult.java | 4 +-
.../settings/crypto/SettingsDecryptionRequest.java | 4 +-
.../settings/crypto/SettingsDecryptionResult.java | 4 +-
maven-settings/pom.xml | 11 +-
.../apache/maven/settings/WrapperProperties.java | 41 +++++-
maven-settings/src/main/mdo/reader.vm | 3 +-
maven-settings/src/main/mdo/writer.vm | 12 +-
maven-slf4j-provider/pom.xml | 2 +-
maven-slf4j-wrapper/pom.xml | 2 +-
maven-toolchain-builder/pom.xml | 8 +-
.../building/DefaultToolchainsBuilder.java | 4 +-
.../building/DefaultToolchainsBuildingResult.java | 2 +-
.../building/ToolchainsBuildingResult.java | 2 +-
.../building/DefaultToolchainsBuilderTest.java | 4 +-
maven-toolchain-model/pom.xml | 15 +--
.../maven/toolchain/model/WrapperProperties.java | 41 +++++-
maven-toolchain-model/src/main/mdo/reader.vm | 3 +-
maven-toolchain-model/src/main/mdo/writer.vm | 12 +-
maven-xml-impl/pom.xml | 8 +-
plexus-utils/pom.xml | 10 +-
pom.xml | 15 ++-
196 files changed, 1654 insertions(+), 1199 deletions(-)
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/Metadata.java
delete mode 100644
api/maven-api-core/src/main/java/org/apache/maven/api/RepositoryMetadata.java
delete mode 100644
maven-core/src/main/java/org/apache/maven/execution/infoproviders/DefaultPluginsMetadataInfoProvider.java
copy
maven-core/src/main/java/org/apache/maven/plugin/{internal/MavenPluginValidator.java
=> MavenPluginPrerequisitesChecker.java} (66%)
copy
maven-core/src/main/java/org/apache/maven/plugin/internal/{DefaultMavenPluginValidator.java
=> MavenPluginJavaPrerequisiteChecker.java} (51%)
create mode 100644
maven-core/src/main/java/org/apache/maven/plugin/internal/MavenPluginMavenPrerequisiteChecker.java
create mode 100644
maven-model/src/test/java/org/apache/maven/model/SerializationTest.java
create mode 100644
maven-model/src/test/java/org/apache/maven/model/v4/ModelXmlTest.java
copy maven-model/{ => src/test/resources/xml}/pom.xml (100%)
delete mode 100644
maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/PluginsMetadataInfoProvider.java
