michael-o commented on code in PR #153:
URL: https://github.com/apache/maven-scm/pull/153#discussion_r924423086
##########
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml:
##########
@@ -47,13 +47,12 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>4.5.4.201711221230-r</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <version>5.13.1.202206130422-r</version><!-- since version 6 requires
Java 11 -->
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.ssh.apache</artifactId>
+ <version>5.13.1.202206130422-r</version><!-- since version 6 requires
Java 11 -->
Review Comment:
Move this to a property along with the comment.
##########
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitTransportConfigCallback.java:
##########
@@ -19,47 +19,22 @@
* under the License.
*/
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.eclipse.jgit.api.TransportConfigCallback;
-import org.eclipse.jgit.transport.JschConfigSessionFactory;
-import org.eclipse.jgit.transport.OpenSshConfig;
-import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.SshTransport;
import org.eclipse.jgit.transport.Transport;
-import org.eclipse.jgit.util.FS;
-import org.eclipse.jgit.util.StringUtils;
-import org.slf4j.Logger;
+import org.eclipse.jgit.transport.sshd.SshdSessionFactory;
Review Comment:
I am bit confused why this is called `sshd` and not simply `ssh`. We don't
start an SSH deamon after all, do we?
##########
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitTransportConfigCallback.java:
##########
@@ -19,47 +19,22 @@
* under the License.
*/
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.eclipse.jgit.api.TransportConfigCallback;
-import org.eclipse.jgit.transport.JschConfigSessionFactory;
-import org.eclipse.jgit.transport.OpenSshConfig;
-import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.SshTransport;
import org.eclipse.jgit.transport.Transport;
-import org.eclipse.jgit.util.FS;
-import org.eclipse.jgit.util.StringUtils;
-import org.slf4j.Logger;
+import org.eclipse.jgit.transport.sshd.SshdSessionFactory;
/**
* Implementation of {@link TransportConfigCallback} which adds
* a public/private key identity to ssh URLs if configured.
*/
public class JGitTransportConfigCallback implements TransportConfigCallback
{
- private SshSessionFactory sshSessionFactory = null;
+ private final SshdSessionFactory sshSessionFactory;
Review Comment:
`sshdSessionFactory`, no?
##########
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommand.java:
##########
@@ -48,6 +51,19 @@
implements GitCommand
{
+ private BiFunction<GitScmProviderRepository, Logger,
ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
Review Comment:
same here
##########
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/list/JGitListCommand.java:
##########
@@ -48,6 +51,19 @@
implements GitCommand
{
+ private BiFunction<GitScmProviderRepository, Logger,
ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
Review Comment:
same here
##########
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:
##########
@@ -94,6 +111,9 @@ protected CheckOutScmResult executeCheckOutCommand(
ScmProviderRepository repo,
branch = Constants.MASTER;
}
+ TransportConfigCallback transportConfigCallback = new
JGitTransportConfigCallback(
+ sshSessionFactorySupplier.apply ( (GitScmProviderRepository)
repo, logger ) );
Review Comment:
`apply(`
##########
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:
##########
@@ -63,6 +67,19 @@
extends AbstractCheckOutCommand
implements GitCommand
{
+ private BiFunction<GitScmProviderRepository, Logger,
ScmProviderAwareSshdSessionFactory> sshSessionFactorySupplier;
Review Comment:
`sshd...`
##########
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitTransportConfigCallback.java:
##########
@@ -19,47 +19,22 @@
* under the License.
*/
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.eclipse.jgit.api.TransportConfigCallback;
-import org.eclipse.jgit.transport.JschConfigSessionFactory;
-import org.eclipse.jgit.transport.OpenSshConfig;
-import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.SshTransport;
import org.eclipse.jgit.transport.Transport;
-import org.eclipse.jgit.util.FS;
-import org.eclipse.jgit.util.StringUtils;
-import org.slf4j.Logger;
+import org.eclipse.jgit.transport.sshd.SshdSessionFactory;
/**
* Implementation of {@link TransportConfigCallback} which adds
* a public/private key identity to ssh URLs if configured.
*/
public class JGitTransportConfigCallback implements TransportConfigCallback
{
- private SshSessionFactory sshSessionFactory = null;
+ private final SshdSessionFactory sshSessionFactory;
- public JGitTransportConfigCallback( GitScmProviderRepository repo, Logger
logger )
+ public JGitTransportConfigCallback( SshdSessionFactory sshSessionFactory )
Review Comment:
`sshdSessionFactory`, no?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
