From: David Pursehouse <david.pursehouse@gmail.com>
Date: Fri, 31 Aug 2018 06:44:15 +0000 (+0900)
Subject: Merge branch 'stable-4.11' into stable-5.0
X-Git-Tag: v5.1.0.201809051400-rc1~2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F128407%2F1;p=jgit.git

Merge branch 'stable-4.11' into stable-5.0

* stable-4.11:
  Bazel: Use hyphen instead of underscore in external repository names
  Bazel: Format all build files with buildifier 0.15.0
  ChangeIdUtilTest: Remove unused notestCommitDashV

Change-Id: I5ebb1058927ea5a478eae9e44b7d96f123a22523
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
---

0718d22cf4d3f2db0229bae0fde65b2e6df238c9
diff --cc org.eclipse.jgit.pgm/BUILD
index bbf4b1c43d,07922687e3..ddc84bea06
--- a/org.eclipse.jgit.pgm/BUILD
+++ b/org.eclipse.jgit.pgm/BUILD
@@@ -25,12 -25,6 +25,12 @@@ java_library
      ],
  )
  
 +java_binary(
 +    name = "jgit",
-     runtime_deps = [":pgm"],
 +    main_class = "org.eclipse.jgit.pgm.Main",
++    runtime_deps = [":pgm"],
 +)
 +
  java_import(
      name = "services",
      jars = [":services_jar"],
diff --cc org.eclipse.jgit.test/tests.bzl
index b1b7b7a9de,c75ab76767..f368000b21
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@@ -4,58 -4,53 +4,58 @@@ load
  )
  
  def tests(tests):
-   for src in tests:
-     name = src[len('tst/'):len(src)-len('.java')].replace('/', '_')
-     labels = []
-     if name.startswith('org_eclipse_jgit_'):
-       l = name[len('org.eclipse.jgit_'):]
-       if l.startswith('internal_storage_'):
-         l = l[len('internal.storage_'):]
-       i = l.find('_')
-       if i > 0:
-         labels.append(l[:i])
-       else:
-         labels.append(i)
-     if 'lib' not in labels:
-       labels.append('lib')
+     for src in tests:
+         name = src[len("tst/"):len(src) - len(".java")].replace("/", "_")
+         labels = []
+         if name.startswith("org_eclipse_jgit_"):
+             l = name[len("org.eclipse.jgit_"):]
+             if l.startswith("internal_storage_"):
+                 l = l[len("internal.storage_"):]
+             i = l.find("_")
+             if i > 0:
+                 labels.append(l[:i])
+             else:
+                 labels.append(i)
+         if "lib" not in labels:
+             labels.append("lib")
  
-     # TODO(http://eclip.se/534285): Make this test pass reliably
-     # and remove the flaky attribute.
-     flaky = src.endswith("CrissCrossMergeTest.java")
++        # TODO(http://eclip.se/534285): Make this test pass reliably
++        # and remove the flaky attribute.
++        flaky = src.endswith("CrissCrossMergeTest.java")
 +
-     additional_deps = []
-     if src.endswith("RootLocaleTest.java"):
-       additional_deps = [
-         '//org.eclipse.jgit.pgm:pgm',
-         '//org.eclipse.jgit.ui:ui',
-       ]
-     if src.endswith("WalkEncryptionTest.java"):
-       additional_deps = [
-         '//org.eclipse.jgit:insecure_cipher_factory',
-       ]
-     if src.endswith("OpenSshConfigTest.java"):
-       additional_deps = [
-         '//lib:jsch',
-       ]
-     if src.endswith("JschConfigSessionFactoryTest.java"):
-       additional_deps = [
-         '//lib:jsch',
-       ]
+         additional_deps = []
+         if src.endswith("RootLocaleTest.java"):
+             additional_deps = [
+                 "//org.eclipse.jgit.pgm:pgm",
+                 "//org.eclipse.jgit.ui:ui",
+             ]
+         if src.endswith("WalkEncryptionTest.java"):
+             additional_deps = [
+                 "//org.eclipse.jgit:insecure_cipher_factory",
+             ]
+         if src.endswith("OpenSshConfigTest.java"):
+             additional_deps = [
+                 "//lib:jsch",
+             ]
+         if src.endswith("JschConfigSessionFactoryTest.java"):
+             additional_deps = [
+                 "//lib:jsch",
+             ]
  
-     junit_tests(
-       name = name,
-       tags = labels,
-       srcs = [src],
-       deps = additional_deps + [
-         ':helpers',
-         ':tst_rsrc',
-         '//lib:javaewah',
-         '//lib:junit',
-         '//lib:slf4j-api',
-         '//org.eclipse.jgit:jgit',
-         '//org.eclipse.jgit.junit:junit',
-         '//org.eclipse.jgit.lfs:jgit-lfs',
-       ],
-       flaky = flaky,
-       jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
-     )
+         junit_tests(
+             name = name,
+             tags = labels,
+             srcs = [src],
+             deps = additional_deps + [
+                 ":helpers",
+                 ":tst_rsrc",
+                 "//lib:javaewah",
+                 "//lib:junit",
+                 "//lib:slf4j-api",
+                 "//org.eclipse.jgit:jgit",
+                 "//org.eclipse.jgit.junit:junit",
+                 "//org.eclipse.jgit.lfs:jgit-lfs",
+             ],
++            flaky = flaky,
+             jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
+         )