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>
diff --git a/WORKSPACE b/WORKSPACE index 0fff5f9..df99c95 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -40,43 +40,43 @@ ) maven_jar( - name = "commons_codec", + name = "commons-codec", artifact = "commons-codec:commons-codec:1.4", sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a", ) maven_jar( - name = "commons_logging", + name = "commons-logging", artifact = "commons-logging:commons-logging:1.1.3", sha1 = "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f", ) maven_jar( - name = "log_api", + name = "log-api", artifact = "org.slf4j:slf4j-api:1.7.2", sha1 = "0081d61b7f33ebeab314e07de0cc596f8e858d97", ) maven_jar( - name = "slf4j_simple", + name = "slf4j-simple", artifact = "org.slf4j:slf4j-simple:1.7.2", sha1 = "760055906d7353ba4f7ce1b8908bc6b2e91f39fa", ) maven_jar( - name = "servlet_api_3_1", + name = "servlet-api-3_1", artifact = "javax.servlet:javax.servlet-api:3.1.0", sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c", ) maven_jar( - name = "commons_compress", + name = "commons-compress", artifact = "org.apache.commons:commons-compress:1.15", sha1 = "b686cd04abaef1ea7bc5e143c080563668eec17e", ) maven_jar( - name = "tukaani_xz", + name = "tukaani-xz", artifact = "org.tukaani:xz:1.6", sha1 = "05b6f921f1810bdf90e25471968f741f87168b64", ) @@ -94,13 +94,13 @@ ) maven_jar( - name = "hamcrest_library", + name = "hamcrest-library", artifact = "org.hamcrest:hamcrest-library:1.3", sha1 = "4785a3c21320980282f9f33d0d1264a69040538f", ) maven_jar( - name = "hamcrest_core", + name = "hamcrest-core", artifact = "org.hamcrest:hamcrest-core:1.3", sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0", ) @@ -114,42 +114,42 @@ JETTY_VER = "9.4.8.v20171121" maven_jar( - name = "jetty_servlet", + name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, sha1 = "bbbb9b5de08f468c7b9b3de6aea0b098d2c679b6", src_sha1 = "6ef1e65a5af7ab2d79ba6043923affdaeaafb1e5", ) maven_jar( - name = "jetty_security", + name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, sha1 = "e8350eec683b55494287f06740543e4be6f75425", src_sha1 = "e3a879d8675fa10bc305e7a59006f1d09db04a68", ) maven_jar( - name = "jetty_server", + name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, sha1 = "34614bd9a29de57ef28ca31f1f2b49a412af196d", src_sha1 = "fef49ac6b2bbc6d142dc0be34f68f0fb0792d52b", ) maven_jar( - name = "jetty_http", + name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, sha1 = "9879d6c4e37400bf43f0cd4b3c6e34a3ba409864", src_sha1 = "5e746cd0ccb732eef0427c8c4b9dcb034e26c61b", ) maven_jar( - name = "jetty_io", + name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, sha1 = "d3fe2dfa62f52ee91ff07cb359f63387e0e30b40", src_sha1 = "41f25e1e1bba14ab0d3415488fa189f09c27a1cf", ) maven_jar( - name = "jetty_util", + name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, sha1 = "d6ec1a1613c7fa72aa6bf5d8c204750afbc3df3b", src_sha1 = "a74ecb43f96b2e21852f6908604316d7348a16ad",
diff --git a/lib/BUILD b/lib/BUILD index 10496a7..0e659e5 100644 --- a/lib/BUILD +++ b/lib/BUILD
@@ -13,19 +13,19 @@ "//org.eclipse.jgit.archive:__pkg__", "//org.eclipse.jgit.pgm.test:__pkg__", ], - exports = ["@commons_compress//jar"], + exports = ["@commons-compress//jar"], ) java_library( name = "commons-codec", - exports = ["@commons_codec//jar"], + exports = ["@commons-codec//jar"], ) java_library( name = "commons-logging", testonly = 1, visibility = ["//visibility:public"], - exports = ["@commons_logging//jar"], + exports = ["@commons-logging//jar"], ) java_library( @@ -68,7 +68,7 @@ name = "jetty-http", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty_http//jar"], + exports = ["@jetty-http//jar"], runtime_deps = [":commons-codec"], ) @@ -76,35 +76,35 @@ name = "jetty-io", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty_io//jar"], + exports = ["@jetty-io//jar"], ) java_library( name = "jetty-security", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty_security//jar"], + exports = ["@jetty-security//jar"], ) java_library( name = "jetty-server", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty_server//jar"], + exports = ["@jetty-server//jar"], ) java_library( name = "jetty-servlet", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty_servlet//jar"], + exports = ["@jetty-servlet//jar"], ) java_library( name = "jetty-util", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jetty_util//jar"], + exports = ["@jetty-util//jar"], ) java_library( @@ -130,8 +130,8 @@ testonly = 1, visibility = ["//visibility:public"], exports = [ - "@hamcrest_core//jar", - "@hamcrest_library//jar", + "@hamcrest-core//jar", + "@hamcrest-library//jar", "@junit//jar", ], ) @@ -147,25 +147,25 @@ "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], - exports = ["@servlet_api_3_1//jar"], + exports = ["@servlet-api-3_1//jar"], ) java_library( name = "slf4j-api", visibility = ["//visibility:public"], - exports = ["@log_api//jar"], + exports = ["@log-api//jar"], ) java_library( name = "slf4j-simple", testonly = 1, visibility = ["//visibility:public"], - exports = ["@slf4j_simple//jar"], + exports = ["@slf4j-simple//jar"], ) java_library( name = "xz", testonly = 1, visibility = ["//visibility:public"], - exports = ["@tukaani_xz//jar"], + exports = ["@tukaani-xz//jar"], )
diff --git a/org.eclipse.jgit.pgm/BUILD b/org.eclipse.jgit.pgm/BUILD index bbf4b1c..ddc84be 100644 --- a/org.eclipse.jgit.pgm/BUILD +++ b/org.eclipse.jgit.pgm/BUILD
@@ -27,8 +27,8 @@ java_binary( name = "jgit", - runtime_deps = [":pgm"], main_class = "org.eclipse.jgit.pgm.Main", + runtime_deps = [":pgm"], ) java_import(
diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl index b1b7b7a..f368000 100644 --- a/org.eclipse.jgit.test/tests.bzl +++ b/org.eclipse.jgit.test/tests.bzl
@@ -4,58 +4,58 @@ ) 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"], + )
diff --git a/tools/bazlets.bzl b/tools/bazlets.bzl index e14e488..f97b72c 100644 --- a/tools/bazlets.bzl +++ b/tools/bazlets.bzl
@@ -1,17 +1,16 @@ NAME = "com_googlesource_gerrit_bazlets" def load_bazlets( - commit, - local_path = None - ): - if not local_path: - native.git_repository( - name = NAME, - remote = "https://gerrit.googlesource.com/bazlets", - commit = commit, - ) - else: - native.local_repository( - name = NAME, - path = local_path, - ) + commit, + local_path = None): + if not local_path: + native.git_repository( + name = NAME, + remote = "https://gerrit.googlesource.com/bazlets", + commit = commit, + ) + else: + native.local_repository( + name = NAME, + path = local_path, + )