You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/10/28 20:22:26 UTC
[maven] branch MNG-7556 updated (4eaa461af -> 48ff3f4d0)
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
[maven] 01/01: [MNG-7556] Clean up notion between user properties and system properties
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7556
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 48ff3f4d0450fa8dcd9be151afd9f77b969d92db
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Oct 3 21:00:50 2022 +0200
[MNG-7556] Clean up notion between user properties and system properties
---
apache-maven/src/assembly/maven/conf/settings.xml | 9 +++---
api/maven-api-model/src/main/mdo/maven.mdo | 4 +--
api/maven-api-settings/src/main/mdo/settings.mdo | 2 +-
maven-compat/src/main/mdo/profiles.mdo | 2 +-
.../java/org/apache/maven/eventspy/EventSpy.java | 2 +-
.../DefaultRepositorySystemSessionFactory.java | 9 +++---
.../plugin/PluginParameterExpressionEvaluator.java | 13 ++++----
.../PluginParameterExpressionEvaluatorV4.java | 11 ++++---
.../project/artifact/MavenMetadataSource.java | 13 ++++++--
.../apt/getting-to-container-configured-mojos.apt | 2 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 10 ++++--
.../main/java/org/apache/maven/cli/MavenCli.java | 8 ++---
.../java/org/apache/maven/cli/MavenCliTest.java | 6 ++--
.../maven/model/building/DefaultModelBuilder.java | 36 +++++++++++-----------
.../DefaultModelVersionProcessor.java | 1 +
.../profile/activation/FileProfileActivator.java | 2 +-
maven-model-builder/src/site/apt/index.apt | 8 +++--
maven-plugin-api/src/main/mdo/plugin.mdo | 2 +-
.../internal/MavenRepositorySystemUtils.java | 15 ---------
19 files changed, 81 insertions(+), 74 deletions(-)
diff --git a/apache-maven/src/assembly/maven/conf/settings.xml b/apache-maven/src/assembly/maven/conf/settings.xml
index 2f18af34c..770656bb6 100644
--- a/apache-maven/src/assembly/maven/conf/settings.xml
+++ b/apache-maven/src/assembly/maven/conf/settings.xml
@@ -82,6 +82,7 @@ under the License.
-->
</pluginGroups>
+ <!-- TODO Since when can proxies be selected as depicted? -->
<!-- proxies
| This is a list of proxies which can be used on this machine to connect to the network.
| Unless otherwise specified (by system property or command-line switch), the first proxy
@@ -176,7 +177,7 @@ under the License.
|
| As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
| section of this document (settings.xml) - will be discussed later. Another way essentially
- | relies on the detection of a system property, either matching a particular value for the property,
+ | relies on the detection of a property, either matching a particular value for the property,
| or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
| value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
| Finally, the list of active profiles can be specified directly from the command line.
@@ -218,9 +219,9 @@ under the License.
-->
<!--
- | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
- | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
- | might hypothetically look like:
+ | Here is another profile, activated by the property 'target-env' with a value of 'dev', which
+ | provides a specific path to the Tomcat instance. To use this, your plugin configuration might
+ | hypothetically look like:
|
| ...
| <plugin>
diff --git a/api/maven-api-model/src/main/mdo/maven.mdo b/api/maven-api-model/src/main/mdo/maven.mdo
index 933c89f22..c461b2ae9 100644
--- a/api/maven-api-model/src/main/mdo/maven.mdo
+++ b/api/maven-api-model/src/main/mdo/maven.mdo
@@ -2672,7 +2672,7 @@
<field>
<name>property</name>
<version>4.0.0+</version>
- <description>Specifies that this profile will be activated when this system property is
+ <description>Specifies that this profile will be activated when this property is
specified.</description>
<association>
<type>ActivationProperty</type>
@@ -2774,7 +2774,7 @@
activated. On the other hand, {@code exists} will test for the existence of the file and if it is
there, the profile will be activated.<br>
Variable interpolation for these file specifications is limited to {@code ${basedir}},
- System properties and request properties.]]></description>
+ system properties and user properties.]]></description>
<fields>
<field>
<name>missing</name>
diff --git a/api/maven-api-settings/src/main/mdo/settings.mdo b/api/maven-api-settings/src/main/mdo/settings.mdo
index a70d8886d..93fa6034a 100644
--- a/api/maven-api-settings/src/main/mdo/settings.mdo
+++ b/api/maven-api-settings/src/main/mdo/settings.mdo
@@ -789,7 +789,7 @@
<version>1.0.0+</version>
<description>
<![CDATA[
- Specifies that this profile will be activated when this System property is specified.
+ Specifies that this profile will be activated when this property is specified.
]]>
</description>
<association>
diff --git a/maven-compat/src/main/mdo/profiles.mdo b/maven-compat/src/main/mdo/profiles.mdo
index 5132490d9..e3e102991 100644
--- a/maven-compat/src/main/mdo/profiles.mdo
+++ b/maven-compat/src/main/mdo/profiles.mdo
@@ -162,7 +162,7 @@ under the License.
<name>property</name>
<version>1.0.0</version>
<description><![CDATA[
- Specifies that this profile will be activated when this System property is specified.
+ Specifies that this profile will be activated when this property is specified.
]]></description>
<association>
<type>ActivationProperty</type>
diff --git a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
index cd7e1cc8b..bdc2dac21 100644
--- a/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
+++ b/maven-core/src/main/java/org/apache/maven/eventspy/EventSpy.java
@@ -23,7 +23,7 @@ import java.util.Map;
/**
* A core extension to monitor Maven's execution. Typically, such an extension gets loaded into Maven by specifying the
- * system property {@code maven.ext.class.path} on the command line. As soon as dependency injection is set up, Maven
+ * property {@code maven.ext.class.path} on the command line. As soon as dependency injection is set up, Maven
* looks up all implementers of this interface and calls their {@link #init(Context)} method. <em>Note:</em>
* Implementors are strongly advised to inherit from {@link AbstractEventSpy} instead of directly implementing this
* interface.
diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 38ba573aa..e238e3bf6 100644
--- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -150,6 +150,7 @@ public class DefaultRepositorySystemSessionFactory
configProps.put( ConfigurationProperties.USER_AGENT, getUserAgent() );
configProps.put( ConfigurationProperties.INTERACTIVE, request.isInteractiveMode() );
configProps.put( "maven.startTime", request.getStartTime() );
+ // Resolver's ConfigUtils solely rely on config properties, that is why we need to add both here as well.
configProps.putAll( request.getSystemProperties() );
configProps.putAll( request.getUserProperties() );
@@ -288,14 +289,14 @@ public class DefaultRepositorySystemSessionFactory
+ MAVEN_RESOLVER_TRANSPORT_NATIVE + ", " + MAVEN_RESOLVER_TRANSPORT_AUTO );
}
- session.setTransferListener( request.getTransferListener() );
-
- session.setRepositoryListener( eventSpyDispatcher.chainListener( new LoggingRepositoryListener( logger ) ) );
-
session.setUserProperties( request.getUserProperties() );
session.setSystemProperties( request.getSystemProperties() );
session.setConfigProperties( configProps );
+ session.setTransferListener( request.getTransferListener() );
+
+ session.setRepositoryListener( eventSpyDispatcher.chainListener( new LoggingRepositoryListener( logger ) ) );
+
mavenRepositorySystem.injectMirror( request.getRemoteRepositories(), request.getMirrors() );
mavenRepositorySystem.injectProxy( session, request.getRemoteRepositories() );
mavenRepositorySystem.injectAuthentication( session, request.getRemoteRepositories() );
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
index acd2ceeb7..160e2dcae 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
@@ -61,8 +61,9 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
* <td>{@link MojoExecution#getMojoDescriptor()}.{@link MojoDescriptor#getPluginDescriptor()
* getPluginDescriptor()}</td></tr>
* <tr><td><code>plugin.*</code></td> <td></td> <td></td></tr>
- * <tr><td><code>*</code></td> <td></td> <td>system properties</td></tr>
+ * <tr><td><code>*</code></td> <td></td> <td>user properties</td></tr>
* <tr><td><code>*</code></td> <td></td> <td>project properties</td></tr>
+ * <tr><td><code>*</code></td> <td></td> <td>system properties</td></tr>
* </table>
* <i>Notice:</i> <code>reports</code> was supported in Maven 2.x but was removed in Maven 3
*
@@ -368,7 +369,7 @@ public class PluginParameterExpressionEvaluator
/*
* MNG-4312: We neither have reserved all of the above magic expressions nor is their set fixed/well-known (it
* gets occasionally extended by newer Maven versions). This imposes the risk for existing plugins to
- * unintentionally use such a magic expression for an ordinary system property. So here we check whether we
+ * unintentionally use such a magic expression for an ordinary property. So here we check whether we
* ended up with a magic value that is not compatible with the type of the configured mojo parameter (a string
* could still be converted by the configurator so we leave those alone). If so, back off to evaluating the
* expression from properties only.
@@ -384,10 +385,10 @@ public class PluginParameterExpressionEvaluator
if ( properties != null )
{
- // We will attempt to get nab a system property as a way to specify a
- // parameter to a plugins. My particular case here is allowing the surefire
- // plugin to run a single test so I want to specify that class on the cli
- // as a parameter.
+ // We will attempt to get nab a property as a way to specify a parameter
+ // to a plugin. My particular case here is allowing the surefire plugin
+ // to run a single test so I want to specify that class on the cli as
+ // a parameter.
value = properties.getProperty( expression );
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
index bd54fa086..bab7cd4ae 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorV4.java
@@ -64,6 +64,7 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
* <td>{@link MojoExecution#getMojoDescriptor()}.{@link MojoDescriptor#getPluginDescriptor()
* getPluginDescriptor()}</td></tr>
* <tr><td><code>plugin.*</code></td> <td></td> <td></td></tr>
+ * <tr><td><code>*</code></td> <td></td> <td>user properties</td></tr>
* <tr><td><code>*</code></td> <td></td> <td>system properties</td></tr>
* <tr><td><code>*</code></td> <td></td> <td>project properties</td></tr>
* </table>
@@ -376,7 +377,7 @@ public class PluginParameterExpressionEvaluatorV4
/*
* MNG-4312: We neither have reserved all of the above magic expressions nor is their set fixed/well-known (it
* gets occasionally extended by newer Maven versions). This imposes the risk for existing plugins to
- * unintentionally use such a magic expression for an ordinary system property. So here we check whether we
+ * unintentionally use such a magic expression for an ordinary property. So here we check whether we
* ended up with a magic value that is not compatible with the type of the configured mojo parameter (a string
* could still be converted by the configurator so we leave those alone). If so, back off to evaluating the
* expression from properties only.
@@ -392,10 +393,10 @@ public class PluginParameterExpressionEvaluatorV4
if ( properties != null )
{
- // We will attempt to get nab a system property as a way to specify a
- // parameter to a plugins. My particular case here is allowing the surefire
- // plugin to run a single test so I want to specify that class on the cli
- // as a parameter.
+ // We will attempt to get nab a property as a way to specify a parameter
+ // to a plugin. My particular case here is allowing the surefire plugin
+ // to run a single test so I want to specify that class on the cli as
+ // a parameter.
value = properties.getProperty( expression );
}
diff --git a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index 7f7b658c2..9ae6ede4e 100644
--- a/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -569,8 +569,17 @@ public class MavenMetadataSource
configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
configuration.setProcessPlugins( false );
configuration.setRepositoryMerging( ProjectBuildingRequest.RepositoryMerging.REQUEST_DOMINANT );
- configuration.setSystemProperties( getSystemProperties() );
- configuration.setUserProperties( new Properties() );
+ MavenSession session = legacySupport.getSession();
+ if ( session != null )
+ {
+ configuration.setSystemProperties( session.getSystemProperties() );
+ configuration.setUserProperties( session.getUserProperties() );
+ }
+ else
+ {
+ configuration.setSystemProperties( getSystemProperties() );
+ configuration.setUserProperties( new Properties() );
+ }
configuration.setRepositorySession( legacySupport.getRepositorySession() );
project = projectBuilder.build( pomArtifact, configuration ).getProject();
diff --git a/maven-core/src/site/apt/getting-to-container-configured-mojos.apt b/maven-core/src/site/apt/getting-to-container-configured-mojos.apt
index 1c4a487d7..167a56909 100644
--- a/maven-core/src/site/apt/getting-to-container-configured-mojos.apt
+++ b/maven-core/src/site/apt/getting-to-container-configured-mojos.apt
@@ -30,7 +30,7 @@ Abstract
In order to really achieve this, we need mojo configurations (which are
provided both in terms of static expressions that are just looked up, and
- in terms of user-provided configuration from system properties or the POM).
+ in terms of user-provided configuration from properties or the POM).
If these mojos are to be first-class components, the configuration from these
various sources must be consolidated and injected using the container.
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index 51824ce45..b6005fddf 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -40,7 +40,13 @@ public class CLIManager
public static final char BATCH_MODE = 'B';
- public static final char SET_SYSTEM_PROPERTY = 'D';
+ public static final char SET_USER_PROPERTY = 'D';
+
+ /**
+ * @deprecated Use {@link #SET_USER_PROPERTY}
+ */
+ @Deprecated
+ public static final char SET_SYSTEM_PROPERTY = SET_USER_PROPERTY;
public static final char OFFLINE = 'o';
@@ -123,7 +129,7 @@ public class CLIManager
options = new Options();
options.addOption( Option.builder( Character.toString( HELP ) ).longOpt( "help" ).desc( "Display help information" ).build() );
options.addOption( Option.builder( Character.toString( ALTERNATE_POM_FILE ) ).longOpt( "file" ).hasArg().desc( "Force the use of an alternate POM file (or directory with pom.xml)" ).build() );
- options.addOption( Option.builder( Character.toString( SET_SYSTEM_PROPERTY ) ).numberOfArgs( 2 ).valueSeparator( '=' ).desc( "Define a system property" ).build() );
+ options.addOption( Option.builder( Character.toString( SET_USER_PROPERTY ) ).numberOfArgs( 2 ).valueSeparator( '=' ).desc( "Define a user property" ).build() );
options.addOption( Option.builder( Character.toString( OFFLINE ) ).longOpt( "offline" ).desc( "Work offline" ).build() );
options.addOption( Option.builder( Character.toString( VERSION ) ).longOpt( "version" ).desc( "Display version information" ).build() );
options.addOption( Option.builder( Character.toString( QUIET ) ).longOpt( "quiet" ).desc( "Quiet output - only show errors" ).build() );
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 6c17028be..ebfb0830b 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -477,7 +477,7 @@ public class MavenCli
List<Option> setPropertyOptions = new ArrayList<>();
for ( Option opt : mavenArgs.getOptions() )
{
- if ( String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ).equals( opt.getOpt() ) )
+ if ( String.valueOf( CLIManager.SET_USER_PROPERTY ).equals( opt.getOpt() ) )
{
setPropertyOptions.add( opt );
}
@@ -490,7 +490,7 @@ public class MavenCli
{
commandLineBuilder.addOption( opt );
}
- // finally add the CLI system properties
+ // finally add the CLI user properties
for ( Option opt : setPropertyOptions )
{
commandLineBuilder.addOption( opt );
@@ -1745,7 +1745,7 @@ public class MavenCli
}
// ----------------------------------------------------------------------
- // System properties handling
+ // Properties handling
// ----------------------------------------------------------------------
static void populateProperties( CommandLine commandLine, Properties systemProperties, Properties userProperties )
@@ -1759,7 +1759,7 @@ public class MavenCli
// ----------------------------------------------------------------------
final Properties userSpecifiedProperties = commandLine.getOptionProperties(
- String.valueOf( CLIManager.SET_SYSTEM_PROPERTY ) );
+ String.valueOf( CLIManager.SET_USER_PROPERTY ) );
userSpecifiedProperties.forEach(
( prop, value ) -> setCliProperty( (String) prop, (String) value, userProperties )
);
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
index c4ddcb830..c4fb01a91 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/MavenCliTest.java
@@ -338,9 +338,9 @@ public class MavenCliTest
String revision = System.getProperty( "revision" );
assertEquals( "8.2.0", revision );
- assertEquals( "bar ", request.getSystemProperties().getProperty( "foo" ) );
- assertEquals( "bar two", request.getSystemProperties().getProperty( "foo2" ) );
- assertEquals( "Apache Maven", request.getSystemProperties().getProperty( "label" ) );
+ assertEquals( "bar ", request.getUserProperties().getProperty( "foo" ) );
+ assertEquals( "bar two", request.getUserProperties().getProperty( "foo2" ) );
+ assertEquals( "Apache Maven", request.getUserProperties().getProperty( "label" ) );
assertEquals( "-Dpom.xml", request.getCommandLine().getOptionValue( CLIManager.ALTERNATE_POM_FILE ) );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 0b7fccc4b..6899f0304 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -173,7 +173,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setModelProcessor(ModelProcessor)
+ * @see DefaultModelBuilderFactory#setModelProcessor(ModelProcessor)
*/
@Deprecated
public DefaultModelBuilder setModelProcessor( ModelProcessor modelProcessor )
@@ -187,7 +187,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setModelProcessor(ModelProcessor)
+ * @see DefaultModelBuilderFactory#setModelProcessor(ModelProcessor)
*/
@Deprecated
public DefaultModelBuilder setModelValidator( ModelValidator modelValidator )
@@ -201,7 +201,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setModelNormalizer(ModelNormalizer)
+ * @see DefaultModelBuilderFactory#setModelNormalizer(ModelNormalizer)
*/
@Deprecated
public DefaultModelBuilder setModelNormalizer( ModelNormalizer modelNormalizer )
@@ -215,7 +215,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setModelInterpolator(ModelInterpolator)
+ * @see DefaultModelBuilderFactory#setModelInterpolator(ModelInterpolator)
*/
@Deprecated
public DefaultModelBuilder setModelInterpolator( ModelInterpolator modelInterpolator )
@@ -243,7 +243,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setModelUrlNormalizer(ModelUrlNormalizer)
+ * @see DefaultModelBuilderFactory#setModelUrlNormalizer(ModelUrlNormalizer)
*/
@Deprecated
public DefaultModelBuilder setModelUrlNormalizer( ModelUrlNormalizer modelUrlNormalizer )
@@ -257,7 +257,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setSuperPomProvider(SuperPomProvider)
+ * @see DefaultModelBuilderFactory#setSuperPomProvider(SuperPomProvider)
*/
@Deprecated
public DefaultModelBuilder setSuperPomProvider( SuperPomProvider superPomProvider )
@@ -271,7 +271,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setInheritanceAssembler(InheritanceAssembler)
+ * @see DefaultModelBuilderFactory#setInheritanceAssembler(InheritanceAssembler)
*/
@Deprecated
public DefaultModelBuilder setInheritanceAssembler( InheritanceAssembler inheritanceAssembler )
@@ -299,7 +299,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setProfileInjector(ProfileInjector)
+ * @see DefaultModelBuilderFactory#setProfileInjector(ProfileInjector)
*/
@Deprecated
public DefaultModelBuilder setProfileInjector( ProfileInjector profileInjector )
@@ -313,7 +313,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setPluginManagementInjector(PluginManagementInjector)
+ * @see DefaultModelBuilderFactory#setPluginManagementInjector(PluginManagementInjector)
*/
@Deprecated
public DefaultModelBuilder setPluginManagementInjector( PluginManagementInjector pluginManagementInjector )
@@ -327,7 +327,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setDependencyManagementInjector(DependencyManagementInjector)
+ * @see DefaultModelBuilderFactory#setDependencyManagementInjector(DependencyManagementInjector)
*/
@Deprecated
public DefaultModelBuilder setDependencyManagementInjector(
@@ -342,7 +342,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setDependencyManagementImporter(DependencyManagementImporter)
+ * @see DefaultModelBuilderFactory#setDependencyManagementImporter(DependencyManagementImporter)
*/
@Deprecated
public DefaultModelBuilder setDependencyManagementImporter(
@@ -357,7 +357,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setLifecycleBindingsInjector(LifecycleBindingsInjector)
+ * @see DefaultModelBuilderFactory#setLifecycleBindingsInjector(LifecycleBindingsInjector)
*/
@Deprecated
public DefaultModelBuilder setLifecycleBindingsInjector( LifecycleBindingsInjector lifecycleBindingsInjector )
@@ -371,7 +371,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setPluginConfigurationExpander(PluginConfigurationExpander)
+ * @see DefaultModelBuilderFactory#setPluginConfigurationExpander(PluginConfigurationExpander)
*/
@Deprecated
public DefaultModelBuilder setPluginConfigurationExpander( PluginConfigurationExpander pluginConfigurationExpander )
@@ -385,7 +385,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setReportConfigurationExpander(ReportConfigurationExpander)
+ * @see DefaultModelBuilderFactory#setReportConfigurationExpander(ReportConfigurationExpander)
*/
@Deprecated
public DefaultModelBuilder setReportConfigurationExpander( ReportConfigurationExpander reportConfigurationExpander )
@@ -399,7 +399,7 @@ public class DefaultModelBuilder
/**
* @deprecated since Maven 4
- * @see DefaultModelBuilderFactory#setReportingConverter(ReportingConverter)
+ * @see DefaultModelBuilderFactory#setReportingConverter(ReportingConverter)
*/
@Deprecated
public DefaultModelBuilder setReportingConverter( ReportingConverter reportingConverter )
@@ -973,7 +973,7 @@ public class DefaultModelBuilder
try
{
- // must implement TransformContext, but should use request to access system properties/modelcache
+ // must implement TransformContext, but should use request to access properties/model cache
org.apache.maven.api.model.Model transformedFileModel = modelProcessor.read( pomFile,
Collections.singletonMap( ModelReader.TRANSFORMER_CONTEXT, context ) );
@@ -1352,7 +1352,7 @@ public class DefaultModelBuilder
// Validate versions aren't inherited when using parent ranges the same way as when read externally.
String rawChildModelVersion = childModel.getVersion();
-
+
if ( rawChildModelVersion == null )
{
// Message below is checked for in the MNG-2199 core IT.
@@ -1483,7 +1483,7 @@ public class DefaultModelBuilder
if ( !parent.getVersion().equals( version ) )
{
String rawChildModelVersion = childModel.getVersion();
-
+
if ( rawChildModelVersion == null )
{
// Message below is checked for in the MNG-2199 core IT.
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
index 27e3469a3..45b2c6c76 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
@@ -49,6 +49,7 @@ public class DefaultModelVersionProcessor
|| SHA1_PROPERTY.equals( property );
}
+ // TODO This class MUST test for user properties and THEN for system properties
@Override
public void overwriteModelProperties( Properties modelProperties, ModelBuildingRequest request )
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index e45b8839a..0b4992923 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -41,7 +41,7 @@ import org.codehaus.plexus.util.StringUtils;
* Determines profile activation based on the existence/absence of some file.
* File name interpolation support is limited to <code>${basedir}</code> (since Maven 3,
* see <a href="https://issues.apache.org/jira/browse/MNG-2363">MNG-2363</a>),
- * System properties and request properties.
+ * system properties and user properties.
* <code>${project.basedir}</code> is intentionally not supported as this form would suggest that other
* <code>${project.*}</code> expressions can be used, which is however beyond the design.
*
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index 5eb2374fa..b18f0febd 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -41,7 +41,7 @@ Maven Model Builder
** profile activation: see {{{./apidocs/org/apache/maven/model/profile/activation/package-summary.html}available activators}}.
Notice that model interpolation hasn't happened yet, then interpolation for file-based activation is limited to
- <<<$\{basedir}>>> (since Maven 3), System properties and request properties
+ <<<$\{basedir}>>> (since Maven 3), system properties and user properties
** file model validation: <<<ModelValidator>>> ({{{./apidocs/org/apache/maven/model/validation/ModelValidator.html}javadoc}}),
with its <<<DefaultModelValidator>>> implementation
@@ -162,7 +162,7 @@ Maven Model Builder
Notice that model interpolation happens <after> profile activation, then profile activation doesn't benefit from every values:
interpolation for file-based activation is limited to <<<$\{basedir}>>> (which was introduced in Maven 3 and is not deprecated
- in this context), System properties and request properties.
+ in this context), system properties and user properties.
Values are evaluated in sequence from different syntaxes:
@@ -198,9 +198,11 @@ Maven Model Builder
*----+------+------+
| <<<maven.repo.local>>> | The repository on the local machine Maven shall use to store installed and downloaded artifacts (POMs, JARs, etc). | <<<$\{user.home\}/.m2/repository>>> |
*----+------+------+
-| <<<*>>> | Java system properties (see {{{http://download.oracle.com/javase/6/docs/api/java/lang/System.html#getProperties()}JDK reference}}) | <<<$\{user.home\}>>>\
+| <<<*>>> | Java system properties (see {{{https://docs.oracle.com/javase/8/docs/api/java/lang/System.html#getProperties()}JDK reference}}) | <<<$\{user.home\}>>>\
| | <<<$\{java.home\}>>> |
*----+------+------+
+| <<<*>>> | User properties | <<<$\{foo\}>>> |
+*----+------+------+
| <<<env.*>>>\
<<<*>>> | environment variables | <<<$\{env.PATH\}>>> |
*----+------+------+
diff --git a/maven-plugin-api/src/main/mdo/plugin.mdo b/maven-plugin-api/src/main/mdo/plugin.mdo
index 7b4109b82..1c70f5c71 100644
--- a/maven-plugin-api/src/main/mdo/plugin.mdo
+++ b/maven-plugin-api/src/main/mdo/plugin.mdo
@@ -455,7 +455,7 @@ under the License.
<required>true</required>
<version>1.0.0+</version>
<type>String</type>
- <description>Parameter expression, to let user override default value with a system property, pom property or settings property.</description>
+ <description>Parameter expression, to let user override default value with a user property, system property or project property.</description>
</field>
<field xml.attribute="true" xml.tagName="implementation">
<name>implementation</name>
diff --git a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
index fd420deda..6f1496513 100644
--- a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
+++ b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenRepositorySystemUtils.java
@@ -19,8 +19,6 @@ package org.apache.maven.repository.internal;
* under the License.
*/
-import java.util.Properties;
-
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.artifact.DefaultArtifactType;
import org.eclipse.aether.collection.DependencyGraphTransformer;
@@ -104,19 +102,6 @@ public final class MavenRepositorySystemUtils
session.setArtifactDescriptorPolicy( new SimpleArtifactDescriptorPolicy( true, true ) );
- final Properties systemProperties = new Properties();
-
- // MNG-5670 guard against ConcurrentModificationException
- // MNG-6053 guard against key without value
- Properties sysProp = System.getProperties();
- synchronized ( sysProp )
- {
- systemProperties.putAll( sysProp );
- }
-
- session.setSystemProperties( systemProperties );
- session.setConfigProperties( systemProperties );
-
return session;
}