]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.1' into stable-5.2 01/149101/2
authorMatthias Sohn <matthias.sohn@sap.com>
Sat, 7 Sep 2019 09:07:21 +0000 (11:07 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 7 Sep 2019 10:16:42 +0000 (12:16 +0200)
* stable-5.1:
  Bazel: Fix warning about deprecated lib.bzl
  Format lib/BUILD with buildifier
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Bump minimum supported version to 0.29.0
  Bazel: Bump skylib library version to 0.8.0
  Use bazelisk to switch between used bazel version
  Bazel: Require minimum bazel version 0.17.1
  Fix wrong placeholder index in error message packInaccessible
  JGitText: Remove unused externalized strings
  RepoText: Remove unused externalized string
  CLI: Remove unused externalized strings

Change-Id: Iea37a8e39e9d4872dc607c9222dcf191ce4e4757
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
WORKSPACE
lib/BUILD
org.eclipse.jgit.pgm/BUILD
org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties
org.eclipse.jgit.test/BUILD
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

diff --cc WORKSPACE
Simple merge
diff --cc lib/BUILD
index 912c6e091b1d2d8330ec44664334398d33807f6c,4e3eaf7e965d329ad1a21a7187f375b6f25cf332..a4b449185bba1e6fc0714bc3e2c6901e4f86d448
+++ b/lib/BUILD
@@@ -167,19 -139,7 +169,19 @@@ java_library
          "@hamcrest-core//jar",
          "@hamcrest-library//jar",
          "@junit//jar",
 -        "@mockito-core//jar",
 +        "@mockito//jar",
-         "@objenesis//jar"
++        "@objenesis//jar",
 +    ],
 +)
 +
 +java_library(
 +    name = "mockito",
 +    testonly = 1,
 +    visibility = ["//visibility:public"],
 +    exports = [
 +        "@bytebuddy//jar",
 +        "@bytebuddy-agent//jar",
 +        "@mockito//jar",
          "@objenesis//jar",
      ],
  )
Simple merge
Simple merge