JGit: Adapt to the split of jsch code in own artifact
Since: [1] and corresponding issue: [2] JCraft JSch code is extracted in its own artifact: @jgit//org.eclipse.jgit.ssh.jsch:ssh-jsch. Adapt the code correspondingly to that split. This change is updating JGit module. The change we need: 8d2d68365 Decouple JSch from JGit Core [1] https://git.eclipse.org/r/#/c/156153 [2] https://bugs.eclipse.org/bugs/show_bug.cgi?id=553625 Change-Id: I4a1f5f4ffbbf07b4455780c1b82b8d9005377585
This commit is contained in:
@@ -39,6 +39,7 @@ DEPLOY_ENV = [
|
||||
"//lib:gson",
|
||||
"//lib:guava-retrying",
|
||||
"//lib:jgit",
|
||||
"//lib:jgit-ssh-jsch",
|
||||
"//lib:jsch",
|
||||
"//lib/commons:compress",
|
||||
"//lib/commons:lang",
|
||||
|
||||
@@ -46,6 +46,13 @@ java_library(
|
||||
],
|
||||
)
|
||||
|
||||
java_library(
|
||||
name = "jgit-ssh-jsch",
|
||||
data = ["//lib:LICENSE-jgit"],
|
||||
visibility = ["//visibility:public"],
|
||||
exports = ["@jgit//org.eclipse.jgit.ssh.jsch:ssh-jsch"],
|
||||
)
|
||||
|
||||
java_library(
|
||||
name = "jgit-archive",
|
||||
data = ["//lib:LICENSE-jgit"],
|
||||
|
||||
Submodule modules/jgit updated: 75fcccaea3...55371c5f06
@@ -71,6 +71,7 @@ EXPORTS = [
|
||||
"//lib/jackson:jackson-core",
|
||||
"//lib:jgit-servlet",
|
||||
"//lib:jgit",
|
||||
"//lib:jgit-ssh-jsch",
|
||||
"//lib:jsr305",
|
||||
"//lib/log:api",
|
||||
"//lib/log:log4j",
|
||||
|
||||
@@ -23,6 +23,7 @@ LIBS = [
|
||||
"//lib/bouncycastle:bcprov",
|
||||
"//lib/bouncycastle:bcpg",
|
||||
"//lib/log:impl-log4j",
|
||||
"//lib:jgit-ssh-jsch",
|
||||
"//prolog:gerrit-prolog-common",
|
||||
"//resources:log4j-config",
|
||||
]
|
||||
|
||||
@@ -181,6 +181,8 @@ def gen_classpath(ext):
|
||||
classpathentry('src', 'modules/jgit/org.eclipse.jgit.http.server/src')
|
||||
classpathentry('src', 'modules/jgit/org.eclipse.jgit.http.server/resources')
|
||||
classpathentry('src', 'modules/jgit/org.eclipse.jgit.junit/src')
|
||||
classpathentry('src', 'modules/jgit/org.eclipse.jgit.ssh.jsch/src')
|
||||
classpathentry('src', 'modules/jgit/org.eclipse.jgit.ssh.jsch/resources')
|
||||
|
||||
def classpathentry(kind, path, src=None, out=None, exported=None, excluding=None):
|
||||
e = doc.createElement('classpathentry')
|
||||
|
||||
Reference in New Issue
Block a user