This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/ci-friendly-complex-expressions
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 8e7610ad3abc091af62e929040c175ad9e5cf3c1
Author: mkolesnikov <mikhail_kolesni...@outlook.com>
AuthorDate: Wed Jun 5 12:34:42 2024 +0300
MRELEASE-1109 clean up and format
---
.../shared/release/transform/jdom2/JDomModel.java | 5 +---
.../shared/release/util/CiFriendlyVersion.java | 32 +++++++++++-----------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
index c6b153d9..20ee8433 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom2/JDomModel.java
@@ -203,10 +203,7 @@ public class JDomModel extends Model {
if
(CiFriendlyVersion.isCiFriendlyVersion(versionElement.getTextNormalize())) {
// try to rewrite property if CI friendly expression is used
CiFriendlyVersion.rewriteVersionAndProperties(
- version,
- versionElement.getTextNormalize(),
- (JDomProperties) getProperties(),
- releaseDescriptor);
+ version, versionElement.getTextNormalize(),
getProperties(), releaseDescriptor);
} else {
JDomUtils.rewriteValue(versionElement, version);
}
diff --git
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/CiFriendlyVersion.java
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/CiFriendlyVersion.java
index ca3d9809..6b812a40 100644
---
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/CiFriendlyVersion.java
+++
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/CiFriendlyVersion.java
@@ -20,13 +20,13 @@ package org.apache.maven.shared.release.util;
import java.util.Arrays;
import java.util.HashSet;
+import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.transform.jdom2.JDomProperties;
public class CiFriendlyVersion {
@@ -72,43 +72,43 @@ public class CiFriendlyVersion {
}
public static void rewriteVersionAndProperties(
- String version, String versionElement, JDomProperties
jDomProperties, ReleaseDescriptor releaseDescriptor) {
+ String version, String versionElement, Properties properties,
ReleaseDescriptor releaseDescriptor) {
// try to rewrite property if CI friendly expression is used
String ciFriendlyPropertyName =
extractPropertyFromExpression(versionElement);
- if (jDomProperties != null) {
- String sha1 = resolveSha1Property(jDomProperties,
releaseDescriptor);
+ if (properties != null) {
+ String sha1 = resolveSha1Property(releaseDescriptor);
// assume that everybody follows the example and properties are
simply chained
// and the changelist can only be '-SNAPSHOT'
if (ArtifactUtils.isSnapshot(version)) {
- if (jDomProperties.containsKey(CHANGELIST)) {
- jDomProperties.setProperty(
+ if (properties.containsKey(CHANGELIST)) {
+ properties.setProperty(
ciFriendlyPropertyName, version.replace(sha1,
"").replace(SNAPSHOT, ""));
- jDomProperties.setProperty(CHANGELIST, SNAPSHOT);
+ properties.setProperty(CHANGELIST, SNAPSHOT);
} else {
- jDomProperties.setProperty(ciFriendlyPropertyName,
version.replace(sha1, ""));
+ properties.setProperty(ciFriendlyPropertyName,
version.replace(sha1, ""));
}
- if (jDomProperties.containsKey(SHA1)) {
+ if (properties.containsKey(SHA1)) {
// drop the value for the next version
- jDomProperties.setProperty(SHA1, "");
+ properties.setProperty(SHA1, "");
}
} else {
- jDomProperties.setProperty(
+ properties.setProperty(
ciFriendlyPropertyName, version.replace(sha1,
"").replace(SNAPSHOT, ""));
- if (jDomProperties.containsKey(CHANGELIST)) {
- jDomProperties.setProperty(CHANGELIST, "");
+ if (properties.containsKey(CHANGELIST)) {
+ properties.setProperty(CHANGELIST, "");
}
- if (jDomProperties.containsKey(SHA1) && !sha1.isEmpty()) {
+ if (properties.containsKey(SHA1) && !sha1.isEmpty()) {
// we need this to restore the revision for the next
development
// or release:prepare should provide sha1 after a commit
// or a user should provide it as an additional
`arguments` in plugin configuration
// see
maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module
- jDomProperties.setProperty(SHA1, sha1);
+ properties.setProperty(SHA1, sha1);
}
}
}
}
- private static String resolveSha1Property(JDomProperties jDomProperties,
ReleaseDescriptor releaseDescriptor) {
+ private static String resolveSha1Property(ReleaseDescriptor
releaseDescriptor) {
String scmVersion = releaseDescriptor.getScmReleasedPomRevision();
return System.getProperty(SHA1, scmVersion == null ? "" : scmVersion);
}
