diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-03-08 17:23:57 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2022-03-09 21:45:35 +0100 |
| commit | 338f2adf160fdd72ee137e416174526d5c35eb18 (patch) | |
| tree | 2d55def305066a654c46e335ed840bda6fef1bea /org.eclipse.jgit.junit.ssh | |
| parent | 600e96dfdc6769b7da6e2b2daea74cf69791da7a (diff) | |
| parent | 8f7ef245f0c156730ef74ff3fe838c330728fc7f (diff) | |
| download | jgit-338f2adf160fdd72ee137e416174526d5c35eb18.tar.gz jgit-338f2adf160fdd72ee137e416174526d5c35eb18.zip | |
Merge branch 'stable-6.1'
* stable-6.1:
Prepare 6.1.1-SNAPSHOT builds
JGit v6.1.0.202203080745-r
[checkout] Use .gitattributes from the commit to be checked out
Don't use final for method parameters
[push] support the "matching" RefSpecs ":" and "+:"
[push] Call the pre-push hook later in the push process
IndexDiff: use tree filter also for SubmoduleWalk
Run license check with option -Ddash.projectId=technology.jgit
Exclude transitive dependencies of sshd-sftp
Update DEPENDENCIES for 6.1.0 release
Add dependency to dash-licenses
Fix typos of some keys in LfsText
Sort LfsText entries alphabetically
Support for "lfs.url" from ".lfsconfig"
Change-Id: I1b9f0c0ed647837e00b9640d235dbfab2329c5a6
Diffstat (limited to 'org.eclipse.jgit.junit.ssh')
| -rw-r--r-- | org.eclipse.jgit.junit.ssh/pom.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 504c7dcdfe..395b14b0a1 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -55,6 +55,16 @@ <groupId>org.apache.sshd</groupId> <artifactId>sshd-sftp</artifactId> <version>${apache-sshd-version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-common</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> |