SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates jgit to 5.12.0; fixes gh-1689

Browse Source
This commit is contained in:
Marcin Grzejszczak
2021-08-09 11:47:48 +02:00
parent 085a91bcb7
commit 28cebb35a0
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -40,7 +40,7 @@
<hoverfly-junit.version>0.2.2</hoverfly-junit.version> <hoverfly-junit.version>0.2.2</hoverfly-junit.version>
<commons-text.version>1.9</commons-text.version> <commons-text.version>1.9</commons-text.version>
<handlebars.version>4.2.0</handlebars.version> <handlebars.version>4.2.0</handlebars.version>
<jgit.version>5.5.1.201910021850-r</jgit.version> <jgit.version>5.12.0.202106070339-r</jgit.version>
<javax-inject.version>1</javax-inject.version> <javax-inject.version>1</javax-inject.version>
<json-unit-assertj.version>2.27.0</json-unit-assertj.version> <json-unit-assertj.version>2.27.0</json-unit-assertj.version>
@@ -253,6 +253,11 @@
<artifactId>org.eclipse.jgit</artifactId> <artifactId>org.eclipse.jgit</artifactId>
<version>${jgit.version}</version> <version>${jgit.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
<version>${jgit.version}</version>
</dependency>
<!-- a proxy to ssh-agent and Pageant in Java --> <!-- a proxy to ssh-agent and Pageant in Java -->
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>

4
spring-cloud-contract-stub-runner/pom.xml
View File

@@ -116,6 +116,10 @@
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId> <artifactId>org.eclipse.jgit</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
</dependency>
<!-- a proxy to ssh-agent and Pageant in Java --> <!-- a proxy to ssh-agent and Pageant in Java -->
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>

3
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java
View File

@@ -51,6 +51,7 @@ import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.JschConfigSessionFactory; import org.eclipse.jgit.transport.JschConfigSessionFactory;
import org.eclipse.jgit.transport.OpenSshConfig; import org.eclipse.jgit.transport.OpenSshConfig;
import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.SshTransport; import org.eclipse.jgit.transport.SshTransport;
import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
@@ -326,7 +327,7 @@ class GitRepo {
final CredentialsProvider provider; final CredentialsProvider provider;
private final JschConfigSessionFactory factory = new JschConfigSessionFactory() { private final SshSessionFactory factory = new JschConfigSessionFactory() {
@Override @Override
protected void configure(OpenSshConfig.Host host, Session session) { protected void configure(OpenSshConfig.Host host, Session session) {