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 2023/01/01 20:28:35 UTC
[maven] branch maven-3.9.x updated: [MNG-7658] CI-friendly versions should only come from/rely on user properties
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 4e8773bc4 [MNG-7658] CI-friendly versions should only come from/rely on user properties
4e8773bc4 is described below
commit 4e8773bc444b2bde5fec6e0482e3396647ff88ad
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jan 1 19:52:02 2023 +0100
[MNG-7658] CI-friendly versions should only come from/rely on user properties
This closes #945
---
.../model/interpolation/DefaultModelVersionProcessor.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
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 e44544da5..f341c451c 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
@@ -44,18 +44,16 @@ public class DefaultModelVersionProcessor implements ModelVersionProcessor {
|| 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) {
- if (request.getSystemProperties().containsKey(REVISION_PROPERTY)) {
- modelProperties.put(REVISION_PROPERTY, request.getSystemProperties().get(REVISION_PROPERTY));
+ if (request.getUserProperties().containsKey(REVISION_PROPERTY)) {
+ modelProperties.put(REVISION_PROPERTY, request.getUserProperties().get(REVISION_PROPERTY));
}
- if (request.getSystemProperties().containsKey(CHANGELIST_PROPERTY)) {
- modelProperties.put(
- CHANGELIST_PROPERTY, request.getSystemProperties().get(CHANGELIST_PROPERTY));
+ if (request.getUserProperties().containsKey(CHANGELIST_PROPERTY)) {
+ modelProperties.put(CHANGELIST_PROPERTY, request.getUserProperties().get(CHANGELIST_PROPERTY));
}
- if (request.getSystemProperties().containsKey(SHA1_PROPERTY)) {
- modelProperties.put(SHA1_PROPERTY, request.getSystemProperties().get(SHA1_PROPERTY));
+ if (request.getUserProperties().containsKey(SHA1_PROPERTY)) {
+ modelProperties.put(SHA1_PROPERTY, request.getUserProperties().get(SHA1_PROPERTY));
}
}
}