From c9a730b2ca5ce7a5c79dba4180052b0c638afa44 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Thu, 9 Nov 2023 14:56:11 +0100 Subject: [PATCH] build(git): Split out the `jgitSshApache` dependency `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 --- gradle/libs.versions.toml | 1 + plugins/version-control-systems/git/build.gradle.kts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e3e7c1c60d0fe..dcf3d74a96e77 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" } diff --git a/plugins/version-control-systems/git/build.gradle.kts b/plugins/version-control-systems/git/build.gradle.kts index e6b0482fd2838..fade44d6ac25a 100644 --- a/plugins/version-control-systems/git/build.gradle.kts +++ b/plugins/version-control-systems/git/build.gradle.kts @@ -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") }