You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kw...@apache.org on 2025/08/11 08:54:58 UTC
(maven-scm) 02/02: Rework sign option for Git tag/commit
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 5afd5283b224b7f03cd865d8f015ab1c1c17d235
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Mon Aug 11 10:23:13 2025 +0200
Rework sign option for Git tag/commit
Use tri-state for signing/not-signing/default (from config)
Don't support signing with JGit yet (requires additional dependencies)
Overwrite global sign settings during test execution
This closes #1292
---
.../provider/git/gitexe/command/checkin/GitCheckInCommandTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
index 4e82d603a..c0c40373e 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommandTest.java
@@ -44,6 +44,7 @@
import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeNoException;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -211,7 +212,11 @@ public void testSignedCheckin() throws Exception {
}
});
- GpgTestUtils.importKey(GpgTestUtils.JOHN_DOE_SECRET_KEY_RESOURCE_NAME);
+ try {
+ GpgTestUtils.importKey(GpgTestUtils.JOHN_DOE_SECRET_KEY_RESOURCE_NAME);
+ } catch (Exception e) {
+ assumeNoException("GPG key import failed, skipping test: " + e.getMessage(), e);
+ }
try {
// Creating beer.xml
File beerFile = new File(checkedOutRepo.getAbsolutePath(), "beer.xml");