Skip to content

Commit

Permalink
build(git): Split out the jgitSshApache dependency
Browse files Browse the repository at this point in the history
`jgitSshApache` is a dependency of `jgitSshApacheAgent`, but the latter
should be a runtime dependency only. Allow to do this by splitting out
`jgitSshApache` as an explicit implementation dependency.

Signed-off-by: Sebastian Schuberth <[email protected]>
  • Loading branch information
sschuberth committed Nov 10, 2023
1 parent 400e9ef commit c9a730b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ jacksonDatatypeJsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datat
jacksonModuleKotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
jakartaMail = { module = "com.sun.mail:jakarta.mail", version.ref = "jakartaMail" }
jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
jgitSshApache = { module = "org.eclipse.jgit:org.eclipse.jgit.ssh.apache", version.ref = "jgit" }
jgitSshApacheAgent = { module = "org.eclipse.jgit:org.eclipse.jgit.ssh.apache.agent", version.ref = "jgit" }
jiraRestClientApi = { module = "com.atlassian.jira:jira-rest-java-client-api", version.ref = "jiraRestClient" }
jiraRestClientApp = { module = "com.atlassian.jira:jira-rest-java-client-app", version.ref = "jiraRestClient" }
Expand Down
4 changes: 3 additions & 1 deletion plugins/version-control-systems/git/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ dependencies {
implementation(project(":utils:ort-utils"))

implementation(libs.jgit)
implementation(libs.jgitSshApacheAgent) {
implementation(libs.jgitSshApache)

runtimeOnly(libs.jgitSshApacheAgent) {
exclude(group = "org.apache.sshd", module = "sshd-sftp")
.because("it is not required for cloning via SSH and causes issues with GraalVM native images")
}
Expand Down

0 comments on commit c9a730b

Please sign in to comment.