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 81740b005f20e593989b779d9ef38f7986c0b0fc
Author: mkolesnikov <mikhail_kolesni...@outlook.com>
AuthorDate: Wed Jun 5 12:32:56 2024 +0300
MRELEASE-1109 fixed integration test
---
.../java/org/apache/maven/shared/release/util/CiFriendlyVersion.java | 2 +-
.../src/it/projects/prepare/ci-friendly-multi-module/invoker.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 3eaeaa92..ca3d9809 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
@@ -110,6 +110,6 @@ public class CiFriendlyVersion {
private static String resolveSha1Property(JDomProperties jDomProperties,
ReleaseDescriptor releaseDescriptor) {
String scmVersion = releaseDescriptor.getScmReleasedPomRevision();
- return jDomProperties.getProperty(SHA1, System.getProperty(SHA1,
scmVersion == null ? "" : scmVersion));
+ return System.getProperty(SHA1, scmVersion == null ? "" : scmVersion);
}
}
diff --git
a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/invoker.properties
b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/invoker.properties
index 65218864..c8e7f246 100644
---
a/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/invoker.properties
+++
b/maven-release-plugin/src/it/projects/prepare/ci-friendly-multi-module/invoker.properties
@@ -16,4 +16,4 @@
# under the License.
invoker.goals=release:clean release:prepare
-invoker.mavenOpts=-Dsha1=-abcdef12
-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
\ No newline at end of file
+invoker.mavenOpts=-Dsha1=-abcdef12
\ No newline at end of file
