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

Merge branch 'stable-5.0' into stable-5.1

* stable-5.0:
  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: I7c2fc7d694d7d891cac96cb805c89c8bdf7c5cbf
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
---

b6f3bdefce01680be8089e3732d143d7e1059b46
diff --cc WORKSPACE
index 3f36b34721,df99c95871..9d723d28e1
--- a/WORKSPACE
+++ b/WORKSPACE
@@@ -40,15 -40,15 +40,15 @@@ maven_jar
  )
  
  maven_jar(
-     name = "commons_codec",
+     name = "commons-codec",
 -    artifact = "commons-codec:commons-codec:1.4",
 -    sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a",
 +    artifact = "commons-codec:commons-codec:1.10",
 +    sha1 = "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
  )
  
  maven_jar(
-     name = "commons_logging",
+     name = "commons-logging",
 -    artifact = "commons-logging:commons-logging:1.1.3",
 -    sha1 = "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
 +    artifact = "commons-logging:commons-logging:1.2",
 +    sha1 = "4bfc12adfe4842bf07b657f0369c4cb522955686",
  )
  
  maven_jar(
@@@ -111,46 -111,46 +111,46 @@@ maven_jar
      sha1 = "3edcfe49d2c6053a70a2a47e4e1c2f94998a49cf",
  )
  
 -JETTY_VER = "9.4.8.v20171121"
 +JETTY_VER = "9.4.11.v20180605"
  
  maven_jar(
-     name = "jetty_servlet",
+     name = "jetty-servlet",
      artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
 -    sha1 = "bbbb9b5de08f468c7b9b3de6aea0b098d2c679b6",
 -    src_sha1 = "6ef1e65a5af7ab2d79ba6043923affdaeaafb1e5",
 +    sha1 = "66d31900fcfc70e3666f0b3335b6660635154f98",
 +    src_sha1 = "930c50de49b9c258d5f0329426cbcac4d3143497",
  )
  
  maven_jar(
-     name = "jetty_security",
+     name = "jetty-security",
      artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
 -    sha1 = "e8350eec683b55494287f06740543e4be6f75425",
 -    src_sha1 = "e3a879d8675fa10bc305e7a59006f1d09db04a68",
 +    sha1 = "926def86d31ee07ca4b4658833dc6ee6918b8e86",
 +    src_sha1 = "019bc7c2a366cbb201950f24dd64d9d9a49b6840",
  )
  
  maven_jar(
-     name = "jetty_server",
+     name = "jetty-server",
      artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
 -    sha1 = "34614bd9a29de57ef28ca31f1f2b49a412af196d",
 -    src_sha1 = "fef49ac6b2bbc6d142dc0be34f68f0fb0792d52b",
 +    sha1 = "58353c2f27515b007fc83ae22002feb34fc24714",
 +    src_sha1 = "e7d832d74df616137755996b41bc28bb82b3bc42",
  )
  
  maven_jar(
-     name = "jetty_http",
+     name = "jetty-http",
      artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
 -    sha1 = "9879d6c4e37400bf43f0cd4b3c6e34a3ba409864",
 -    src_sha1 = "5e746cd0ccb732eef0427c8c4b9dcb034e26c61b",
 +    sha1 = "20c35f5336befe35b0bd5c4a63e07170fe7872d7",
 +    src_sha1 = "5bc30d1f7e8c4456c22cc85999b8cafd3741bdff",
  )
  
  maven_jar(
-     name = "jetty_io",
+     name = "jetty-io",
      artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
 -    sha1 = "d3fe2dfa62f52ee91ff07cb359f63387e0e30b40",
 -    src_sha1 = "41f25e1e1bba14ab0d3415488fa189f09c27a1cf",
 +    sha1 = "d164de1dac18c4ca80a1b783d879c97449909c3b",
 +    src_sha1 = "02c0caba292b1cb74cec1d36c6f91dc863c89b5a",
  )
  
  maven_jar(
-     name = "jetty_util",
+     name = "jetty-util",
      artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
 -    sha1 = "d6ec1a1613c7fa72aa6bf5d8c204750afbc3df3b",
 -    src_sha1 = "a74ecb43f96b2e21852f6908604316d7348a16ad",
 +    sha1 = "f0f25aa2f27d618a04bc7356fa247ae4a05245b3",
 +    src_sha1 = "4e5c4c483cfd9804c2fc5d5751866243bbb9d740",
  )
diff --cc org.eclipse.jgit.test/tests.bzl
index 64dfe071cf,f368000b21..bc06e3ef40
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@@ -4,62 -4,58 +4,62 @@@ 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",
+             ]
  
-     heap_size = "-Xmx256m"
-     if src.endswith("HugeCommitMessageTest.java"):
-       heap_size = "-Xmx512m"
++        heap_size = "-Xmx256m"
++        if src.endswith("HugeCommitMessageTest.java"):
++            heap_size = "-Xmx512m"
 +
-     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 = [heap_size, "-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"],
++            jvm_flags = [heap_size, "-Dfile.encoding=UTF-8"],
+         )