-
Notifications
You must be signed in to change notification settings - Fork 174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[SCM-995] Upgrade JGit to 5.13.1 and leverage Apache Mina SSHD instead of JSch #153
Conversation
0b056a6
to
ee650d9
Compare
...rc/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitTransportConfigCallback.java
Outdated
Show resolved
Hide resolved
7064322
to
a9b210e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move the env var handling to a separate JIRA issue/PR.
I need it for the IT. |
...rc/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
Outdated
Show resolved
Hide resolved
...rc/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
Outdated
Show resolved
Hide resolved
.../main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
Outdated
Show resolved
Hide resolved
...n/java/org/apache/maven/scm/provider/git/gitexe/command/remoteinfo/GitRemoteInfoCommand.java
Outdated
Show resolved
Hide resolved
...a/org/apache/maven/scm/provider/git/jgit/command/PlexusInteractivityCredentialsProvider.java
Outdated
Show resolved
Hide resolved
...a/org/apache/maven/scm/provider/git/jgit/command/PlexusInteractivityCredentialsProvider.java
Outdated
Show resolved
Hide resolved
.../java/org/apache/maven/scm/provider/git/jgit/command/ScmProviderAwareSshdSessionFactory.java
Show resolved
Hide resolved
.../java/org/apache/maven/scm/provider/git/jgit/command/ScmProviderAwareSshdSessionFactory.java
Outdated
Show resolved
Hide resolved
...-scm-provider-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/JGitScmProvider.java
Outdated
Show resolved
Hide resolved
Since the title of this PR is different to the JIRA issue, I have the following understanding:
My proposal w/o ripping this apart:
Thus, all requirements/changes are visible and understood. Then I'd merge this as one PR. WDYT? |
This PR does not "rework OpenSSH private key handing for gitexe" nor does it "Support alternative SSH private keys with gitexe provider". The environment variables are only necessary to test existing functionality in gitexe (namely test authorization with SSH). |
Please summarize what is necessary to make this proper. |
Maybe split up into Then the environment variable would belong to c) |
That sounds good, though advertising that gitexe supports alternative SSH private keys would we that bad, no? Especially in consistency with JGit. WDYT? |
git executable leverages the ssh executable for authentication and therefore there is no change with regard to supported private keys formats |
That's not what I mean, I mean that you can now supply an expliclt key which wasn't supported by now. Of course, the format and transport won't change. |
This is not part of this PR either. I will provide one for that separately. |
Sorry, I guess my brain isn't really working today. Please continue I'll try to catch up tomorrow. |
a9b210e
to
ee650d9
Compare
ee650d9
to
461d9c8
Compare
I split the features up as proposed in #153 (comment). This is now only a), b) is at https://github.com/apache/maven-scm/pull/154/files. and c) is still outstanding. |
Fantastic, will review today. |
...rc/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitTransportConfigCallback.java
Show resolved
Hide resolved
maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml
Outdated
Show resolved
Hide resolved
...rc/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitTransportConfigCallback.java
Show resolved
Hide resolved
...rc/main/java/org/apache/maven/scm/provider/git/jgit/command/JGitTransportConfigCallback.java
Show resolved
Hide resolved
...c/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
Show resolved
Hide resolved
...c/main/java/org/apache/maven/scm/provider/git/jgit/command/checkout/JGitCheckOutCommand.java
Outdated
Show resolved
Hide resolved
...-jgit/src/main/java/org/apache/maven/scm/provider/git/jgit/command/list/JGitListCommand.java
Show resolved
Hide resolved
...in/java/org/apache/maven/scm/provider/git/jgit/command/remoteinfo/JGitRemoteInfoCommand.java
Show resolved
Hide resolved
…d of JSch This closes apache#153
14e6517
to
acb585f
Compare
This supports OpenSSH private keys and drops usage of unmaintained JSch