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 09:00:00 UTC
(maven-scm) branch feature/jgit-checkin-no-verify updated (9d0e038a6 -> 39f1f60d8)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/jgit-checkin-no-verify
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
discard 9d0e038a6 Support "no-verify" with JGit commits
add 3b8a27b81 Replace unintended octal constants (#1287)
add 6f41a56b5 Use Files.lines (#1284)
add 77bdcfaae Remove redundant null checks (#1288)
add 75341ce9c Grammar fixes (#1291)
add 97e6f2c49 Fix asserts semantically (#1289)
add 039e131ed Remove redundant code (#1290)
add b1aa1f253 Rework sign option for Git tag/commit
add 5afd5283b Rework sign option for Git tag/commit
new 39f1f60d8 Support "no-verify" with JGit commits
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9d0e038a6)
\
N -- N -- N refs/heads/feature/jgit-checkin-no-verify (39f1f60d8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/maven/scm/ChangeSet.java | 2 +-
.../org/apache/maven/scm/CommandParameter.java | 9 ++-
.../org/apache/maven/scm/CommandParameters.java | 57 +++++++++++--
.../java/org/apache/maven/scm/ScmFileStatus.java | 4 +-
.../main/java/org/apache/maven/scm/ScmResult.java | 4 +-
.../org/apache/maven/scm/ScmTagParameters.java | 45 ++++++++---
.../command/checkin/AbstractCheckInCommand.java | 26 +++++-
.../command/remoteinfo/RemoteInfoScmResult.java | 4 +-
.../maven/scm/command/tag/AbstractTagCommand.java | 5 ++
.../maven/scm/manager/AbstractScmManager.java | 4 +-
.../org/apache/maven/scm/manager/ScmManager.java | 14 ++--
.../org/apache/maven/scm/provider/ScmProvider.java | 6 +-
.../maven/scm/provider/ScmProviderRepository.java | 2 +-
.../apache/maven/scm/repository/ScmRepository.java | 2 +-
.../java/org/apache/maven/scm/ChangeSetTest.java | 2 +-
.../java/org/apache/maven/scm/ScmFileSetTest.java | 2 +-
.../apache/maven/scm/client/cli/MavenScmCli.java | 2 -
.../java/org/apache/maven/scm/plugin/AddMojo.java | 2 +-
.../org/apache/maven/scm/plugin/BootstrapMojo.java | 2 +-
.../org/apache/maven/scm/plugin/ChangeLogMojo.java | 7 +-
.../org/apache/maven/scm/plugin/CheckinMojo.java | 27 ++++++-
.../java/org/apache/maven/scm/plugin/TagMojo.java | 37 ++++-----
.../org/apache/maven/scm/plugin/ValidateMojo.java | 2 +-
maven-scm-plugin/src/site/markdown/usage.md | 2 +-
.../apache/maven/scm/plugin/BranchMojoTest.java | 8 +-
.../apache/maven/scm/plugin/ChangeLogMojoTest.java | 10 +--
.../apache/maven/scm/plugin/CheckoutMojoTest.java | 12 +--
.../apache/maven/scm/plugin/ExportMojoTest.java | 10 +--
.../apache/maven/scm/plugin/StatusMojoTest.java | 4 +-
.../org/apache/maven/scm/plugin/TagMojoTest.java | 10 +--
.../org/apache/maven/scm/plugin/UntagMojoTest.java | 8 +-
.../apache/maven/scm/plugin/UpdateMojoTest.java | 6 +-
.../provider/hg/command/HgCommandConstants.java | 2 +-
.../scm/provider/hg/command/add/HgAddConsumer.java | 2 +-
.../hg/command/remove/HgRemoveConsumer.java | 2 +-
.../hg/repository/HgScmProviderRepositoryTest.java | 6 +-
.../command/update/LocalUpdateCommandTckTest.java | 2 +-
.../provider/git/command/diff/GitDiffConsumer.java | 1 -
.../gitexe/command/checkin/GitCheckInCommand.java | 39 ++++++++-
.../command/checkout/GitCheckOutCommand.java | 2 +-
.../gitexe/command/remove/GitRemoveConsumer.java | 2 -
.../git/gitexe/command/tag/GitTagCommand.java | 26 +++---
.../update/GitLatestRevisionCommandConsumer.java | 2 +-
.../gitexe/command/update/GitUpdateCommand.java | 3 +-
.../scm/provider/git/gitexe/GpgTestUtils.java | 93 ++++++++++++++++++++++
.../changelog/GitExeChangeLogCommandTckTest.java | 13 +++
.../checkin/GitCheckInCommandNoBranchTest.java | 2 +-
.../command/checkin/GitCheckInCommandTest.java | 58 +++++++++++++-
.../GitExeCheckOutCommandNoBranchTest.java | 4 +-
.../gitexe/command/info/GitInfoCommandTest.java | 8 +-
.../command/remove/GitRemoveConsumerTest.java | 4 +-
.../git/gitexe/command/tag/GitTagCommandTest.java | 18 ++---
.../src/test/resources/gpg/john-doe-secret-key.asc | 56 +++++++++++++
.../maven/scm/provider/git/GitScmTestUtils.java | 18 +++--
.../command/checkin/GitCheckInCommandTckTest.java | 2 -
.../scm/provider/git/sshd/git/pack/README.txt | 2 +-
.../scm/provider/git/jgit/command/JGitUtils.java | 3 +-
.../jgit/command/checkin/JGitCheckInCommand.java | 4 +
.../git/jgit/command/tag/JGitTagCommand.java | 1 -
.../JGitCheckInCommandCommitterAuthorTckTest.java | 1 -
.../scm/provider/svn/SvnConfigFileReader.java | 46 +++++------
.../svn/svnexe/command/info/SvnInfoCommand.java | 2 +-
.../svn/svnexe/command/mkdir/SvnMkdirCommand.java | 2 +-
.../svn/svnexe/command/mkdir/SvnMkdirConsumer.java | 4 -
.../command/checkout/SvnCheckOutCommandTest.java | 2 +-
.../remoteinfo/SvnRemoteInfoCommandTest.java | 4 +-
.../java/org/apache/maven/scm/ScmTckTestCase.java | 2 +-
.../java/org/apache/maven/scm/ScmTestCase.java | 2 +-
.../apache/maven/scm/provider/ScmProviderStub.java | 5 +-
.../tck/command/branch/BranchCommandTckTest.java | 1 -
.../command/changelog/ChangeLogCommandTckTest.java | 12 +--
.../tck/command/checkin/CheckInCommandTckTest.java | 3 -
.../command/checkout/CheckOutCommandTckTest.java | 2 +-
.../scm/tck/command/info/InfoCommandTckTest.java | 4 +-
.../tck/command/remove/RemoveCommandTckTest.java | 1 -
.../tck/command/status/StatusCommandTckTest.java | 1 -
.../scm/tck/command/tag/TagCommandTckTest.java | 1 -
src/site/markdown/authentication.md | 2 +-
src/site/markdown/guide/index.md | 4 +-
src/site/markdown/guide/new_provider.md | 2 +-
src/site/markdown/guide/usage.md | 2 +-
src/site/markdown/scm-commands.md | 4 +-
src/site/markdown/scm-url-format.md | 4 +-
83 files changed, 574 insertions(+), 251 deletions(-)
create mode 100644 maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/GpgTestUtils.java
create mode 100644 maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/resources/gpg/john-doe-secret-key.asc
(maven-scm) 01/01: Support "no-verify" with JGit commits
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/jgit-checkin-no-verify
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 39f1f60d866c9b0c6c0b1bd16675951368fb86f7
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Aug 7 17:03:46 2025 +0200
Support "no-verify" with JGit commits
---
.../maven/scm/provider/git/util/GitUtil.java | 2 +-
.../maven/scm/provider/git/GitScmTestUtils.java | 30 +++++++++++++++++
.../command/checkin/GitCheckInCommandTckTest.java | 39 ++++++++++++++++++++++
.../src/main/resources/git-settings-no-verify.xml | 4 +++
.../jgit/command/checkin/JGitCheckInCommand.java | 9 +++++
5 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
index 70c15ae3b..340e512b3 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/util/GitUtil.java
@@ -33,7 +33,7 @@
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
*/
public class GitUtil {
- protected static final String GIT_SETTINGS_FILENAME = "git-settings.xml";
+ public static final String GIT_SETTINGS_FILENAME = "git-settings.xml";
public static final File DEFAULT_SETTINGS_DIRECTORY = new File(System.getProperty("user.home"), ".scm");
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
index 3d5567bc1..6c1113ccf 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitScmTestUtils.java
@@ -22,6 +22,10 @@
import java.io.FileWriter;
import java.io.IOException;
import java.util.function.Consumer;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
import org.apache.maven.scm.PlexusJUnit4TestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -88,6 +92,28 @@ public static void deleteAllDirectories(File startDirectory, String pattern) thr
}
}
+ /**
+ * Creates a new file below a new temporary directory and copies the content of a classpath resource into it.
+ * The caller is responsible for deleting the temporary directory afterwards.
+ * @param clazz
+ * @param resourceName (relative to {@code clazz})
+ * @param fileName
+ * @return the newly created file
+ * @throws IOException
+ */
+ public static Path createTempFileFromClasspathResource(Class<?> clazz, String resourceName, String fileName)
+ throws IOException {
+ Path tmpDirectory = Files.createTempDirectory("maven-scm-git-test-");
+ Path tmpFile = tmpDirectory.resolve(fileName);
+ try (InputStream inputStream = clazz.getResourceAsStream(resourceName)) {
+ if (inputStream == null) {
+ throw new IOException("Resource not found: " + resourceName);
+ }
+ Files.copy(inputStream, tmpFile, StandardCopyOption.REPLACE_EXISTING);
+ }
+ return tmpFile;
+ }
+
public static void setDefaultGitConfig(File repositoryRootFile) throws IOException {
setDefaultGitConfig(repositoryRootFile, null);
}
@@ -137,6 +163,10 @@ public static void setupRejectAllCommitsPrePushHook(File workspaceRoot) throws I
setupRejectAllCommitsHook(workspaceRoot, false, "pre-push");
}
+ public static void setupRejectAllCommitsPreCommitHook(File workspaceRoot) throws IOException {
+ setupRejectAllCommitsHook(workspaceRoot, false, "pre-commit");
+ }
+
private static void setupRejectAllCommitsHook(
File repositoryOrWorkspaceRootFile, boolean isServerSide, String hookName) throws IOException {
File hooksDir;
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
index 8bf1f61ed..c647cfc48 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
@@ -20,6 +20,8 @@
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
import org.apache.maven.scm.CommandParameter;
import org.apache.maven.scm.CommandParameters;
@@ -28,6 +30,7 @@
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.provider.git.GitScmTestUtils;
+import org.apache.maven.scm.provider.git.util.GitUtil;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.tck.command.checkin.CheckInCommandTckTest;
import org.codehaus.plexus.util.FileUtils;
@@ -102,6 +105,41 @@ public void testRejectedNonFastForwardPush() throws Exception {
"check-in should have been rejected since fast forward was not possible", checkInScmResult.isSuccess());
}
+ @Test
+ public void testCommitNoVerify() throws Exception {
+ GitScmTestUtils.setupRejectAllCommitsPreCommitHook(getWorkingCopy());
+ GitScmTestUtils.setDefaultGitConfig(getWorkingCopy());
+ ScmFileSet addedFile = createWorkspaceChange(getWorkingCopy());
+ CheckInScmResult result;
+ try {
+ result = getScmManager().checkIn(
+ getScmRepository(),
+ addedFile,
+ "Commit with pre-commit hook");
+ assertFalse(
+ "check-in should have been rejected since pre-push hook rejects all commits",
+ result.isSuccess());
+ } catch (Exception e) {
+ // some providers may use an exception to indicate a failed commit
+
+ }
+ // now try with --no-verify
+ Path gitSettingsFile = GitScmTestUtils.createTempFileFromClasspathResource(this.getClass(), "/git-settings-no-verify.xml", GitUtil.GIT_SETTINGS_FILENAME);
+ GitUtil.setSettingsDirectory(gitSettingsFile.getParent().toFile()); // ensure that the settings are read from the .git directory
+ try {
+ result = getScmManager().checkIn(
+ getScmRepository(),
+ addedFile,
+ "Commit with pre-commit hook");
+ assertResultIsSuccess(result);
+ } finally {
+ GitUtil.setSettingsDirectory(GitUtil.DEFAULT_SETTINGS_DIRECTORY); // reset to default settings directory
+ Files.delete(gitSettingsFile); // delete the temporary settings file
+ Files.delete(gitSettingsFile.getParent()); // delete the temporary settings directory
+ }
+ }
+
+
private CheckOutScmResult checkoutRepoInto(File workingCopy, ScmRepository scmRepository) throws Exception {
FileUtils.deleteDirectory(workingCopy);
workingCopy.mkdir();
@@ -117,4 +155,5 @@ private ScmFileSet createWorkspaceChange(File repo) throws IOException {
FileUtils.fileWrite(beerFile.getAbsolutePath(), "1 litre");
return new ScmFileSet(repo, beerFile.getName());
}
+
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/resources/git-settings-no-verify.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/resources/git-settings-no-verify.xml
new file mode 100644
index 000000000..ee716d2d3
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/resources/git-settings-no-verify.xml
@@ -0,0 +1,4 @@
+<git-settings xmlns="http://maven.apache.org/SCM/GIT/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SCM/GIT/1.1.0 http://maven.apache.org/xsd/scm-git-1.1.0.xsd">
+ <commitNoVerify>true</commitNoVerify>
+</git-settings>
\ No newline at end of file
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
index 653de8dd6..79a1a3f4d 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkin/JGitCheckInCommand.java
@@ -45,6 +45,7 @@
import org.apache.maven.scm.provider.git.jgit.command.PushException;
import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.provider.git.util.GitUtil;
import org.eclipse.jgit.api.AddCommand;
import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.jgit.api.Git;
@@ -152,7 +153,15 @@ public CheckInScmResult executeCommand(ScmProviderRepository repo, ScmFileSet fi
CommitCommand command = git.commit()
.setMessage(message)
.setAuthor(author.name, author.email)
+<<<<<<< Upstream, based on master
.setCommitter(committer.name, committer.email);
+=======
+ .setCommitter(committer.name, committer.email)
+ .setSign(parameters.getBoolean(CommandParameter.SCM_COMMIT_SIGN, true));
+ if (GitUtil.getSettings().isCommitNoVerify()) {
+ command.setNoVerify(true);
+ }
+>>>>>>> 9d0e038 Support "no-verify" with JGit commits
RevCommit commitRev = command.call();
logger.info("commit done: " + commitRev.getShortMessage());