diff options
| author | Matthias Sohn | 2020-04-18 17:08:01 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2020-04-18 17:08:20 +0000 |
| commit | 7bebce42cc1b34982509361832b79a7e24db96f0 (patch) | |
| tree | f6853f5439d66e39e15acbc59537e58a9c340d8d | |
| parent | 8ed7b266500eb8b2cbbf00d9b8556dff1a4c3165 (diff) | |
| parent | 9b2f8ced9018dad519fefdc19d3940104b95434a (diff) | |
| download | jgit-7bebce42cc1b34982509361832b79a7e24db96f0.tar.gz jgit-7bebce42cc1b34982509361832b79a7e24db96f0.tar.xz jgit-7bebce42cc1b34982509361832b79a7e24db96f0.zip | |
Merge branch 'stable-5.7'
* stable-5.7:
Bazel: Disable SecurityManagerMissingPermissionsTest test
Change-Id: Id8665d1ba630c1359e86846548143a785b178e75
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.jgit.test/BUILD | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/tests.bzl | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index b34ef2a796..3c4c61bfbb 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -40,6 +40,7 @@ DATA = [ EXCLUDED = [ PKG + "api/SecurityManagerTest.java", + PKG + "api/SecurityManagerMissingPermissionsTest.java", ] RESOURCES = glob(["resources/**"]) diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl index f27efccc23..d030316452 100644 --- a/org.eclipse.jgit.test/tests.bzl +++ b/org.eclipse.jgit.test/tests.bzl @@ -42,6 +42,10 @@ def tests(tests): additional_deps = [ "//lib:jsch", ] + if src.endswith("SecurityManagerMissingPermissionsTest.java"): + additional_deps = [ + "//lib:log4j", + ] if src.endswith("JSchSshTest.java"): additional_deps = [ "//lib:jsch", |