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/07/30 10:55:53 UTC
(maven-scm) branch master updated: Git: Use environment variables when pushing tags/branches to remote (#1270)
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
The following commit(s) were added to refs/heads/master by this push:
new 6fc20f710 Git: Use environment variables when pushing tags/branches to remote (#1270)
6fc20f710 is described below
commit 6fc20f710675bd78394633ecaab39a651e89b7cd
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Jul 30 12:55:49 2025 +0200
Git: Use environment variables when pushing tags/branches to remote (#1270)
Add SSH based push tag/branch tests
Refactor SSH support for tests
This closes #1253
---
.../scm/command/untag/AbstractUntagCommand.java | 2 +-
.../org/apache/maven/scm/plugin/UntagMojoTest.java | 2 +-
.../scm/provider/git/gitexe/GitExeScmProvider.java | 6 +-
.../gitexe/command/branch/GitBranchCommand.java | 13 ++-
.../git/gitexe/command/tag/GitTagCommand.java | 12 ++-
.../git/gitexe/command/untag/GitUntagCommand.java | 12 ++-
.../scm/provider/git/gitexe/GitExeTestUtils.java | 61 ++++++++++++
.../GitExeSshBranchCommandTckTest.java} | 32 +++---
.../checkin/GitCheckInCommandNoBranchTest.java | 2 +-
.../command/checkin/GitCheckInCommandTest.java | 4 +-
.../checkout/GitExeSshCheckOutCommandTckTest.java | 26 +----
.../command/remove/GitExeRemoveCommandTckTest.java | 2 +-
.../GitExeSshTagCommandTckTest.java} | 32 +++---
.../GitExeSshUntagCommandTckTest.java} | 32 +++---
.../maven-scm-provider-gittest/pom.xml | 1 +
.../maven/scm/provider/git/GitScmTestUtils.java | 2 +-
...eckOutCommandTckTest.java => GitSshServer.java} | 95 +++++++-----------
.../git/command/blame/GitBlameCommandTckTest.java | 2 +-
.../command/branch/GitBranchCommandTckTest.java | 2 +-
.../command/branch/GitSshBranchCommandTckTest.java | 106 ++++++++++++++++++++
.../changelog/GitChangeLogCommandTckTest.java | 2 +-
.../command/checkin/GitCheckInCommandTckTest.java | 8 +-
.../checkout/GitSshCheckOutCommandTckTest.java | 84 ++--------------
.../command/status/GitStatusCommandTckTest.java | 2 +-
.../git/command/tag/GitSshTagCommandTckTest.java | 107 ++++++++++++++++++++
.../git/command/tag/GitTagCommandTckTest.java | 2 +-
.../command/untag/GitSshUntagCommandTckTest.java | 106 ++++++++++++++++++++
.../git/command/untag/GitUntagCommandTckTest.java | 2 +-
.../command/update/GitUpdateCommandTckTest.java | 2 +-
.../provider/git/sshd/git/pack/GitPackCommand.java | 109 +++++++++++++++++++++
.../git/sshd/git/pack/GitPackCommandFactory.java | 65 ++++++++++++
.../scm/provider/git/sshd/git/pack/README.txt | 5 +
.../CustomizableSshSessionFactoryCommand.java | 40 ++++++++
.../scm/provider/git/jgit/command/JGitUtils.java | 19 ++--
.../git/jgit/command/branch/JGitBranchCommand.java | 32 +++++-
.../jgit/command/checkin/JGitCheckInCommand.java | 29 +++++-
.../jgit/command/checkout/JGitCheckOutCommand.java | 5 +-
.../git/jgit/command/tag/JGitTagCommand.java | 31 +++++-
.../git/jgit/command/untag/JGitUntagCommand.java | 29 +++++-
.../git/jgit/AcceptAllHostsSshdSessionFactory.java | 52 ++++++++++
.../scm/provider/git/jgit/JGitTestScmProvider.java | 73 ++++++++++++--
.../JGitSshBranchCommandTckTest.java} | 41 ++++----
.../checkout/JGitSshCheckOutCommandTckTest.java | 40 +-------
.../command/remove/JGitRemoveCommandTckTest.java | 2 +-
.../JGitSshTagCommandTckTest.java} | 41 ++++----
.../JGitSshUntagCommandTckTest.java} | 41 ++++----
46 files changed, 1062 insertions(+), 353 deletions(-)
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/untag/AbstractUntagCommand.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/untag/AbstractUntagCommand.java
index a44eab243..da9079e56 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/untag/AbstractUntagCommand.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/untag/AbstractUntagCommand.java
@@ -27,7 +27,7 @@
import org.apache.maven.scm.command.AbstractCommand;
import org.apache.maven.scm.provider.ScmProviderRepository;
-/** {@inheritDoc} */
+/** Removes a tag */
public abstract class AbstractUntagCommand extends AbstractCommand {
/**
* execute untag command
diff --git a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
index 4ed30b7e4..f0545d747 100644
--- a/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
+++ b/maven-scm-plugin/src/test/java/org/apache/maven/scm/plugin/UntagMojoTest.java
@@ -63,7 +63,7 @@ public void setUp() throws Exception {
checkoutMojo.execute();
// Add a default user to the config
- GitScmTestUtils.setDefaulGitConfig(checkoutDir);
+ GitScmTestUtils.setDefaultGitConfig(checkoutDir);
}
@Test
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
index dad934842..b483f46da 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/GitExeScmProvider.java
@@ -66,7 +66,7 @@ protected GitCommand getAddCommand() {
/** {@inheritDoc} */
protected GitCommand getBranchCommand() {
- return new GitBranchCommand();
+ return new GitBranchCommand(environmentVariables);
}
/** {@inheritDoc} */
@@ -106,12 +106,12 @@ protected GitCommand getStatusCommand() {
/** {@inheritDoc} */
protected GitCommand getTagCommand() {
- return new GitTagCommand();
+ return new GitTagCommand(environmentVariables);
}
/** {@inheritDoc} */
protected GitCommand getUntagCommand() {
- return new GitUntagCommand();
+ return new GitUntagCommand(environmentVariables);
}
/** {@inheritDoc} */
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
index 976865797..fb3c130db 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitBranchCommand.java
@@ -19,6 +19,7 @@
package org.apache.maven.scm.provider.git.gitexe.command.branch;
import java.io.File;
+import java.util.Map;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -40,6 +41,12 @@
*
*/
public class GitBranchCommand extends AbstractBranchCommand implements GitCommand {
+ private final Map<String, String> environmentVariables;
+
+ public GitBranchCommand(Map<String, String> environmentVariables) {
+ this.environmentVariables = environmentVariables;
+ }
+
/** {@inheritDoc} */
public ScmResult executeBranchCommand(ScmProviderRepository repo, ScmFileSet fileSet, String branch, String message)
throws ScmException {
@@ -102,9 +109,9 @@ public static Commandline createCommandLine(
return cl;
}
- public static Commandline createPushCommandLine(
- GitScmProviderRepository repository, ScmFileSet fileSet, String branch) throws ScmException {
- Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(fileSet.getBasedir(), "push");
+ public Commandline createPushCommandLine(GitScmProviderRepository repository, ScmFileSet fileSet, String branch) {
+ Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(
+ fileSet.getBasedir(), "push", repository, environmentVariables);
cl.createArg().setValue(repository.getPushUrl());
cl.createArg().setValue("refs/heads/" + branch);
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
index 9099156eb..e12c09208 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
@@ -20,6 +20,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Map;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -44,6 +45,11 @@
*
*/
public class GitTagCommand extends AbstractTagCommand implements GitCommand {
+ private final Map<String, String> environmentVariables;
+
+ public GitTagCommand(Map<String, String> environmentVariables) {
+ this.environmentVariables = environmentVariables;
+ }
public ScmResult executeTagCommand(ScmProviderRepository repo, ScmFileSet fileSet, String tag, String message)
throws ScmException {
@@ -156,9 +162,9 @@ static Commandline createCommandLine(
return cl;
}
- public static Commandline createPushCommandLine(GitScmProviderRepository repository, ScmFileSet fileSet, String tag)
- throws ScmException {
- Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(fileSet.getBasedir(), "push");
+ public Commandline createPushCommandLine(GitScmProviderRepository repository, ScmFileSet fileSet, String tag) {
+ Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(
+ fileSet.getBasedir(), "push", repository, environmentVariables);
cl.createArg().setValue(repository.getPushUrl());
cl.createArg().setValue("refs/tags/" + tag);
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java
index 4ab067527..8abf00f4e 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitUntagCommand.java
@@ -19,6 +19,7 @@
package org.apache.maven.scm.provider.git.gitexe.command.untag;
import java.io.File;
+import java.util.Map;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -35,6 +36,11 @@
/** {@inheritDoc} */
public class GitUntagCommand extends AbstractUntagCommand implements GitCommand {
+ private final Map<String, String> environmentVariables;
+
+ public GitUntagCommand(Map<String, String> environmentVariables) {
+ this.environmentVariables = environmentVariables;
+ }
/** {@inheritDoc} */
public ScmResult executeUntagCommand(
@@ -85,9 +91,9 @@ public static Commandline createCommandLine(
return cl;
}
- public static Commandline createPushCommandLine(
- GitScmProviderRepository repository, ScmFileSet fileSet, String tag) {
- Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(fileSet.getBasedir(), "push");
+ public Commandline createPushCommandLine(GitScmProviderRepository repository, ScmFileSet fileSet, String tag) {
+ Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(
+ fileSet.getBasedir(), "push", repository, environmentVariables);
cl.createArg().setValue("--delete");
cl.createArg().setValue(repository.getPushUrl());
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/GitExeTestUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/GitExeTestUtils.java
new file mode 100644
index 000000000..a89c58453
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/GitExeTestUtils.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.gitexe;
+
+import org.apache.commons.io.FilenameUtils;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.manager.ScmManager;
+import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.codehaus.plexus.util.StringUtils;
+
+public class GitExeTestUtils {
+
+ /**
+ * Environment variable to customize the SSH command used by git, requires git 2.3.0 or newer
+ * @see <a href="https://git-scm.com/docs/git#Documentation/git.txt-GITSSHCOMMAND">GIT_SSH_COMMAND</a>
+ */
+ public static final String VARIABLE_GIT_SSH_COMMAND = "GIT_SSH_COMMAND";
+
+ private GitExeTestUtils() {
+ // Utility class, no instantiation
+ }
+
+ /**
+ * Configures the git executable to use a custom SSH command that allows lenient host key checking.
+ * It uses the private key specified in the repository configuration.
+ * @param scmManager
+ * @param repository
+ * @throws NoSuchScmProviderException
+ */
+ public static void configureLenientSshAuthentication(ScmManager scmManager, ScmRepository repository)
+ throws NoSuchScmProviderException {
+ ScmProviderRepositoryWithHost providerRepository =
+ (ScmProviderRepositoryWithHost) repository.getProviderRepository();
+ GitExeScmProvider provider = (GitExeScmProvider) scmManager.getProviderByRepository(repository);
+ String privateKey = providerRepository.getPrivateKey();
+ if (StringUtils.isBlank(privateKey)) {
+ throw new IllegalArgumentException("Private key must be set in the repository configuration");
+ }
+ provider.setEnvironmentVariable(
+ VARIABLE_GIT_SSH_COMMAND,
+ "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i "
+ + FilenameUtils.separatorsToUnix(providerRepository.getPrivateKey()));
+ }
+}
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/remove/GitExeRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitExeSshBranchCommandTckTest.java
similarity index 53%
copy from maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitExeSshBranchCommandTckTest.java
index eec858a2c..29746b943 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/branch/GitExeSshBranchCommandTckTest.java
@@ -16,29 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.scm.provider.git.gitexe.command.remove;
+package org.apache.maven.scm.provider.git.gitexe.command.branch;
-import java.io.File;
+import java.security.GeneralSecurityException;
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.provider.git.command.remove.GitRemoveCommandTckTest;
+import org.apache.maven.scm.provider.git.command.branch.GitSshBranchCommandTckTest;
+import org.apache.maven.scm.provider.git.gitexe.GitExeTestUtils;
import org.apache.maven.scm.repository.ScmRepository;
-import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE;
+/**
+ *
+ */
+public class GitExeSshBranchCommandTckTest extends GitSshBranchCommandTckTest {
+
+ public GitExeSshBranchCommandTckTest() throws GeneralSecurityException {
+ super();
+ }
-public class GitExeRemoveCommandTckTest extends GitRemoveCommandTckTest {
@Override
- public String getScmProviderCommand() {
- return GIT_COMMAND_LINE;
+ protected String getScmProvider() {
+ return "git";
}
@Override
- protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
- try {
- return super.checkOut(workingDirectory, repository);
- } finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
- }
+ public void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
+ super.configureCredentials(repository, passphrase);
+ GitExeTestUtils.configureLenientSshAuthentication(getScmManager(), repository);
}
}
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/GitCheckInCommandNoBranchTest.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/GitCheckInCommandNoBranchTest.java
index 9dc96341b..874a4082e 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/GitCheckInCommandNoBranchTest.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/GitCheckInCommandNoBranchTest.java
@@ -66,7 +66,7 @@ public void testCheckinNoBranch() throws Exception {
CheckOutScmResult checkOutScmResult = checkoutRepo(scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
assertEquals(0, checkOutScmResult.getCheckedOutFiles().size());
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 1e25fa396..afec7e9ce 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
@@ -100,7 +100,7 @@ public void testCheckinAfterRename() throws Exception {
checkoutRepoInto(checkedOutRepo, scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaulGitConfig(checkedOutRepo);
+ GitScmTestUtils.setDefaultGitConfig(checkedOutRepo);
// Creating foo/bar/wine.xml
File fooDir = new File(checkedOutRepo.getAbsolutePath(), "foo");
@@ -154,7 +154,7 @@ public void testCheckinWithFileSet() throws Exception {
checkoutRepoInto(checkedOutRepo, scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaulGitConfig(checkedOutRepo);
+ GitScmTestUtils.setDefaultGitConfig(checkedOutRepo);
// Creating beer.xml and whiskey.xml
File beerFile = new File(checkedOutRepo.getAbsolutePath(), "beer.xml");
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/checkout/GitExeSshCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeSshCheckOutCommandTckTest.java
index d8dda5353..c2716ff0c 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeSshCheckOutCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitExeSshCheckOutCommandTckTest.java
@@ -18,26 +18,16 @@
*/
package org.apache.maven.scm.provider.git.gitexe.command.checkout;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.security.GeneralSecurityException;
-import org.apache.commons.io.FilenameUtils;
import org.apache.maven.scm.provider.git.command.checkout.GitSshCheckOutCommandTckTest;
-import org.apache.maven.scm.provider.git.gitexe.GitExeScmProvider;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.apache.maven.scm.provider.git.gitexe.GitExeTestUtils;
import org.apache.maven.scm.repository.ScmRepository;
/**
*
*/
public class GitExeSshCheckOutCommandTckTest extends GitSshCheckOutCommandTckTest {
- private Path knownHostsFile;
-
- public static final String VARIABLE_GIT_SSH_COMMAND =
- "GIT_SSH_COMMAND"; // https://git-scm.com/docs/git#Documentation/git.txt-codeGITSSHCOMMANDcode, requires git
- // 2.3.0 or newer
-
public GitExeSshCheckOutCommandTckTest() throws GeneralSecurityException {
super();
}
@@ -50,18 +40,6 @@ protected String getScmProvider() {
@Override
public void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
super.configureCredentials(repository, passphrase);
- GitScmProviderRepository providerRepository = (GitScmProviderRepository) repository.getProviderRepository();
- GitExeScmProvider provider = (GitExeScmProvider) getScmManager().getProviderByRepository(getScmRepository());
- knownHostsFile = Files.createTempFile("known-hosts", null);
- provider.setEnvironmentVariable(
- VARIABLE_GIT_SSH_COMMAND,
- "ssh -o UserKnownHostsFile=" + knownHostsFile + " -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i "
- + FilenameUtils.separatorsToUnix(providerRepository.getPrivateKey()));
- }
-
- @Override
- public void removeRepo() throws Exception {
- super.removeRepo();
- Files.deleteIfExists(knownHostsFile);
+ GitExeTestUtils.configureLenientSshAuthentication(getScmManager(), repository);
}
}
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/remove/GitExeRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
index eec858a2c..4cbfd059d 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
@@ -38,7 +38,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
}
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/remove/GitExeRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitExeSshTagCommandTckTest.java
similarity index 53%
copy from maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitExeSshTagCommandTckTest.java
index eec858a2c..386447196 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitExeSshTagCommandTckTest.java
@@ -16,29 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.scm.provider.git.gitexe.command.remove;
+package org.apache.maven.scm.provider.git.gitexe.command.tag;
-import java.io.File;
+import java.security.GeneralSecurityException;
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.provider.git.command.remove.GitRemoveCommandTckTest;
+import org.apache.maven.scm.provider.git.command.tag.GitSshTagCommandTckTest;
+import org.apache.maven.scm.provider.git.gitexe.GitExeTestUtils;
import org.apache.maven.scm.repository.ScmRepository;
-import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE;
+/**
+ *
+ */
+public class GitExeSshTagCommandTckTest extends GitSshTagCommandTckTest {
+
+ public GitExeSshTagCommandTckTest() throws GeneralSecurityException {
+ super();
+ }
-public class GitExeRemoveCommandTckTest extends GitRemoveCommandTckTest {
@Override
- public String getScmProviderCommand() {
- return GIT_COMMAND_LINE;
+ protected String getScmProvider() {
+ return "git";
}
@Override
- protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
- try {
- return super.checkOut(workingDirectory, repository);
- } finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
- }
+ protected void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
+ super.configureCredentials(repository, passphrase);
+ GitExeTestUtils.configureLenientSshAuthentication(getScmManager(), repository);
}
}
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/remove/GitExeRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitExeSshUntagCommandTckTest.java
similarity index 53%
copy from maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitExeSshUntagCommandTckTest.java
index eec858a2c..4d5b5f2bb 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitExeRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/test/java/org/apache/maven/scm/provider/git/gitexe/command/untag/GitExeSshUntagCommandTckTest.java
@@ -16,29 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.scm.provider.git.gitexe.command.remove;
+package org.apache.maven.scm.provider.git.gitexe.command.untag;
-import java.io.File;
+import java.security.GeneralSecurityException;
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.provider.git.command.remove.GitRemoveCommandTckTest;
+import org.apache.maven.scm.provider.git.command.untag.GitSshUntagCommandTckTest;
+import org.apache.maven.scm.provider.git.gitexe.GitExeTestUtils;
import org.apache.maven.scm.repository.ScmRepository;
-import static org.apache.maven.scm.provider.git.GitScmTestUtils.GIT_COMMAND_LINE;
+/**
+ *
+ */
+public class GitExeSshUntagCommandTckTest extends GitSshUntagCommandTckTest {
+
+ public GitExeSshUntagCommandTckTest() throws GeneralSecurityException {
+ super();
+ }
-public class GitExeRemoveCommandTckTest extends GitRemoveCommandTckTest {
@Override
- public String getScmProviderCommand() {
- return GIT_COMMAND_LINE;
+ protected String getScmProvider() {
+ return "git";
}
@Override
- protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
- try {
- return super.checkOut(workingDirectory, repository);
- } finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
- }
+ public void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
+ super.configureCredentials(repository, passphrase);
+ GitExeTestUtils.configureLenientSshAuthentication(getScmManager(), repository);
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
index 7821bc913..a22c80122 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
@@ -32,6 +32,7 @@
<description>Tests library for SCM Git Provider.</description>
<properties>
+ <!-- newer versions clash with Sshd dependencies from JGit 5.x-->
<minaSshdVersion>2.11.0</minaSshdVersion>
</properties>
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 b04345747..2a4ce35e4 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
@@ -87,7 +87,7 @@ public static void deleteAllDirectories(File startDirectory, String pattern) thr
}
}
- public static void setDefaulGitConfig(File repositoryRootFile) {
+ public static void setDefaultGitConfig(File repositoryRootFile) {
File gitConfigFile = new File(new File(repositoryRootFile, ".git"), "config");
try (FileWriter fw = new FileWriter(gitConfigFile, true)) {
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitSshServer.java
similarity index 61%
copy from maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitSshServer.java
index bdc65625c..bbf64f5db 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/GitSshServer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.scm.provider.git.command.checkout;
+package org.apache.maven.scm.provider.git;
import java.io.IOException;
import java.io.OutputStream;
@@ -31,15 +31,11 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
-import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
+import org.apache.maven.scm.provider.git.sshd.git.pack.GitPackCommandFactory;
import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyEncryptionContext;
import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyPairResourceWriter;
import org.apache.sshd.git.GitLocationResolver;
-import org.apache.sshd.git.pack.GitPackCommandFactory;
import org.apache.sshd.server.SshServer;
import org.apache.sshd.server.auth.pubkey.KeySetPublickeyAuthenticator;
import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
@@ -50,23 +46,23 @@
import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
import org.bouncycastle.openssl.jcajce.JcaPKCS8Generator;
import org.bouncycastle.util.io.pem.PemObject;
-import org.junit.Assume;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
/**
- *
+ * Local Git SSH server for testing purposes.
+ * It acts on top of an existing repository root directory.
+ * It uses <a href="https://mina.apache.org/sshd-project/">Apache MINA SSHD</a> for the SSH server implementation.
+ * <p>
+ * The server generates a key pair during initialization and accepts connections using the private key which can be
+ * extracted via {@link GitSshServer#writePrivateKeyAsPkcs8(Path, String)}.
+ * Alternatively one may use a custom key pair and add the public key using {@link GitSshServer#addPublicKey(PublicKey)}.
*/
-public abstract class GitSshCheckOutCommandTckTest extends CheckOutCommandTckTest {
+public class GitSshServer {
+
protected final SshServer sshServer;
protected final KeyPair keyPair;
protected final List<PublicKey> acceptedPublicKeys;
- @Rule
- public TemporaryFolder tmpDirectory = new TemporaryFolder();
-
- protected GitSshCheckOutCommandTckTest() throws GeneralSecurityException {
+ public GitSshServer() throws GeneralSecurityException {
sshServer = CoreTestSupportUtils.setupTestServer(getClass());
keyPair = CommonTestSupportUtils.generateKeyPair(KeyUtils.RSA_ALGORITHM, 2048);
acceptedPublicKeys = new ArrayList<>();
@@ -75,7 +71,18 @@ protected GitSshCheckOutCommandTckTest() throws GeneralSecurityException {
sshServer.setPublickeyAuthenticator(authenticator);
}
- void writePrivateKeyAsPkcs8(Path file, String passphrase) throws IOException, GeneralSecurityException {
+ /**
+ * Writes a private key which is accepted by this server to the specified file in PKCS8 format.
+ * If a passphrase is provided, the key will be encrypted using OpenSSH's format.
+ * If no passphrase is provided, the key will be written as an unencrypted PKCS8 private key.
+ * For the same server instance the private key is always the same, so it can be reused.
+ *
+ * @param file the file to write the private key to
+ * @param passphrase the passphrase for encryption, or null for unencrypted
+ * @throws IOException if an I/O error occurs
+ * @throws GeneralSecurityException if a security error occurs
+ */
+ public void writePrivateKeyAsPkcs8(Path file, String passphrase) throws IOException, GeneralSecurityException {
// encryption only optional
if (passphrase != null) {
// encryption with format outlined in https://dnaeon.github.io/openssh-private-key-binary-format/
@@ -103,60 +110,34 @@ void writePrivateKeyAsPkcs8(Path file, String passphrase) throws IOException, Ge
}
}
- protected abstract String getScmProvider();
-
- /** {@inheritDoc} */
- public String getScmUrl() throws Exception {
- return "scm:" + getScmProvider() + ":ssh://localhost:" + sshServer.getPort() + "/repository";
+ public void addPublicKey(PublicKey publicKey) {
+ if (publicKey == null) {
+ throw new IllegalArgumentException("Public key must not be null");
+ }
+ acceptedPublicKeys.add(publicKey);
}
- public void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
- ScmProviderRepositoryWithHost providerRepository =
- ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository());
- // store as file
- Path privateKeyFile = tmpDirectory.newFile().toPath();
- writePrivateKeyAsPkcs8(privateKeyFile, passphrase);
- providerRepository.setPrivateKey(privateKeyFile.toString());
- providerRepository.setPassphrase(passphrase); // may be null
+ public int getPort() {
+ if (!sshServer.isStarted()) {
+ throw new IllegalStateException("SSH server is not started");
+ }
+ return sshServer.getPort();
}
- /** {@inheritDoc} */
- public void initRepo() throws Exception {
- GitScmTestUtils.initRepo("src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory());
-
+ public void start(Path repositoryRoot) throws IOException {
GitLocationResolver gitLocationResolver = new GitLocationResolver() {
@Override
public Path resolveRootDirectory(String command, String[] args, ServerSession session, FileSystem fs)
throws IOException {
- return getRepositoryRoot().getParentFile().toPath();
+ return repositoryRoot;
}
};
+ // use patched version of GitPackCommandFactory including https://github.com/apache/mina-sshd/pull/794
sshServer.setCommandFactory(new GitPackCommandFactory(gitLocationResolver));
sshServer.start();
-
- // as checkout also already happens in setup() make sure to configure credentials here as well
- configureCredentials(getScmRepository(), null);
}
- @Override
- public void removeRepo() throws Exception {
+ public void stop() throws IOException {
sshServer.stop();
- super.removeRepo();
- }
-
- @Override
- @Test
- public void testCheckOutCommandTest() throws Exception {
- configureCredentials(getScmRepository(), null);
- super.testCheckOutCommandTest();
- }
-
- @Test
- public void testCheckOutCommandWithPassphraseTest() throws Exception {
- // TODO: currently no easy way to pass passphrase in gitexe
- Assume.assumeTrue(
- "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider()));
- configureCredentials(getScmRepository(), "mySecret");
- super.testCheckOutCommandTest();
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java
index 717648aac..51e91303d 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/blame/GitBlameCommandTckTest.java
@@ -39,7 +39,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
index 4aa66bb0b..0dd33b0ec 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
@@ -40,7 +40,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitSshBranchCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitSshBranchCommandTckTest.java
new file mode 100644
index 000000000..60c90170d
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitSshBranchCommandTckTest.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.command.branch;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+
+import org.apache.maven.scm.command.checkout.CheckOutScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
+import org.apache.maven.scm.provider.git.GitScmTestUtils;
+import org.apache.maven.scm.provider.git.GitSshServer;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.tck.command.branch.BranchCommandTckTest;
+import org.junit.Assume;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+/**
+ *
+ */
+public abstract class GitSshBranchCommandTckTest extends BranchCommandTckTest {
+ protected final GitSshServer gitSshServer;
+
+ @Rule
+ public TemporaryFolder tmpDirectory = new TemporaryFolder();
+
+ protected GitSshBranchCommandTckTest() throws GeneralSecurityException {
+ gitSshServer = new GitSshServer();
+ }
+
+ protected abstract String getScmProvider();
+
+ /** {@inheritDoc} */
+ public String getScmUrl() throws Exception {
+ return "scm:" + getScmProvider() + ":ssh://localhost:" + gitSshServer.getPort() + "/repository";
+ }
+
+ public void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
+ ScmProviderRepositoryWithHost providerRepository =
+ ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository());
+ // store as file
+ Path privateKeyFile = tmpDirectory.newFile().toPath();
+ gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase);
+ providerRepository.setPrivateKey(privateKeyFile.toString());
+ providerRepository.setPassphrase(passphrase); // may be null
+ }
+
+ /** {@inheritDoc} */
+ public void initRepo() throws Exception {
+ GitScmTestUtils.initRepo("src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory());
+ gitSshServer.start(getRepositoryRoot().getParentFile().toPath());
+
+ // as checkout also already happens in setup() make sure to configure credentials here as well
+ configureCredentials(getScmRepository(), null);
+ }
+
+ @Override
+ public void removeRepo() throws Exception {
+ gitSshServer.stop();
+ super.removeRepo();
+ }
+
+ @Override
+ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
+ try {
+ return super.checkOut(workingDirectory, repository);
+ } finally {
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
+ }
+ }
+
+ @Test
+ public void testBranchCommandTestWithPush() throws Exception {
+ configureCredentials(getScmRepository(), null);
+ getScmRepository().getProviderRepository().setPushChanges(true);
+ super.testBranchCommandTest();
+ }
+
+ @Test
+ public void testBranchCommandWithPassphraseAndPushTest() throws Exception {
+ // TODO: currently no easy way to pass passphrase in gitexe
+ Assume.assumeTrue(
+ "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider()));
+ configureCredentials(getScmRepository(), "mySecret");
+ getScmRepository().getProviderRepository().setPushChanges(true);
+ super.testBranchCommandTest();
+ }
+}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
index 1bd8ad882..3575b2344 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/changelog/GitChangeLogCommandTckTest.java
@@ -56,7 +56,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
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 db1aa3410..d177172f0 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
@@ -51,7 +51,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
@@ -63,7 +63,7 @@ public void testUpToDatePush() throws Exception {
checkoutRepoInto(checkedOutRepo, scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaulGitConfig(checkedOutRepo);
+ GitScmTestUtils.setDefaultGitConfig(checkedOutRepo);
CheckInScmResult result =
getScmManager().checkIn(scmRepository, new ScmFileSet(checkedOutRepo), "No change commit message");
@@ -81,8 +81,8 @@ public void testRejectedNonFastForwardPush() throws Exception {
checkoutRepoInto(blockingRepo, scmRepository);
// Add a default user to the config
- GitScmTestUtils.setDefaulGitConfig(rejectedRepo);
- GitScmTestUtils.setDefaulGitConfig(blockingRepo);
+ GitScmTestUtils.setDefaultGitConfig(rejectedRepo);
+ GitScmTestUtils.setDefaultGitConfig(blockingRepo);
ScmFileSet blockingFileSet = createWorkspaceChange(rejectedRepo);
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java
index bdc65625c..9b262de91 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitSshCheckOutCommandTckTest.java
@@ -18,38 +18,14 @@
*/
package org.apache.maven.scm.provider.git.command.checkout;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.Writer;
-import java.nio.file.FileSystem;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermissions;
import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.PublicKey;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
import org.apache.maven.scm.provider.git.GitScmTestUtils;
+import org.apache.maven.scm.provider.git.GitSshServer;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
-import org.apache.sshd.common.config.keys.KeyUtils;
-import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyEncryptionContext;
-import org.apache.sshd.common.config.keys.writer.openssh.OpenSSHKeyPairResourceWriter;
-import org.apache.sshd.git.GitLocationResolver;
-import org.apache.sshd.git.pack.GitPackCommandFactory;
-import org.apache.sshd.server.SshServer;
-import org.apache.sshd.server.auth.pubkey.KeySetPublickeyAuthenticator;
-import org.apache.sshd.server.auth.pubkey.PublickeyAuthenticator;
-import org.apache.sshd.server.session.ServerSession;
-import org.apache.sshd.util.test.CommonTestSupportUtils;
-import org.apache.sshd.util.test.CoreTestSupportUtils;
-import org.bouncycastle.openssl.PKCS8Generator;
-import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
-import org.bouncycastle.openssl.jcajce.JcaPKCS8Generator;
-import org.bouncycastle.util.io.pem.PemObject;
import org.junit.Assume;
import org.junit.Rule;
import org.junit.Test;
@@ -59,63 +35,28 @@
*
*/
public abstract class GitSshCheckOutCommandTckTest extends CheckOutCommandTckTest {
- protected final SshServer sshServer;
- protected final KeyPair keyPair;
- protected final List<PublicKey> acceptedPublicKeys;
+ protected final GitSshServer gitSshServer;
@Rule
public TemporaryFolder tmpDirectory = new TemporaryFolder();
protected GitSshCheckOutCommandTckTest() throws GeneralSecurityException {
- sshServer = CoreTestSupportUtils.setupTestServer(getClass());
- keyPair = CommonTestSupportUtils.generateKeyPair(KeyUtils.RSA_ALGORITHM, 2048);
- acceptedPublicKeys = new ArrayList<>();
- acceptedPublicKeys.add(keyPair.getPublic());
- PublickeyAuthenticator authenticator = new KeySetPublickeyAuthenticator("onlykey", acceptedPublicKeys);
- sshServer.setPublickeyAuthenticator(authenticator);
- }
-
- void writePrivateKeyAsPkcs8(Path file, String passphrase) throws IOException, GeneralSecurityException {
- // encryption only optional
- if (passphrase != null) {
- // encryption with format outlined in https://dnaeon.github.io/openssh-private-key-binary-format/
- OpenSSHKeyPairResourceWriter writer = new OpenSSHKeyPairResourceWriter();
- OpenSSHKeyEncryptionContext context = new OpenSSHKeyEncryptionContext();
- context.setCipherType("192");
- context.setPassword(passphrase);
- try (OutputStream output = Files.newOutputStream(file)) {
- writer.writePrivateKey(keyPair, "comment", context, output);
- }
- } else {
- // wrap unencrypted private key as regular PKCS8 private key
- PKCS8Generator pkcs8Generator = new JcaPKCS8Generator(keyPair.getPrivate(), null);
- PemObject pemObject = pkcs8Generator.generate();
-
- try (Writer writer = Files.newBufferedWriter(file);
- JcaPEMWriter pw = new JcaPEMWriter(writer)) {
- pw.writeObject(pemObject);
- }
- }
-
- if (file.getFileSystem().supportedFileAttributeViews().contains("posix")) {
- // must only be readable/writeable by me
- Files.setPosixFilePermissions(file, PosixFilePermissions.fromString("rwx------"));
- }
+ gitSshServer = new GitSshServer();
}
protected abstract String getScmProvider();
/** {@inheritDoc} */
public String getScmUrl() throws Exception {
- return "scm:" + getScmProvider() + ":ssh://localhost:" + sshServer.getPort() + "/repository";
+ return "scm:" + getScmProvider() + ":ssh://localhost:" + gitSshServer.getPort() + "/repository";
}
- public void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
+ protected void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
ScmProviderRepositoryWithHost providerRepository =
ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository());
// store as file
Path privateKeyFile = tmpDirectory.newFile().toPath();
- writePrivateKeyAsPkcs8(privateKeyFile, passphrase);
+ gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase);
providerRepository.setPrivateKey(privateKeyFile.toString());
providerRepository.setPassphrase(passphrase); // may be null
}
@@ -123,16 +64,7 @@ public void configureCredentials(ScmRepository repository, String passphrase) th
/** {@inheritDoc} */
public void initRepo() throws Exception {
GitScmTestUtils.initRepo("src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory());
-
- GitLocationResolver gitLocationResolver = new GitLocationResolver() {
- @Override
- public Path resolveRootDirectory(String command, String[] args, ServerSession session, FileSystem fs)
- throws IOException {
- return getRepositoryRoot().getParentFile().toPath();
- }
- };
- sshServer.setCommandFactory(new GitPackCommandFactory(gitLocationResolver));
- sshServer.start();
+ gitSshServer.start(getRepositoryRoot().getParentFile().toPath());
// as checkout also already happens in setup() make sure to configure credentials here as well
configureCredentials(getScmRepository(), null);
@@ -140,7 +72,7 @@ public Path resolveRootDirectory(String command, String[] args, ServerSession se
@Override
public void removeRepo() throws Exception {
- sshServer.stop();
+ gitSshServer.stop();
super.removeRepo();
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
index 74ca62852..539c2ed88 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
@@ -40,7 +40,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitSshTagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitSshTagCommandTckTest.java
new file mode 100644
index 000000000..eb7e60061
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitSshTagCommandTckTest.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.command.tag;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+
+import org.apache.maven.scm.command.checkout.CheckOutScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
+import org.apache.maven.scm.provider.git.GitScmTestUtils;
+import org.apache.maven.scm.provider.git.GitSshServer;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.tck.command.tag.TagCommandTckTest;
+import org.junit.Assume;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+/**
+ *
+ */
+public abstract class GitSshTagCommandTckTest extends TagCommandTckTest {
+ protected final GitSshServer gitSshServer;
+
+ @Rule
+ public TemporaryFolder tmpDirectory = new TemporaryFolder();
+
+ protected GitSshTagCommandTckTest() throws GeneralSecurityException {
+ gitSshServer = new GitSshServer();
+ }
+
+ protected abstract String getScmProvider();
+
+ /** {@inheritDoc} */
+ public String getScmUrl() throws Exception {
+ return "scm:" + getScmProvider() + ":ssh://localhost:" + gitSshServer.getPort() + "/repository";
+ }
+
+ /** Sets up repository credentials for SSH access. */
+ protected void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
+ ScmProviderRepositoryWithHost providerRepository =
+ ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository());
+ // store as file
+ Path privateKeyFile = tmpDirectory.newFile().toPath();
+ gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase);
+ providerRepository.setPrivateKey(privateKeyFile.toString());
+ providerRepository.setPassphrase(passphrase); // may be null
+ }
+
+ /** {@inheritDoc} */
+ public void initRepo() throws Exception {
+ GitScmTestUtils.initRepo("src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory());
+ gitSshServer.start(getRepositoryRoot().getParentFile().toPath());
+
+ // as checkout also already happens in setup() make sure to configure credentials here as well
+ configureCredentials(getScmRepository(), null);
+ }
+
+ @Override
+ public void removeRepo() throws Exception {
+ gitSshServer.stop();
+ super.removeRepo();
+ }
+
+ @Override
+ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
+ try {
+ return super.checkOut(workingDirectory, repository);
+ } finally {
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
+ }
+ }
+
+ @Test
+ public void testTagCommandTestWithPush() throws Exception {
+ configureCredentials(getScmRepository(), null);
+ getScmRepository().getProviderRepository().setPushChanges(true);
+ super.testTagCommandTest();
+ }
+
+ @Test
+ public void testTagCommandWithPassphraseAndPushTest() throws Exception {
+ // TODO: currently no easy way to pass passphrase in gitexe
+ Assume.assumeTrue(
+ "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider()));
+ configureCredentials(getScmRepository(), "mySecret");
+ getScmRepository().getProviderRepository().setPushChanges(true);
+ super.testTagCommandTest();
+ }
+}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
index e89a14de4..21640a5f9 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
@@ -40,7 +40,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitSshUntagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitSshUntagCommandTckTest.java
new file mode 100644
index 000000000..cbc9399f3
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitSshUntagCommandTckTest.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.command.untag;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+
+import org.apache.maven.scm.command.checkout.CheckOutScmResult;
+import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
+import org.apache.maven.scm.provider.git.GitScmTestUtils;
+import org.apache.maven.scm.provider.git.GitSshServer;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.tck.command.untag.UntagCommandTckTest;
+import org.junit.Assume;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+/**
+ *
+ */
+public abstract class GitSshUntagCommandTckTest extends UntagCommandTckTest {
+ protected final GitSshServer gitSshServer;
+
+ @Rule
+ public TemporaryFolder tmpDirectory = new TemporaryFolder();
+
+ protected GitSshUntagCommandTckTest() throws GeneralSecurityException {
+ gitSshServer = new GitSshServer();
+ }
+
+ protected abstract String getScmProvider();
+
+ /** {@inheritDoc} */
+ public String getScmUrl() throws Exception {
+ return "scm:" + getScmProvider() + ":ssh://localhost:" + gitSshServer.getPort() + "/repository";
+ }
+
+ protected void configureCredentials(ScmRepository repository, String passphrase) throws Exception {
+ ScmProviderRepositoryWithHost providerRepository =
+ ScmProviderRepositoryWithHost.class.cast(repository.getProviderRepository());
+ // store as file
+ Path privateKeyFile = tmpDirectory.newFile().toPath();
+ gitSshServer.writePrivateKeyAsPkcs8(privateKeyFile, passphrase);
+ providerRepository.setPrivateKey(privateKeyFile.toString());
+ providerRepository.setPassphrase(passphrase); // may be null
+ }
+
+ /** {@inheritDoc} */
+ public void initRepo() throws Exception {
+ GitScmTestUtils.initRepo("src/test/resources/repository/", getRepositoryRoot(), getWorkingDirectory());
+ gitSshServer.start(getRepositoryRoot().getParentFile().toPath());
+
+ // as checkout also already happens in setup() make sure to configure credentials here as well
+ configureCredentials(getScmRepository(), null);
+ }
+
+ @Override
+ public void removeRepo() throws Exception {
+ gitSshServer.stop();
+ super.removeRepo();
+ }
+
+ @Override
+ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
+ try {
+ return super.checkOut(workingDirectory, repository);
+ } finally {
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
+ }
+ }
+
+ @Test
+ public void testUntagCommandTestWithPush() throws Exception {
+ configureCredentials(getScmRepository(), null);
+ getScmRepository().getProviderRepository().setPushChanges(true);
+ super.testUntagCommandTest();
+ }
+
+ @Test
+ public void testUntagCommandWithPassphraseAndPushTest() throws Exception {
+ // TODO: currently no easy way to pass passphrase in gitexe
+ Assume.assumeTrue(
+ "Ignore test with passphrase for provider " + getScmProvider(), "jgit".equals(getScmProvider()));
+ configureCredentials(getScmRepository(), "mySecret");
+ getScmRepository().getProviderRepository().setPushChanges(true);
+ super.testUntagCommandTest();
+ }
+}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java
index 7a8fa62a6..652460cb2 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/untag/GitUntagCommandTckTest.java
@@ -37,7 +37,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
index 3fa520491..58d5eb3ca 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
@@ -40,7 +40,7 @@ protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository reposi
try {
return super.checkOut(workingDirectory, repository);
} finally {
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
}
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommand.java
new file mode 100644
index 000000000..e702e9eb1
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommand.java
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.sshd.git.pack;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+import org.apache.sshd.common.util.GenericUtils;
+import org.apache.sshd.common.util.ValidateUtils;
+import org.apache.sshd.common.util.threads.CloseableExecutorService;
+import org.apache.sshd.git.AbstractGitCommand;
+import org.apache.sshd.git.GitLocationResolver;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.RepositoryCache;
+import org.eclipse.jgit.transport.ReceivePack;
+import org.eclipse.jgit.transport.RemoteConfig;
+import org.eclipse.jgit.transport.UploadPack;
+import org.eclipse.jgit.util.FS;
+
+/**
+ * TODO Add javadoc
+ *
+ * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
+ */
+public class GitPackCommand extends AbstractGitCommand {
+ /**
+ * @param rootDirResolver Resolver for GIT root directory
+ * @param command Command to execute
+ * @param executorService An {@link CloseableExecutorService} to be used when
+ * {@code start(ChannelSession, Environment)}-ing execution. If {@code null} an ad-hoc
+ * single-threaded service is created and used.
+ */
+ public GitPackCommand(
+ GitLocationResolver rootDirResolver, String command, CloseableExecutorService executorService) {
+ super(rootDirResolver, command, executorService);
+ }
+
+ @Override
+ public void run() {
+ String command = getCommand();
+ try {
+ List<String> strs = parseDelimitedString(command, " ", true);
+ String[] args = strs.toArray(new String[strs.size()]);
+ for (int i = 0; i < args.length; i++) {
+ String argVal = args[i];
+ if (argVal.startsWith("'") && argVal.endsWith("'")) {
+ args[i] = argVal.substring(1, argVal.length() - 1);
+ argVal = args[i];
+ }
+ if (argVal.startsWith("\"") && argVal.endsWith("\"")) {
+ args[i] = argVal.substring(1, argVal.length() - 1);
+ }
+ }
+
+ if (args.length != 2) {
+ throw new IllegalArgumentException("Invalid git command line (no arguments): " + command);
+ }
+
+ Path rootDir = resolveRootDirectory(command, args);
+ RepositoryCache.FileKey key = RepositoryCache.FileKey.lenient(rootDir.toFile(), FS.DETECTED);
+ try (Repository db = key.open(true /* must exist */)) {
+ String subCommand = args[0];
+ if (RemoteConfig.DEFAULT_UPLOAD_PACK.equals(subCommand)) {
+ new UploadPack(db).upload(getInputStream(), getOutputStream(), getErrorStream());
+ } else if (RemoteConfig.DEFAULT_RECEIVE_PACK.equals(subCommand)) {
+ new ReceivePack(db).receive(getInputStream(), getOutputStream(), getErrorStream());
+ } else {
+ throw new IllegalArgumentException("Unknown git command: " + command);
+ }
+ }
+ onExit(0);
+ } catch (Throwable t) {
+ onExit(-1, t.getClass().getSimpleName());
+ }
+ }
+
+ protected Path resolveRootDirectory(String command, String[] args) throws IOException {
+ GitLocationResolver resolver = getGitLocationResolver();
+ Path rootDir = resolver.resolveRootDirectory(command, args, getServerSession(), getFileSystem());
+ ValidateUtils.checkState(rootDir != null, "No root directory provided for %s command", command);
+
+ String pathArg = args[1];
+ int len = GenericUtils.length(pathArg);
+ // Strip any leading path separator since we use relative to root
+ if ((len > 0) && (pathArg.charAt(0) == '/')) {
+ pathArg = pathArg.substring(1);
+ }
+
+ ValidateUtils.checkNotNullAndNotEmpty(pathArg, "No %s command sub-path specified", args[0]);
+ return rootDir.resolve(pathArg);
+ }
+}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommandFactory.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommandFactory.java
new file mode 100644
index 000000000..292d98386
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/GitPackCommandFactory.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.sshd.git.pack;
+
+import java.util.function.Supplier;
+
+import org.apache.sshd.common.util.threads.CloseableExecutorService;
+import org.apache.sshd.git.AbstractGitCommandFactory;
+import org.apache.sshd.git.GitLocationResolver;
+import org.apache.sshd.server.command.CommandFactory;
+
+/**
+ * TODO Add javadoc
+ *
+ * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
+ */
+public class GitPackCommandFactory extends AbstractGitCommandFactory {
+ public static final String GIT_FACTORY_NAME = "git-pack";
+ public static final String GIT_COMMAND_PREFIX = "git-";
+
+ public GitPackCommandFactory() {
+ this(null);
+ }
+
+ public GitPackCommandFactory(GitLocationResolver resolver) {
+ super(GIT_FACTORY_NAME, GIT_COMMAND_PREFIX);
+ withGitLocationResolver(resolver);
+ }
+
+ @Override
+ public GitPackCommandFactory withDelegate(CommandFactory delegate) {
+ return (GitPackCommandFactory) super.withDelegate(delegate);
+ }
+
+ @Override
+ public GitPackCommandFactory withGitLocationResolver(GitLocationResolver rootDirResolver) {
+ return (GitPackCommandFactory) super.withGitLocationResolver(rootDirResolver);
+ }
+
+ @Override
+ public GitPackCommandFactory withExecutorServiceProvider(Supplier<? extends CloseableExecutorService> provider) {
+ return (GitPackCommandFactory) super.withExecutorServiceProvider(provider);
+ }
+
+ @Override
+ public GitPackCommand createGitCommand(String command) {
+ return new GitPackCommand(getGitLocationResolver(), command, resolveExecutorService(command));
+ }
+}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/README.txt b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/README.txt
new file mode 100644
index 000000000..1a27a1ac0
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/sshd/git/pack/README.txt
@@ -0,0 +1,5 @@
+This is just a minimum fork of https://github.com/apache/mina-sshd/tree/sshd-2.11.0/sshd-git/src/main/java/org/apache/sshd/git/pack
+to include the patch https://github.com/apache/mina-sshd/pull/794.
+
+Otherwise the SSH server cannot be used on Windows as it leaves files open.
+TODO: Remove once a Mina SSHD release is available that includes this patch.
\ 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/CustomizableSshSessionFactoryCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/CustomizableSshSessionFactoryCommand.java
new file mode 100644
index 000000000..c7d16826e
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/CustomizableSshSessionFactoryCommand.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.jgit.command;
+
+import java.util.function.BiFunction;
+
+import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.slf4j.Logger;
+
+/**
+ * Supplemental interface for commands that potentially involve a remote server communication.
+ * It allows to customize the SSH session factory being used.
+ */
+public interface CustomizableSshSessionFactoryCommand {
+
+ /**
+ * Sets a different supplier for the SSH session factory that will be used by this command.
+ * By default it uses {@link ScmProviderAwareSshdSessionFactory}.
+ *
+ * @param sshSessionFactorySupplier a function that takes a GitScmProviderRepository and Logger and returns a ScmProviderAwareSshdSessionFactory
+ */
+ void setSshSessionFactorySupplier(
+ BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier);
+}
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/JGitUtils.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java
index fdf2ef043..deac415fa 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitUtils.java
@@ -25,6 +25,7 @@
import java.util.Date;
import java.util.HashSet;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
@@ -38,9 +39,8 @@
import org.eclipse.jgit.api.PushCommand;
import org.eclipse.jgit.api.RmCommand;
import org.eclipse.jgit.api.Status;
+import org.eclipse.jgit.api.TransportConfigCallback;
import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.api.errors.InvalidRemoteException;
-import org.eclipse.jgit.api.errors.TransportException;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.diff.DiffFormatter;
@@ -162,14 +162,15 @@ public static CredentialsProvider getCredentials(GitScmProviderRepository reposi
return null;
}
- public static Iterable<PushResult> push(Git git, GitScmProviderRepository repo, RefSpec refSpec)
- throws GitAPIException, InvalidRemoteException, TransportException {
+ public static Iterable<PushResult> push(
+ Git git,
+ GitScmProviderRepository repo,
+ RefSpec refSpec,
+ Optional<TransportConfigCallback> transportConfigCallback)
+ throws GitAPIException {
CredentialsProvider credentials = prepareSession(git, repo);
- PushCommand command = git.push()
- .setRefSpecs(refSpec)
- .setCredentialsProvider(credentials)
- .setTransportConfigCallback(
- new JGitTransportConfigCallback(new ScmProviderAwareSshdSessionFactory(repo, LOGGER)));
+ PushCommand command = git.push().setRefSpecs(refSpec).setCredentialsProvider(credentials);
+ transportConfigCallback.ifPresent(command::setTransportConfigCallback);
Iterable<PushResult> pushResultList = command.call();
for (PushResult pushResult : pushResultList) {
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/branch/JGitBranchCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java
index 8f1c65448..05ad6986c 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitBranchCommand.java
@@ -22,7 +22,9 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
+import java.util.function.BiFunction;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -33,9 +35,13 @@
import org.apache.maven.scm.command.branch.BranchScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.command.GitCommand;
+import org.apache.maven.scm.provider.git.jgit.command.CustomizableSshSessionFactoryCommand;
+import org.apache.maven.scm.provider.git.jgit.command.JGitTransportConfigCallback;
import org.apache.maven.scm.provider.git.jgit.command.JGitUtils;
+import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.TransportConfigCallback;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
@@ -44,12 +50,27 @@
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.slf4j.Logger;
/**
* @author Dominik Bartholdi (imod)
* @since 1.9
*/
-public class JGitBranchCommand extends AbstractBranchCommand implements GitCommand {
+public class JGitBranchCommand extends AbstractBranchCommand
+ implements GitCommand, CustomizableSshSessionFactoryCommand {
+
+ private BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
+
+ public JGitBranchCommand() {
+ sshSessionFactorySupplier = ScmProviderAwareSshdSessionFactory::new;
+ }
+
+ @Override
+ public void setSshSessionFactorySupplier(
+ BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory>
+ sshSessionFactorySupplier) {
+ this.sshSessionFactorySupplier = sshSessionFactorySupplier;
+ }
/**
* {@inheritDoc}
@@ -77,7 +98,14 @@ protected ScmResult executeBranchCommand(
if (repo.isPushChanges()) {
logger.info("push branch [" + branch + "] to remote...");
- JGitUtils.push(git, (GitScmProviderRepository) repo, new RefSpec(Constants.R_HEADS + branch));
+ TransportConfigCallback transportConfigCallback = new JGitTransportConfigCallback(
+ sshSessionFactorySupplier.apply((GitScmProviderRepository) repo, logger));
+
+ JGitUtils.push(
+ git,
+ (GitScmProviderRepository) repo,
+ new RefSpec(Constants.R_HEADS + branch),
+ Optional.of(transportConfigCallback));
}
// search for the tagged files
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 02c57c855..5b5ae5930 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
@@ -23,7 +23,9 @@
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
+import java.util.function.BiFunction;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.scm.CommandParameter;
@@ -36,18 +38,23 @@
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.command.GitCommand;
+import org.apache.maven.scm.provider.git.jgit.command.CustomizableSshSessionFactoryCommand;
+import org.apache.maven.scm.provider.git.jgit.command.JGitTransportConfigCallback;
import org.apache.maven.scm.provider.git.jgit.command.JGitUtils;
+import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.eclipse.jgit.api.AddCommand;
import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.Status;
+import org.eclipse.jgit.api.TransportConfigCallback;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.UserConfig;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.RemoteRefUpdate;
+import org.slf4j.Logger;
/**
* This provider uses the following strategy to discover the committer and author name/mail for a commit:
@@ -66,7 +73,8 @@
* @author Dominik Bartholdi (imod)
* @since 1.9
*/
-public class JGitCheckInCommand extends AbstractCheckInCommand implements GitCommand {
+public class JGitCheckInCommand extends AbstractCheckInCommand
+ implements GitCommand, CustomizableSshSessionFactoryCommand {
protected static final String GIT_MAVEN_SECTION = "maven-scm";
@@ -74,6 +82,19 @@ public class JGitCheckInCommand extends AbstractCheckInCommand implements GitCom
protected static final String GIT_FORCE = "forceUsername";
+ private BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
+
+ public JGitCheckInCommand() {
+ sshSessionFactorySupplier = ScmProviderAwareSshdSessionFactory::new;
+ }
+
+ @Override
+ public void setSshSessionFactorySupplier(
+ BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory>
+ sshSessionFactorySupplier) {
+ this.sshSessionFactorySupplier = sshSessionFactorySupplier;
+ }
+
@Override
public CheckInScmResult executeCommand(ScmProviderRepository repo, ScmFileSet fileSet, CommandParameters parameters)
throws ScmException {
@@ -152,7 +173,11 @@ public CheckInScmResult executeCommand(ScmProviderRepository repo, ScmFileSet fi
}
RefSpec refSpec = new RefSpec(Constants.R_HEADS + branch + ":" + Constants.R_HEADS + branch);
logger.info("push changes to remote... " + refSpec);
- Iterable<PushResult> pushResultList = JGitUtils.push(git, (GitScmProviderRepository) repo, refSpec);
+ TransportConfigCallback transportConfigCallback = new JGitTransportConfigCallback(
+ sshSessionFactorySupplier.apply((GitScmProviderRepository) repo, logger));
+
+ Iterable<PushResult> pushResultList = JGitUtils.push(
+ git, (GitScmProviderRepository) repo, refSpec, Optional.of(transportConfigCallback));
for (PushResult pushResult : pushResultList) {
for (RemoteRefUpdate remoteRefUpdate : pushResult.getRemoteUpdates()) {
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/checkout/JGitCheckOutCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
index 2c745ff6c..e08419726 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
@@ -36,6 +36,7 @@
import org.apache.maven.scm.command.remoteinfo.RemoteInfoScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.command.GitCommand;
+import org.apache.maven.scm.provider.git.jgit.command.CustomizableSshSessionFactoryCommand;
import org.apache.maven.scm.provider.git.jgit.command.JGitTransportConfigCallback;
import org.apache.maven.scm.provider.git.jgit.command.JGitUtils;
import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
@@ -61,13 +62,15 @@
* @author Dominik Bartholdi (imod)
* @since 1.9
*/
-public class JGitCheckOutCommand extends AbstractCheckOutCommand implements GitCommand {
+public class JGitCheckOutCommand extends AbstractCheckOutCommand
+ implements GitCommand, CustomizableSshSessionFactoryCommand {
private BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
public JGitCheckOutCommand() {
sshSessionFactorySupplier = ScmProviderAwareSshdSessionFactory::new;
}
+ @Override
public void setSshSessionFactorySupplier(
BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory>
sshSessionFactorySupplier) {
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/tag/JGitTagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java
index 997716478..075ed4b32 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitTagCommand.java
@@ -20,6 +20,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
@@ -31,22 +33,40 @@
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.command.GitCommand;
+import org.apache.maven.scm.provider.git.jgit.command.CustomizableSshSessionFactoryCommand;
+import org.apache.maven.scm.provider.git.jgit.command.JGitTransportConfigCallback;
import org.apache.maven.scm.provider.git.jgit.command.JGitUtils;
+import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.TransportConfigCallback;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.slf4j.Logger;
/**
* @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
* @author Dominik Bartholdi (imod)
* @since 1.9
*/
-public class JGitTagCommand extends AbstractTagCommand implements GitCommand {
+public class JGitTagCommand extends AbstractTagCommand implements GitCommand, CustomizableSshSessionFactoryCommand {
+
+ private BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
+
+ public JGitTagCommand() {
+ sshSessionFactorySupplier = ScmProviderAwareSshdSessionFactory::new;
+ }
+
+ @Override
+ public void setSshSessionFactorySupplier(
+ BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory>
+ sshSessionFactorySupplier) {
+ this.sshSessionFactorySupplier = sshSessionFactorySupplier;
+ }
public ScmResult executeTagCommand(ScmProviderRepository repo, ScmFileSet fileSet, String tag, String message)
throws ScmException {
@@ -83,8 +103,15 @@ public ScmResult executeTagCommand(
.call();
if (repo.isPushChanges()) {
+ TransportConfigCallback transportConfigCallback = new JGitTransportConfigCallback(
+ sshSessionFactorySupplier.apply((GitScmProviderRepository) repo, logger));
+
logger.info("push tag [" + escapedTagName + "] to remote...");
- JGitUtils.push(git, (GitScmProviderRepository) repo, new RefSpec(Constants.R_TAGS + escapedTagName));
+ JGitUtils.push(
+ git,
+ (GitScmProviderRepository) repo,
+ new RefSpec(Constants.R_TAGS + escapedTagName),
+ Optional.of(transportConfigCallback));
}
// search for the tagged files
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/untag/JGitUntagCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java
index 6d54e6abb..6fea4bff3 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitUntagCommand.java
@@ -19,6 +19,8 @@
package org.apache.maven.scm.provider.git.jgit.command.untag;
import java.util.Collection;
+import java.util.Optional;
+import java.util.function.BiFunction;
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
@@ -28,16 +30,34 @@
import org.apache.maven.scm.command.untag.UntagScmResult;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.git.command.GitCommand;
+import org.apache.maven.scm.provider.git.jgit.command.CustomizableSshSessionFactoryCommand;
+import org.apache.maven.scm.provider.git.jgit.command.JGitTransportConfigCallback;
import org.apache.maven.scm.provider.git.jgit.command.JGitUtils;
+import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.TransportConfigCallback;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.RemoteRefUpdate;
+import org.slf4j.Logger;
/** {@inheritDoc} */
-public class JGitUntagCommand extends AbstractUntagCommand implements GitCommand {
+public class JGitUntagCommand extends AbstractUntagCommand implements GitCommand, CustomizableSshSessionFactoryCommand {
+
+ private BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
+
+ public JGitUntagCommand() {
+ sshSessionFactorySupplier = ScmProviderAwareSshdSessionFactory::new;
+ }
+
+ @Override
+ public void setSshSessionFactorySupplier(
+ BiFunction<GitScmProviderRepository, Logger, ScmProviderAwareSshdSessionFactory>
+ sshSessionFactorySupplier) {
+ this.sshSessionFactorySupplier = sshSessionFactorySupplier;
+ }
@Override
protected ScmResult executeUntagCommand(
@@ -62,10 +82,13 @@ protected ScmResult executeUntagCommand(
// From https://stackoverflow.com/q/11892766/696632
RefSpec refSpec = new RefSpec().setSource(null).setDestination(Constants.R_TAGS + escapedTagName);
+ TransportConfigCallback transportConfigCallback = new JGitTransportConfigCallback(
+ sshSessionFactorySupplier.apply((GitScmProviderRepository) repository, logger));
+
logger.info("push delete tag [" + escapedTagName + "] to remote...");
- Iterable<PushResult> pushResultList =
- JGitUtils.push(git, (GitScmProviderRepository) repository, refSpec);
+ Iterable<PushResult> pushResultList = JGitUtils.push(
+ git, (GitScmProviderRepository) repository, refSpec, Optional.of(transportConfigCallback));
if (logger.isInfoEnabled()) {
for (PushResult pushResult : pushResultList) {
Collection<RemoteRefUpdate> ru = pushResult.getRemoteUpdates();
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/AcceptAllHostsSshdSessionFactory.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/AcceptAllHostsSshdSessionFactory.java
new file mode 100644
index 000000000..35def7f58
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/AcceptAllHostsSshdSessionFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.scm.provider.git.jgit;
+
+import java.io.File;
+import java.net.InetSocketAddress;
+import java.security.PublicKey;
+
+import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
+import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.eclipse.jgit.annotations.NonNull;
+import org.eclipse.jgit.internal.transport.sshd.OpenSshServerKeyDatabase;
+import org.eclipse.jgit.transport.CredentialsProvider;
+import org.eclipse.jgit.transport.sshd.ServerKeyDatabase;
+import org.slf4j.Logger;
+
+public final class AcceptAllHostsSshdSessionFactory extends ScmProviderAwareSshdSessionFactory {
+ public AcceptAllHostsSshdSessionFactory(GitScmProviderRepository repo, Logger logger) {
+ super(repo, logger);
+ }
+
+ @Override
+ protected ServerKeyDatabase createServerKeyDatabase(File homeDir, File sshDir) {
+ return new OpenSshServerKeyDatabase(false, null) {
+ @Override
+ public boolean accept(
+ @NonNull String connectAddress,
+ @NonNull InetSocketAddress remoteAddress,
+ @NonNull PublicKey serverKey,
+ @NonNull Configuration config,
+ CredentialsProvider provider) {
+ return true;
+ }
+ };
+ }
+}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/JGitTestScmProvider.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/JGitTestScmProvider.java
index 2398123f5..5d387f3b7 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/JGitTestScmProvider.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/JGitTestScmProvider.java
@@ -27,9 +27,13 @@
import org.apache.maven.scm.provider.ScmProvider;
import org.apache.maven.scm.provider.git.command.GitCommand;
+import org.apache.maven.scm.provider.git.jgit.command.CustomizableSshSessionFactoryCommand;
+import org.apache.maven.scm.provider.git.jgit.command.branch.JGitBranchCommand;
import org.apache.maven.scm.provider.git.jgit.command.checkin.JGitCheckInCommand;
import org.apache.maven.scm.provider.git.jgit.command.checkout.JGitCheckOutCommand;
import org.apache.maven.scm.provider.git.jgit.command.remoteinfo.JGitRemoteInfoCommand;
+import org.apache.maven.scm.provider.git.jgit.command.tag.JGitTagCommand;
+import org.apache.maven.scm.provider.git.jgit.command.untag.JGitUntagCommand;
import org.codehaus.plexus.components.interactivity.Prompter;
import org.eclipse.jgit.api.TransportCommand;
@@ -40,27 +44,42 @@
@Named("jgit")
@Priority(1) // must have higher priority than default JGitScmProvider
public class JGitTestScmProvider extends JGitScmProvider implements ScmProvider {
- private Consumer<JGitCheckInCommand> checkInCommandCallback;
- private Consumer<JGitCheckOutCommand> checkOutCommandCallback;
- private Consumer<JGitRemoteInfoCommand> remoteInfoCommandCallback;
+ private Consumer<? super JGitCheckInCommand> checkInCommandCallback;
+ private Consumer<? super JGitCheckOutCommand> checkOutCommandCallback;
+ private Consumer<? super JGitRemoteInfoCommand> remoteInfoCommandCallback;
+ private Consumer<? super JGitTagCommand> tagCommandCallback;
+ private Consumer<? super JGitUntagCommand> untagCommandCallback;
+ private Consumer<? super JGitBranchCommand> branchCommandCallback;
@Inject
public JGitTestScmProvider(Prompter prompter) {
super(prompter);
}
- public void registerCheckInCommandCallback(Consumer<JGitCheckInCommand> gitCommandConsumer) {
+ public void registerCheckInCommandCallback(Consumer<? super JGitCheckInCommand> gitCommandConsumer) {
checkInCommandCallback = gitCommandConsumer;
}
- public void registerCheckOutCommandCallback(Consumer<JGitCheckOutCommand> gitCommandConsumer) {
+ public void registerCheckOutCommandCallback(Consumer<? super JGitCheckOutCommand> gitCommandConsumer) {
checkOutCommandCallback = gitCommandConsumer;
}
- public void registerRemoteInfoCommandCallback(Consumer<JGitRemoteInfoCommand> gitCommandConsumer) {
+ public void registerRemoteInfoCommandCallback(Consumer<? super JGitRemoteInfoCommand> gitCommandConsumer) {
remoteInfoCommandCallback = gitCommandConsumer;
}
+ public void registerTagCommandCallback(Consumer<? super JGitTagCommand> gitCommandConsumer) {
+ tagCommandCallback = gitCommandConsumer;
+ }
+
+ public void registerUntagCommandCallback(Consumer<? super JGitUntagCommand> gitCommandConsumer) {
+ untagCommandCallback = gitCommandConsumer;
+ }
+
+ public void registerBranchCommandCallback(Consumer<? super JGitBranchCommand> gitCommandConsumer) {
+ branchCommandCallback = gitCommandConsumer;
+ }
+
@Override
protected GitCommand getCheckInCommand() {
JGitCheckInCommand command = (JGitCheckInCommand) super.getCheckInCommand();
@@ -87,4 +106,46 @@ protected GitCommand getRemoteInfoCommand() {
}
return command;
}
+
+ @Override
+ protected GitCommand getBranchCommand() {
+ JGitBranchCommand command = (JGitBranchCommand) super.getBranchCommand();
+ if (branchCommandCallback != null) {
+ branchCommandCallback.accept(command);
+ }
+ return command;
+ }
+
+ @Override
+ protected GitCommand getTagCommand() {
+ JGitTagCommand command = (JGitTagCommand) super.getTagCommand();
+ if (tagCommandCallback != null) {
+ tagCommandCallback.accept(command);
+ }
+ return command;
+ }
+
+ @Override
+ protected GitCommand getUntagCommand() {
+ JGitUntagCommand command = (JGitUntagCommand) super.getUntagCommand();
+ if (untagCommandCallback != null) {
+ untagCommandCallback.accept(command);
+ }
+ return command;
+ }
+
+ /**
+ * Uses a custom SSHD session factory which accepts all hosts for all commands which (potentially) involve
+ * a server connection.
+ */
+ public void useLenientSshdSessionFactory() {
+ Consumer<CustomizableSshSessionFactoryCommand> configureLenientSshSessionFactory = command -> {
+ command.setSshSessionFactorySupplier(AcceptAllHostsSshdSessionFactory::new);
+ };
+ registerCheckOutCommandCallback(configureLenientSshSessionFactory);
+ registerCheckInCommandCallback(configureLenientSshSessionFactory);
+ registerBranchCommandCallback(configureLenientSshSessionFactory);
+ registerTagCommandCallback(configureLenientSshSessionFactory);
+ registerUntagCommandCallback(configureLenientSshSessionFactory);
+ }
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitSshBranchCommandTckTest.java
similarity index 57%
copy from maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitSshBranchCommandTckTest.java
index 93c78baf4..92dd639a2 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/branch/JGitSshBranchCommandTckTest.java
@@ -16,26 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.scm.provider.git.jgit.command.remove;
+package org.apache.maven.scm.provider.git.jgit.command.branch;
import java.io.File;
import java.io.IOException;
+import java.security.GeneralSecurityException;
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.provider.git.command.remove.GitRemoveCommandTckTest;
-import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.provider.git.command.branch.GitSshBranchCommandTckTest;
+import org.apache.maven.scm.provider.git.jgit.JGitTestScmProvider;
import org.eclipse.jgit.util.FileUtils;
/**
- * @author Georg Tsakumagos
+ *
*/
-public class JGitRemoveCommandTckTest extends GitRemoveCommandTckTest {
- /**
- * {@inheritDoc}
- */
- public String getScmUrl() throws Exception {
- return GitScmTestUtils.getScmUrl(getRepositoryRoot(), "jgit");
+public class JGitSshBranchCommandTckTest extends GitSshBranchCommandTckTest {
+
+ public JGitSshBranchCommandTckTest() throws GeneralSecurityException {
+ super();
+ }
+
+ @Override
+ protected String getScmProvider() {
+ return "jgit";
+ }
+
+ @Override
+ public void initRepo() throws Exception {
+ super.initRepo();
+ JGitTestScmProvider provider =
+ (JGitTestScmProvider) getScmManager().getProviderByRepository(getScmRepository());
+ provider.useLenientSshdSessionFactory();
}
@Override
@@ -44,11 +54,4 @@ protected void deleteDirectory(File directory) throws IOException {
FileUtils.delete(directory, FileUtils.RECURSIVE | FileUtils.RETRY);
}
}
-
- @Override
- protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
- CheckOutScmResult result = super.checkOut(workingDirectory, repository);
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
- return result;
- }
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java
index 88caaa714..d5df098c9 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitSshCheckOutCommandTckTest.java
@@ -21,30 +21,21 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
import java.security.GeneralSecurityException;
import java.security.PublicKey;
-import java.util.function.Consumer;
import org.apache.commons.io.IOUtils;
import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
import org.apache.maven.scm.provider.git.command.checkout.GitSshCheckOutCommandTckTest;
import org.apache.maven.scm.provider.git.jgit.JGitTestScmProvider;
-import org.apache.maven.scm.provider.git.jgit.command.ScmProviderAwareSshdSessionFactory;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.apache.sshd.common.config.keys.PublicKeyEntry;
-import org.eclipse.jgit.annotations.NonNull;
-import org.eclipse.jgit.internal.transport.sshd.OpenSshServerKeyDatabase;
-import org.eclipse.jgit.transport.CredentialsProvider;
-import org.eclipse.jgit.transport.sshd.ServerKeyDatabase;
import org.eclipse.jgit.util.FileUtils;
import org.junit.Test;
-import org.slf4j.Logger;
/** @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a> */
public class JGitSshCheckOutCommandTckTest extends GitSshCheckOutCommandTckTest {
@@ -63,34 +54,7 @@ public void initRepo() throws Exception {
super.initRepo();
JGitTestScmProvider provider =
(JGitTestScmProvider) getScmManager().getProviderByRepository(getScmRepository());
- // accept all hosts
- provider.registerCheckOutCommandCallback(new Consumer<JGitCheckOutCommand>() {
- @Override
- public void accept(JGitCheckOutCommand command) {
- command.setSshSessionFactorySupplier(AcceptAllHostsSshdSessionFactory::new);
- }
- });
- }
-
- private static final class AcceptAllHostsSshdSessionFactory extends ScmProviderAwareSshdSessionFactory {
- public AcceptAllHostsSshdSessionFactory(GitScmProviderRepository repo, Logger logger) {
- super(repo, logger);
- }
-
- @Override
- protected ServerKeyDatabase createServerKeyDatabase(File homeDir, File sshDir) {
- return new OpenSshServerKeyDatabase(false, null) {
- @Override
- public boolean accept(
- @NonNull String connectAddress,
- @NonNull InetSocketAddress remoteAddress,
- @NonNull PublicKey serverKey,
- @NonNull Configuration config,
- CredentialsProvider provider) {
- return true;
- }
- };
- }
+ provider.useLenientSshdSessionFactory();
}
@Override
@@ -116,7 +80,7 @@ private void configureKeypairFromClasspathResource(ScmRepository repository, Str
PublicKey publicKey = PublicKeyEntry.parsePublicKeyEntry(
IOUtils.toString(publicKeyInputStream, StandardCharsets.US_ASCII))
.resolvePublicKey(null, null, null);
- acceptedPublicKeys.add(publicKey);
+ gitSshServer.addPublicKey(publicKey);
}
Path privateKeyFile = Files.createTempFile("privateKey", null);
// private key into tmp file
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
index 93c78baf4..23a6cf3ec 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
@@ -48,7 +48,7 @@ protected void deleteDirectory(File directory) throws IOException {
@Override
protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
CheckOutScmResult result = super.checkOut(workingDirectory, repository);
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
+ GitScmTestUtils.setDefaultGitConfig(workingDirectory);
return result;
}
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitSshTagCommandTckTest.java
similarity index 57%
copy from maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitSshTagCommandTckTest.java
index 93c78baf4..ddbb48fd0 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/tag/JGitSshTagCommandTckTest.java
@@ -16,26 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.scm.provider.git.jgit.command.remove;
+package org.apache.maven.scm.provider.git.jgit.command.tag;
import java.io.File;
import java.io.IOException;
+import java.security.GeneralSecurityException;
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.provider.git.command.remove.GitRemoveCommandTckTest;
-import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.provider.git.command.tag.GitSshTagCommandTckTest;
+import org.apache.maven.scm.provider.git.jgit.JGitTestScmProvider;
import org.eclipse.jgit.util.FileUtils;
/**
- * @author Georg Tsakumagos
+ *
*/
-public class JGitRemoveCommandTckTest extends GitRemoveCommandTckTest {
- /**
- * {@inheritDoc}
- */
- public String getScmUrl() throws Exception {
- return GitScmTestUtils.getScmUrl(getRepositoryRoot(), "jgit");
+public class JGitSshTagCommandTckTest extends GitSshTagCommandTckTest {
+
+ public JGitSshTagCommandTckTest() throws GeneralSecurityException {
+ super();
+ }
+
+ @Override
+ protected String getScmProvider() {
+ return "jgit";
+ }
+
+ @Override
+ public void initRepo() throws Exception {
+ super.initRepo();
+ JGitTestScmProvider provider =
+ (JGitTestScmProvider) getScmManager().getProviderByRepository(getScmRepository());
+ provider.useLenientSshdSessionFactory();
}
@Override
@@ -44,11 +54,4 @@ protected void deleteDirectory(File directory) throws IOException {
FileUtils.delete(directory, FileUtils.RECURSIVE | FileUtils.RETRY);
}
}
-
- @Override
- protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
- CheckOutScmResult result = super.checkOut(workingDirectory, repository);
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
- return result;
- }
}
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitSshUntagCommandTckTest.java
similarity index 57%
copy from maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
copy to maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitSshUntagCommandTckTest.java
index 93c78baf4..01d657d88 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/remove/JGitRemoveCommandTckTest.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/test/java/org/apache/maven/scm/provider/git/jgit/command/untag/JGitSshUntagCommandTckTest.java
@@ -16,26 +16,36 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.scm.provider.git.jgit.command.remove;
+package org.apache.maven.scm.provider.git.jgit.command.untag;
import java.io.File;
import java.io.IOException;
+import java.security.GeneralSecurityException;
-import org.apache.maven.scm.command.checkout.CheckOutScmResult;
-import org.apache.maven.scm.provider.git.GitScmTestUtils;
-import org.apache.maven.scm.provider.git.command.remove.GitRemoveCommandTckTest;
-import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.provider.git.command.untag.GitSshUntagCommandTckTest;
+import org.apache.maven.scm.provider.git.jgit.JGitTestScmProvider;
import org.eclipse.jgit.util.FileUtils;
/**
- * @author Georg Tsakumagos
+ *
*/
-public class JGitRemoveCommandTckTest extends GitRemoveCommandTckTest {
- /**
- * {@inheritDoc}
- */
- public String getScmUrl() throws Exception {
- return GitScmTestUtils.getScmUrl(getRepositoryRoot(), "jgit");
+public class JGitSshUntagCommandTckTest extends GitSshUntagCommandTckTest {
+
+ public JGitSshUntagCommandTckTest() throws GeneralSecurityException {
+ super();
+ }
+
+ @Override
+ protected String getScmProvider() {
+ return "jgit";
+ }
+
+ @Override
+ public void initRepo() throws Exception {
+ super.initRepo();
+ JGitTestScmProvider provider =
+ (JGitTestScmProvider) getScmManager().getProviderByRepository(getScmRepository());
+ provider.useLenientSshdSessionFactory();
}
@Override
@@ -44,11 +54,4 @@ protected void deleteDirectory(File directory) throws IOException {
FileUtils.delete(directory, FileUtils.RECURSIVE | FileUtils.RETRY);
}
}
-
- @Override
- protected CheckOutScmResult checkOut(File workingDirectory, ScmRepository repository) throws Exception {
- CheckOutScmResult result = super.checkOut(workingDirectory, repository);
- GitScmTestUtils.setDefaulGitConfig(workingDirectory);
- return result;
- }
}