Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7658] CI-friendly versions should only come from/rely on user properties 

This closes #945
This commit is contained in:
Michael Osipov 2023-01-01 19:52:02 +01:00
parent c2c6dd0921
commit 7b00069388
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/DefaultModelVersionProcessor.java
View File

@ -46,18 +46,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));
}
}
}