From ee5eb8eee28dd1eec1916760a0ba3432bd306b70 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Thu, 3 Jul 2025 21:09:40 +0100 Subject: Restore WORKSPACE and Bazel 7.6.1 The current master branch is not buildable with Gerrit Code Review because of the different versions of Bazel and the use of bzlmods instead of WORKSPACE. The support for Bazel was introduced for allowing to build JGit from source together with the Gerrit Code Review build; having two different dependencies models and versions of Bazel would diverge from its original goal. Also re-apply the following dependencies updates: - ff407588c Update jetty to 12.0.23 - efe2e4d44 Update bytebuddy to 1.17.6 - 5606070e1 Update bouncycastle to 1.81 - f5071dbfb Update mockito to 5.18.0 - 30b9c446f Update com.google.code.gson:gson to 2.13.1 NOTE: This change *should be reverted* once Gerrit Code Review dependencies are also migrated to bzlmod and the version is bumped to Bazel 8. Change-Id: I587d615137b80d242135c581e75d512a15c99917 --- .bazelrc | 5 + .bazelversion | 2 +- MODULE.bazel | 103 +----------------- MODULE.bazel.lock | 221 ------------------------------------- WORKSPACE | 319 +++++++++++++++++++++++++++++++++++++++++++++++++++++- lib/BUILD | 107 ++++++++++-------- lib/jmh/BUILD | 8 +- tools/bazlets.bzl | 18 +++ 8 files changed, 411 insertions(+), 372 deletions(-) delete mode 100644 MODULE.bazel.lock create mode 100644 tools/bazlets.bzl (limited to '*') diff --git a/.bazelrc b/.bazelrc index 0006880b93..0712ec22bf 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,3 +1,8 @@ +# TODO(davido): Migrate all dependencies from WORKSPACE to MODULE.bazel +# https://issues.gerritcodereview.com/issues/303819949 +common --noenable_bzlmod +common --enable_workspace + build --workspace_status_command="python3 ./tools/workspace_status.py" build --repository_cache=~/.gerritcodereview/bazel-cache/repository build --incompatible_strict_action_env diff --git a/.bazelversion b/.bazelversion index 2b0aa21219..e8be68404b 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -8.2.1 +7.6.1 diff --git a/MODULE.bazel b/MODULE.bazel index a221efae73..0b932b8d8c 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,101 +1,2 @@ -module(name = "jgit", version = "7.4.0") - -bazel_dep(name = "rules_java", version = "8.11.0") -bazel_dep(name = "rules_jvm_external", version = "6.7") - -register_toolchains("//tools:error_prone_warnings_toolchain_java17_definition") - -register_toolchains("//tools:error_prone_warnings_toolchain_java21_definition") - -git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") - -git_repository( - name = "com_googlesource_gerrit_bazlets", - commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f", - remote = "https://gerrit.googlesource.com/bazlets", -) - -http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -http_archive( - name = "ubuntu2204_jdk17", - sha256 = "8ea82b81c9707e535ff93ef5349d11e55b2a23c62bcc3b0faaec052144aed87d", - strip_prefix = "rbe_autoconfig-5.1.0", - urls = [ - "https://gerrit-bazel.storage.googleapis.com/rbe_autoconfig/v5.1.0.tar.gz", - "https://github.com/davido/rbe_autoconfig/releases/download/v5.1.0/v5.1.0.tar.gz", - ], -) - -BOUNCYCASTLE_VERSION = "1.81" - -BYTE_BUDDY_VERSION = "1.17.6" - -JETTY_VERSION = "12.0.23" - -JMH_VERSION = "1.37" - -JNA_VERSION = "5.17.0" - -SLF4J_VERSION = "1.7.36" - -SSHD_VERSION = "2.15.0" - -maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") -maven.install( - name = "jgit_deps", - artifacts = [ - "args4j:args4j:2.37", - "com.google.code.gson:gson:2.13.1", - "com.google.errorprone:error_prone_type_annotations:2.38.0", - "com.googlecode.javaewah:JavaEWAH:1.2.3", - "com.jcraft:jsch:0.1.55", - "com.jcraft:jzlib:1.1.3", - "commons-codec:commons-codec:1.18.0", - "commons-io:commons-io:2.19.0", - "commons-logging:commons-logging:1.3.5", - "jakarta.servlet:jakarta.servlet-api:6.1.0", - "junit:junit:4.13.2", - "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - "net.java.dev.jna:jna-platform:" + JNA_VERSION, - "net.java.dev.jna:jna:" + JNA_VERSION, - "net.sf.jopt-simple:jopt-simple:5.0.4", - "org.apache.commons:commons-compress:1.27.1", - "org.apache.commons:commons-lang3:3.17.0", - "org.apache.commons:commons-math3:3.6.1", - "org.apache.httpcomponents:httpclient:4.5.14", - "org.apache.httpcomponents:httpcore:4.4.16", - "org.apache.sshd:sshd-osgi:" + SSHD_VERSION, - "org.apache.sshd:sshd-sftp:" + SSHD_VERSION, - "org.assertj:assertj-core:3.27.3", - "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VERSION, - "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VERSION, - "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VERSION, - "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VERSION, - "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VERSION, - "org.eclipse.jetty:jetty-http:" + JETTY_VERSION, - "org.eclipse.jetty:jetty-io:" + JETTY_VERSION, - "org.eclipse.jetty:jetty-security:" + JETTY_VERSION, - "org.eclipse.jetty:jetty-server:" + JETTY_VERSION, - "org.eclipse.jetty:jetty-session:" + JETTY_VERSION, - "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VERSION, - "org.eclipse.jetty:jetty-util:" + JETTY_VERSION, - "org.hamcrest:hamcrest:2.2", - "org.mockito:mockito-core:5.18.0", - "org.objenesis:objenesis:3.4", - "org.openjdk.jmh:jmh-core:" + JMH_VERSION, - "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERSION, - "org.slf4j:slf4j-api:" + SLF4J_VERSION, - "org.slf4j:slf4j-simple:" + SLF4J_VERSION, - "org.tukaani:xz:1.10", - ], - duplicate_version_warning = "error", - fail_on_missing_checksum = True, - fetch_sources = True, - repositories = [ - "https://repo1.maven.org/maven2", - ], - strict_visibility = True, -) -use_repo(maven, "jgit_deps") +# TODO(davido): Migrate all dependencies from WORKSPACE to MODULE.bazel +# https://issues.gerritcodereview.com/issues/303819949 diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock deleted file mode 100644 index bdc8104794..0000000000 --- a/MODULE.bazel.lock +++ /dev/null @@ -1,221 +0,0 @@ -{ - "lockFileVersion": 18, - "registryFileHashes": { - "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497", - "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2", - "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/MODULE.bazel": "70390338f7a5106231d20620712f7cccb659cd0e9d073d1991c038eb9fc57589", - "https://bcr.bazel.build/modules/abseil-cpp/20230125.1/MODULE.bazel": "89047429cb0207707b2dface14ba7f8df85273d484c2572755be4bab7ce9c3a0", - "https://bcr.bazel.build/modules/abseil-cpp/20230802.0.bcr.1/MODULE.bazel": "1c8cec495288dccd14fdae6e3f95f772c1c91857047a098fad772034264cc8cb", - "https://bcr.bazel.build/modules/abseil-cpp/20230802.0/MODULE.bazel": "d253ae36a8bd9ee3c5955384096ccb6baf16a1b1e93e858370da0a3b94f77c16", - "https://bcr.bazel.build/modules/abseil-cpp/20230802.1/MODULE.bazel": "fa92e2eb41a04df73cdabeec37107316f7e5272650f81d6cc096418fe647b915", - "https://bcr.bazel.build/modules/abseil-cpp/20240116.1/MODULE.bazel": "37bcdb4440fbb61df6a1c296ae01b327f19e9bb521f9b8e26ec854b6f97309ed", - "https://bcr.bazel.build/modules/abseil-cpp/20240116.1/source.json": "9be551b8d4e3ef76875c0d744b5d6a504a27e3ae67bc6b28f46415fd2d2957da", - "https://bcr.bazel.build/modules/bazel_features/1.1.1/MODULE.bazel": "27b8c79ef57efe08efccbd9dd6ef70d61b4798320b8d3c134fd571f78963dbcd", - "https://bcr.bazel.build/modules/bazel_features/1.11.0/MODULE.bazel": "f9382337dd5a474c3b7d334c2f83e50b6eaedc284253334cf823044a26de03e8", - "https://bcr.bazel.build/modules/bazel_features/1.15.0/MODULE.bazel": "d38ff6e517149dc509406aca0db3ad1efdd890a85e049585b7234d04238e2a4d", - "https://bcr.bazel.build/modules/bazel_features/1.17.0/MODULE.bazel": "039de32d21b816b47bd42c778e0454217e9c9caac4a3cf8e15c7231ee3ddee4d", - "https://bcr.bazel.build/modules/bazel_features/1.18.0/MODULE.bazel": "1be0ae2557ab3a72a57aeb31b29be347bcdc5d2b1eb1e70f39e3851a7e97041a", - "https://bcr.bazel.build/modules/bazel_features/1.19.0/MODULE.bazel": "59adcdf28230d220f0067b1f435b8537dd033bfff8db21335ef9217919c7fb58", - "https://bcr.bazel.build/modules/bazel_features/1.21.0/MODULE.bazel": "675642261665d8eea09989aa3b8afb5c37627f1be178382c320d1b46afba5e3b", - "https://bcr.bazel.build/modules/bazel_features/1.21.0/source.json": "3e8379efaaef53ce35b7b8ba419df829315a880cb0a030e5bb45c96d6d5ecb5f", - "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7", - "https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a", - "https://bcr.bazel.build/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8", - "https://bcr.bazel.build/modules/bazel_skylib/1.1.1/MODULE.bazel": "1add3e7d93ff2e6998f9e118022c84d163917d912f5afafb3058e3d2f1545b5e", - "https://bcr.bazel.build/modules/bazel_skylib/1.2.0/MODULE.bazel": "44fe84260e454ed94ad326352a698422dbe372b21a1ac9f3eab76eb531223686", - "https://bcr.bazel.build/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a", - "https://bcr.bazel.build/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5", - "https://bcr.bazel.build/modules/bazel_skylib/1.4.1/MODULE.bazel": "a0dcb779424be33100dcae821e9e27e4f2901d9dfd5333efe5ac6a8d7ab75e1d", - "https://bcr.bazel.build/modules/bazel_skylib/1.4.2/MODULE.bazel": "3bd40978e7a1fac911d5989e6b09d8f64921865a45822d8b09e815eaa726a651", - "https://bcr.bazel.build/modules/bazel_skylib/1.5.0/MODULE.bazel": "32880f5e2945ce6a03d1fbd588e9198c0a959bb42297b2cfaf1685b7bc32e138", - "https://bcr.bazel.build/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917", - "https://bcr.bazel.build/modules/bazel_skylib/1.7.0/MODULE.bazel": "0db596f4563de7938de764cc8deeabec291f55e8ec15299718b93c4423e9796d", - "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/MODULE.bazel": "3120d80c5861aa616222ec015332e5f8d3171e062e3e804a2a0253e1be26e59b", - "https://bcr.bazel.build/modules/bazel_skylib/1.7.1/source.json": "f121b43eeefc7c29efbd51b83d08631e2347297c95aac9764a701f2a6a2bb953", - "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", - "https://bcr.bazel.build/modules/buildozer/7.1.2/source.json": "c9028a501d2db85793a6996205c8de120944f50a0d570438fcae0457a5f9d1f8", - "https://bcr.bazel.build/modules/google_benchmark/1.8.2/MODULE.bazel": "a70cf1bba851000ba93b58ae2f6d76490a9feb74192e57ab8e8ff13c34ec50cb", - "https://bcr.bazel.build/modules/googletest/1.11.0/MODULE.bazel": "3a83f095183f66345ca86aa13c58b59f9f94a2f81999c093d4eeaa2d262d12f4", - "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/MODULE.bazel": "22c31a561553727960057361aa33bf20fb2e98584bc4fec007906e27053f80c6", - "https://bcr.bazel.build/modules/googletest/1.14.0.bcr.1/source.json": "41e9e129f80d8c8bf103a7acc337b76e54fad1214ac0a7084bf24f4cd924b8b4", - "https://bcr.bazel.build/modules/googletest/1.14.0/MODULE.bazel": "cfbcbf3e6eac06ef9d85900f64424708cc08687d1b527f0ef65aa7517af8118f", - "https://bcr.bazel.build/modules/jsoncpp/1.9.5/MODULE.bazel": "31271aedc59e815656f5736f282bb7509a97c7ecb43e927ac1a37966e0578075", - "https://bcr.bazel.build/modules/jsoncpp/1.9.5/source.json": "4108ee5085dd2885a341c7fab149429db457b3169b86eb081fa245eadf69169d", - "https://bcr.bazel.build/modules/libpfm/4.11.0/MODULE.bazel": "45061ff025b301940f1e30d2c16bea596c25b176c8b6b3087e92615adbd52902", - "https://bcr.bazel.build/modules/platforms/0.0.10/MODULE.bazel": "8cb8efaf200bdeb2150d93e162c40f388529a25852b332cec879373771e48ed5", - "https://bcr.bazel.build/modules/platforms/0.0.10/source.json": "f22828ff4cf021a6b577f1bf6341cb9dcd7965092a439f64fc1bb3b7a5ae4bd5", - "https://bcr.bazel.build/modules/platforms/0.0.4/MODULE.bazel": "9b328e31ee156f53f3c416a64f8491f7eb731742655a47c9eec4703a71644aee", - "https://bcr.bazel.build/modules/platforms/0.0.5/MODULE.bazel": "5733b54ea419d5eaf7997054bb55f6a1d0b5ff8aedf0176fef9eea44f3acda37", - "https://bcr.bazel.build/modules/platforms/0.0.6/MODULE.bazel": "ad6eeef431dc52aefd2d77ed20a4b353f8ebf0f4ecdd26a807d2da5aa8cd0615", - "https://bcr.bazel.build/modules/platforms/0.0.7/MODULE.bazel": "72fd4a0ede9ee5c021f6a8dd92b503e089f46c227ba2813ff183b71616034814", - "https://bcr.bazel.build/modules/platforms/0.0.8/MODULE.bazel": "9f142c03e348f6d263719f5074b21ef3adf0b139ee4c5133e2aa35664da9eb2d", - "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel": "a5a29bb89544f9b97edce05642fac225a808b5b7be74038ea3640fae2f8e66a7", - "https://bcr.bazel.build/modules/protobuf/27.0/MODULE.bazel": "7873b60be88844a0a1d8f80b9d5d20cfbd8495a689b8763e76c6372998d3f64c", - "https://bcr.bazel.build/modules/protobuf/27.1/MODULE.bazel": "703a7b614728bb06647f965264967a8ef1c39e09e8f167b3ca0bb1fd80449c0d", - "https://bcr.bazel.build/modules/protobuf/29.0-rc2/MODULE.bazel": "6241d35983510143049943fc0d57937937122baf1b287862f9dc8590fc4c37df", - "https://bcr.bazel.build/modules/protobuf/29.0/MODULE.bazel": "319dc8bf4c679ff87e71b1ccfb5a6e90a6dbc4693501d471f48662ac46d04e4e", - "https://bcr.bazel.build/modules/protobuf/29.0/source.json": "b857f93c796750eef95f0d61ee378f3420d00ee1dd38627b27193aa482f4f981", - "https://bcr.bazel.build/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0", - "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e", - "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/source.json": "be4789e951dd5301282729fe3d4938995dc4c1a81c2ff150afc9f1b0504c6022", - "https://bcr.bazel.build/modules/re2/2023-09-01/MODULE.bazel": "cb3d511531b16cfc78a225a9e2136007a48cf8a677e4264baeab57fe78a80206", - "https://bcr.bazel.build/modules/re2/2023-09-01/source.json": "e044ce89c2883cd957a2969a43e79f7752f9656f6b20050b62f90ede21ec6eb4", - "https://bcr.bazel.build/modules/rules_android/0.1.1/MODULE.bazel": "48809ab0091b07ad0182defb787c4c5328bd3a278938415c00a7b69b50c4d3a8", - "https://bcr.bazel.build/modules/rules_android/0.1.1/source.json": "e6986b41626ee10bdc864937ffb6d6bf275bb5b9c65120e6137d56e6331f089e", - "https://bcr.bazel.build/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647", - "https://bcr.bazel.build/modules/rules_cc/0.0.10/MODULE.bazel": "ec1705118f7eaedd6e118508d3d26deba2a4e76476ada7e0e3965211be012002", - "https://bcr.bazel.build/modules/rules_cc/0.0.13/MODULE.bazel": "0e8529ed7b323dad0775ff924d2ae5af7640b23553dfcd4d34344c7e7a867191", - "https://bcr.bazel.build/modules/rules_cc/0.0.14/MODULE.bazel": "5e343a3aac88b8d7af3b1b6d2093b55c347b8eefc2e7d1442f7a02dc8fea48ac", - "https://bcr.bazel.build/modules/rules_cc/0.0.15/MODULE.bazel": "6704c35f7b4a72502ee81f61bf88706b54f06b3cbe5558ac17e2e14666cd5dcc", - "https://bcr.bazel.build/modules/rules_cc/0.0.16/MODULE.bazel": "7661303b8fc1b4d7f532e54e9d6565771fea666fbdf839e0a86affcd02defe87", - "https://bcr.bazel.build/modules/rules_cc/0.0.17/MODULE.bazel": "2ae1d8f4238ec67d7185d8861cb0a2cdf4bc608697c331b95bf990e69b62e64a", - "https://bcr.bazel.build/modules/rules_cc/0.0.17/source.json": "4db99b3f55c90ab28d14552aa0632533e3e8e5e9aea0f5c24ac0014282c2a7c5", - "https://bcr.bazel.build/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c", - "https://bcr.bazel.build/modules/rules_cc/0.0.6/MODULE.bazel": "abf360251023dfe3efcef65ab9d56beefa8394d4176dd29529750e1c57eaa33f", - "https://bcr.bazel.build/modules/rules_cc/0.0.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", - "https://bcr.bazel.build/modules/rules_cc/0.0.9/MODULE.bazel": "836e76439f354b89afe6a911a7adf59a6b2518fafb174483ad78a2a2fde7b1c5", - "https://bcr.bazel.build/modules/rules_foreign_cc/0.9.0/MODULE.bazel": "c9e8c682bf75b0e7c704166d79b599f93b72cfca5ad7477df596947891feeef6", - "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/MODULE.bazel": "40c97d1144356f52905566c55811f13b299453a14ac7769dfba2ac38192337a8", - "https://bcr.bazel.build/modules/rules_fuzzing/0.5.2/source.json": "c8b1e2c717646f1702290959a3302a178fb639d987ab61d548105019f11e527e", - "https://bcr.bazel.build/modules/rules_java/4.0.0/MODULE.bazel": "5a78a7ae82cd1a33cef56dc578c7d2a46ed0dca12643ee45edbb8417899e6f74", - "https://bcr.bazel.build/modules/rules_java/5.3.5/MODULE.bazel": "a4ec4f2db570171e3e5eb753276ee4b389bae16b96207e9d3230895c99644b86", - "https://bcr.bazel.build/modules/rules_java/6.0.0/MODULE.bazel": "8a43b7df601a7ec1af61d79345c17b31ea1fedc6711fd4abfd013ea612978e39", - "https://bcr.bazel.build/modules/rules_java/6.4.0/MODULE.bazel": "e986a9fe25aeaa84ac17ca093ef13a4637f6107375f64667a15999f77db6c8f6", - "https://bcr.bazel.build/modules/rules_java/6.5.2/MODULE.bazel": "1d440d262d0e08453fa0c4d8f699ba81609ed0e9a9a0f02cd10b3e7942e61e31", - "https://bcr.bazel.build/modules/rules_java/7.10.0/MODULE.bazel": "530c3beb3067e870561739f1144329a21c851ff771cd752a49e06e3dc9c2e71a", - "https://bcr.bazel.build/modules/rules_java/7.12.2/MODULE.bazel": "579c505165ee757a4280ef83cda0150eea193eed3bef50b1004ba88b99da6de6", - "https://bcr.bazel.build/modules/rules_java/7.2.0/MODULE.bazel": "06c0334c9be61e6cef2c8c84a7800cef502063269a5af25ceb100b192453d4ab", - "https://bcr.bazel.build/modules/rules_java/7.3.2/MODULE.bazel": "50dece891cfdf1741ea230d001aa9c14398062f2b7c066470accace78e412bc2", - "https://bcr.bazel.build/modules/rules_java/7.6.1/MODULE.bazel": "2f14b7e8a1aa2f67ae92bc69d1ec0fa8d9f827c4e17ff5e5f02e91caa3b2d0fe", - "https://bcr.bazel.build/modules/rules_java/8.11.0/MODULE.bazel": "c3d280bc5ff1038dcb3bacb95d3f6b83da8dd27bba57820ec89ea4085da767ad", - "https://bcr.bazel.build/modules/rules_java/8.11.0/source.json": "302b52a39259a85aa06ca3addb9787864ca3e03b432a5f964ea68244397e7544", - "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel": "a56b85e418c83eb1839819f0b515c431010160383306d13ec21959ac412d2fe7", - "https://bcr.bazel.build/modules/rules_jvm_external/5.1/MODULE.bazel": "33f6f999e03183f7d088c9be518a63467dfd0be94a11d0055fe2d210f89aa909", - "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036", - "https://bcr.bazel.build/modules/rules_jvm_external/5.3/MODULE.bazel": "bf93870767689637164657731849fb887ad086739bd5d360d90007a581d5527d", - "https://bcr.bazel.build/modules/rules_jvm_external/6.1/MODULE.bazel": "75b5fec090dbd46cf9b7d8ea08cf84a0472d92ba3585b476f44c326eda8059c4", - "https://bcr.bazel.build/modules/rules_jvm_external/6.3/MODULE.bazel": "c998e060b85f71e00de5ec552019347c8bca255062c990ac02d051bb80a38df0", - "https://bcr.bazel.build/modules/rules_jvm_external/6.7/MODULE.bazel": "e717beabc4d091ecb2c803c2d341b88590e9116b8bf7947915eeb33aab4f96dd", - "https://bcr.bazel.build/modules/rules_jvm_external/6.7/source.json": "5426f412d0a7fc6b611643376c7e4a82dec991491b9ce5cb1cfdd25fe2e92be4", - "https://bcr.bazel.build/modules/rules_kotlin/1.9.0/MODULE.bazel": "ef85697305025e5a61f395d4eaede272a5393cee479ace6686dba707de804d59", - "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/MODULE.bazel": "d269a01a18ee74d0335450b10f62c9ed81f2321d7958a2934e44272fe82dcef3", - "https://bcr.bazel.build/modules/rules_kotlin/1.9.6/source.json": "2faa4794364282db7c06600b7e5e34867a564ae91bda7cae7c29c64e9466b7d5", - "https://bcr.bazel.build/modules/rules_license/0.0.3/MODULE.bazel": "627e9ab0247f7d1e05736b59dbb1b6871373de5ad31c3011880b4133cafd4bd0", - "https://bcr.bazel.build/modules/rules_license/0.0.7/MODULE.bazel": "088fbeb0b6a419005b89cf93fe62d9517c0a2b8bb56af3244af65ecfe37e7d5d", - "https://bcr.bazel.build/modules/rules_license/1.0.0/MODULE.bazel": "a7fda60eefdf3d8c827262ba499957e4df06f659330bbe6cdbdb975b768bb65c", - "https://bcr.bazel.build/modules/rules_license/1.0.0/source.json": "a52c89e54cc311196e478f8382df91c15f7a2bfdf4c6cd0e2675cc2ff0b56efb", - "https://bcr.bazel.build/modules/rules_pkg/0.7.0/MODULE.bazel": "df99f03fc7934a4737122518bb87e667e62d780b610910f0447665a7e2be62dc", - "https://bcr.bazel.build/modules/rules_pkg/1.0.1/MODULE.bazel": "5b1df97dbc29623bccdf2b0dcd0f5cb08e2f2c9050aab1092fd39a41e82686ff", - "https://bcr.bazel.build/modules/rules_pkg/1.0.1/source.json": "bd82e5d7b9ce2d31e380dd9f50c111d678c3bdaca190cb76b0e1c71b05e1ba8a", - "https://bcr.bazel.build/modules/rules_proto/4.0.0/MODULE.bazel": "a7a7b6ce9bee418c1a760b3d84f83a299ad6952f9903c67f19e4edd964894e06", - "https://bcr.bazel.build/modules/rules_proto/5.3.0-21.7/MODULE.bazel": "e8dff86b0971688790ae75528fe1813f71809b5afd57facb44dad9e8eca631b7", - "https://bcr.bazel.build/modules/rules_proto/6.0.2/MODULE.bazel": "ce916b775a62b90b61888052a416ccdda405212b6aaeb39522f7dc53431a5e73", - "https://bcr.bazel.build/modules/rules_proto/7.0.2/MODULE.bazel": "bf81793bd6d2ad89a37a40693e56c61b0ee30f7a7fdbaf3eabbf5f39de47dea2", - "https://bcr.bazel.build/modules/rules_proto/7.0.2/source.json": "1e5e7260ae32ef4f2b52fd1d0de8d03b606a44c91b694d2f1afb1d3b28a48ce1", - "https://bcr.bazel.build/modules/rules_python/0.10.2/MODULE.bazel": "cc82bc96f2997baa545ab3ce73f196d040ffb8756fd2d66125a530031cd90e5f", - "https://bcr.bazel.build/modules/rules_python/0.23.1/MODULE.bazel": "49ffccf0511cb8414de28321f5fcf2a31312b47c40cc21577144b7447f2bf300", - "https://bcr.bazel.build/modules/rules_python/0.25.0/MODULE.bazel": "72f1506841c920a1afec76975b35312410eea3aa7b63267436bfb1dd91d2d382", - "https://bcr.bazel.build/modules/rules_python/0.28.0/MODULE.bazel": "cba2573d870babc976664a912539b320cbaa7114cd3e8f053c720171cde331ed", - "https://bcr.bazel.build/modules/rules_python/0.31.0/MODULE.bazel": "93a43dc47ee570e6ec9f5779b2e64c1476a6ce921c48cc9a1678a91dd5f8fd58", - "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel": "9208ee05fd48bf09ac60ed269791cf17fb343db56c8226a720fbb1cdf467166c", - "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7", - "https://bcr.bazel.build/modules/rules_python/0.40.0/source.json": "939d4bd2e3110f27bfb360292986bb79fd8dcefb874358ccd6cdaa7bda029320", - "https://bcr.bazel.build/modules/rules_shell/0.2.0/MODULE.bazel": "fda8a652ab3c7d8fee214de05e7a9916d8b28082234e8d2c0094505c5268ed3c", - "https://bcr.bazel.build/modules/rules_shell/0.3.0/MODULE.bazel": "de4402cd12f4cc8fda2354fce179fdb068c0b9ca1ec2d2b17b3e21b24c1a937b", - "https://bcr.bazel.build/modules/rules_shell/0.3.0/source.json": "c55ed591aa5009401ddf80ded9762ac32c358d2517ee7820be981e2de9756cf3", - "https://bcr.bazel.build/modules/stardoc/0.5.1/MODULE.bazel": "1a05d92974d0c122f5ccf09291442580317cdd859f07a8655f1db9a60374f9f8", - "https://bcr.bazel.build/modules/stardoc/0.5.3/MODULE.bazel": "c7f6948dae6999bf0db32c1858ae345f112cacf98f174c7a8bb707e41b974f1c", - "https://bcr.bazel.build/modules/stardoc/0.5.6/MODULE.bazel": "c43dabc564990eeab55e25ed61c07a1aadafe9ece96a4efabb3f8bf9063b71ef", - "https://bcr.bazel.build/modules/stardoc/0.7.0/MODULE.bazel": "05e3d6d30c099b6770e97da986c53bd31844d7f13d41412480ea265ac9e8079c", - "https://bcr.bazel.build/modules/stardoc/0.7.1/MODULE.bazel": "3548faea4ee5dda5580f9af150e79d0f6aea934fc60c1cc50f4efdd9420759e7", - "https://bcr.bazel.build/modules/stardoc/0.7.1/source.json": "b6500ffcd7b48cd72c29bb67bcac781e12701cc0d6d55d266a652583cfcdab01", - "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/MODULE.bazel": "7298990c00040a0e2f121f6c32544bab27d4452f80d9ce51349b1a28f3005c43", - "https://bcr.bazel.build/modules/zlib/1.2.11/MODULE.bazel": "07b389abc85fdbca459b69e2ec656ae5622873af3f845e1c9d80fe179f3effa0", - "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/MODULE.bazel": "af322bc08976524477c79d1e45e241b6efbeb918c497e8840b8ab116802dda79", - "https://bcr.bazel.build/modules/zlib/1.3.1.bcr.3/source.json": "2be409ac3c7601245958cd4fcdff4288be79ed23bd690b4b951f500d54ee6e7d", - "https://bcr.bazel.build/modules/zlib/1.3.1/MODULE.bazel": "751c9940dcfe869f5f7274e1295422a34623555916eb98c174c1e945594bf198" - }, - "selectedYankedVersions": {}, - "moduleExtensions": { - "@@platforms//host:extension.bzl%host_platform": { - "general": { - "bzlTransitiveDigest": "xelQcPZH8+tmuOHVjL9vDxMnnQNMlwj0SlvgoqBkm4U=", - "usagesDigest": "SeQiIN/f8/Qt9vYQk7qcXp4I4wJeEC0RnQDiaaJ4tb8=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "host_platform": { - "repoRuleId": "@@platforms//host:extension.bzl%host_platform_repo", - "attributes": {} - } - }, - "recordedRepoMappingEntries": [] - } - }, - "@@rules_kotlin+//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": { - "general": { - "bzlTransitiveDigest": "sFhcgPbDQehmbD1EOXzX4H1q/CD5df8zwG4kp4jbvr8=", - "usagesDigest": "QI2z8ZUR+mqtbwsf2fLqYdJAkPOHdOV+tF2yVAUgRzw=", - "recordedFileInputs": {}, - "recordedDirentsInputs": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "com_github_jetbrains_kotlin_git": { - "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:compiler.bzl%kotlin_compiler_git_repository", - "attributes": { - "urls": [ - "https://github.com/JetBrains/kotlin/releases/download/v1.9.23/kotlin-compiler-1.9.23.zip" - ], - "sha256": "93137d3aab9afa9b27cb06a824c2324195c6b6f6179d8a8653f440f5bd58be88" - } - }, - "com_github_jetbrains_kotlin": { - "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:compiler.bzl%kotlin_capabilities_repository", - "attributes": { - "git_repository_name": "com_github_jetbrains_kotlin_git", - "compiler_version": "1.9.23" - } - }, - "com_github_google_ksp": { - "repoRuleId": "@@rules_kotlin+//src/main/starlark/core/repositories:ksp.bzl%ksp_compiler_plugin_repository", - "attributes": { - "urls": [ - "https://github.com/google/ksp/releases/download/1.9.23-1.0.20/artifacts.zip" - ], - "sha256": "ee0618755913ef7fd6511288a232e8fad24838b9af6ea73972a76e81053c8c2d", - "strip_version": "1.9.23-1.0.20" - } - }, - "com_github_pinterest_ktlint": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_file", - "attributes": { - "sha256": "01b2e0ef893383a50dbeb13970fe7fa3be36ca3e83259e01649945b09d736985", - "urls": [ - "https://github.com/pinterest/ktlint/releases/download/1.3.0/ktlint" - ], - "executable": true - } - }, - "rules_android": { - "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", - "attributes": { - "sha256": "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806", - "strip_prefix": "rules_android-0.1.1", - "urls": [ - "https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip" - ] - } - } - }, - "recordedRepoMappingEntries": [ - [ - "rules_kotlin+", - "bazel_tools", - "bazel_tools" - ] - ] - } - } - } -} diff --git a/WORKSPACE b/WORKSPACE index 6ba4a02382..54ad8ae4fe 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,2 +1,317 @@ -# This file marks the root of the Bazel workspace. -# See MODULE.bazel for external dependencies setup. +workspace(name = "jgit") + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("//tools:bazlets.bzl", "load_bazlets") + +load_bazlets(commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f") + +load( + "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", + "maven_jar", +) + +http_archive( + name = "rules_java", + sha256 = "4da3761f6855ad916568e2bfe86213ba6d2637f56b8360538a7fb6125abf6518", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.5.0/rules_java-7.5.0.tar.gz", + ], +) + +load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") + +rules_java_dependencies() + +http_archive( + name = "ubuntu2204_jdk17", + sha256 = "8ea82b81c9707e535ff93ef5349d11e55b2a23c62bcc3b0faaec052144aed87d", + strip_prefix = "rbe_autoconfig-5.1.0", + urls = [ + "https://gerrit-bazel.storage.googleapis.com/rbe_autoconfig/v5.1.0.tar.gz", + "https://github.com/davido/rbe_autoconfig/releases/download/v5.1.0/v5.1.0.tar.gz", + ], +) + +register_toolchains("//tools:error_prone_warnings_toolchain_java17_definition") + +register_toolchains("//tools:error_prone_warnings_toolchain_java21_definition") + +# Order of registering toolchains matters. rules_java toolchains take precedence +# over the custom toolchains, so the default jdk21 toolchain gets picked +# (one without custom package_config). That's why the `rules_java_toolchains()` +# must be called after the `register_toolchain()` invocation. +rules_java_toolchains() + +JMH_VERS = "1.37" + +maven_jar( + name = "jmh-core", + artifact = "org.openjdk.jmh:jmh-core:" + JMH_VERS, + attach_source = False, + sha1 = "896f27e49105b35ea1964319c83d12082e7a79ef", +) + +maven_jar( + name = "jmh-annotations", + artifact = "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERS, + attach_source = False, + sha1 = "da93888682df163144edf9b13d2b78e54166063a", +) + +maven_jar( + name = "jopt", + artifact = "net.sf.jopt-simple:jopt-simple:5.0.4", + attach_source = False, + sha1 = "4fdac2fbe92dfad86aa6e9301736f6b4342a3f5c", +) + +maven_jar( + name = "math3", + artifact = "org.apache.commons:commons-math3:3.6.1", + attach_source = False, + sha1 = "e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf", +) + +maven_jar( + name = "jsch", + artifact = "com.jcraft:jsch:0.1.55", + sha1 = "bbd40e5aa7aa3cfad5db34965456cee738a42a50", +) + +maven_jar( + name = "jzlib", + artifact = "com.jcraft:jzlib:1.1.3", + sha1 = "c01428efa717624f7aabf4df319939dda9646b2d", +) + +maven_jar( + name = "javaewah", + artifact = "com.googlecode.javaewah:JavaEWAH:1.2.3", + sha1 = "13a27c856e0c8808cee9a64032c58eee11c3adc9", +) + +maven_jar( + name = "httpclient", + artifact = "org.apache.httpcomponents:httpclient:4.5.14", + sha1 = "1194890e6f56ec29177673f2f12d0b8e627dec98", +) + +maven_jar( + name = "httpcore", + artifact = "org.apache.httpcomponents:httpcore:4.4.16", + sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", +) + +SSHD_VERS = "2.15.0" + +maven_jar( + name = "sshd-osgi", + artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, + sha1 = "aa76898fe47eab7da0878dd60e6f3be5631e076c", +) + +maven_jar( + name = "sshd-sftp", + artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, + sha1 = "2e226055ed060c64ed76256a9c45de6d0109eef8", +) + +JNA_VERS = "5.17.0" + +maven_jar( + name = "jna", + artifact = "net.java.dev.jna:jna:" + JNA_VERS, + sha1 = "33d12735bef894440780fce64f9758d420c7bae2", +) + +maven_jar( + name = "jna-platform", + artifact = "net.java.dev.jna:jna-platform:" + JNA_VERS, + sha1 = "a4934c44d25a9d8c2ddf4203affd20330cb3426f", +) + +maven_jar( + name = "commons-codec", + artifact = "commons-codec:commons-codec:1.18.0", + sha1 = "ee45d1cf6ec2cc2b809ff04b4dc7aec858e0df8f", +) + +maven_jar( + name = "commons-logging", + artifact = "commons-logging:commons-logging:1.3.5", + sha1 = "a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1", +) + +maven_jar( + name = "log-api", + artifact = "org.slf4j:slf4j-api:1.7.36", + sha1 = "6c62681a2f655b49963a5983b8b0950a6120ae14", +) + +maven_jar( + name = "slf4j-simple", + artifact = "org.slf4j:slf4j-simple:1.7.36", + sha1 = "a41f9cfe6faafb2eb83a1c7dd2d0dfd844e2a936", +) + +maven_jar( + name = "servlet-api", + artifact = "jakarta.servlet:jakarta.servlet-api:6.1.0", + sha1 = "1169a246913fe3823782af7943e7a103634867c5", +) + +maven_jar( + name = "commons-compress", + artifact = "org.apache.commons:commons-compress:1.27.1", + sha1 = "a19151084758e2fbb6b41eddaa88e7b8ff4e6599", +) + +maven_jar( + name = "commons-lang3", + artifact = "org.apache.commons:commons-lang3:3.17.0", + sha1 = "b17d2136f0460dcc0d2016ceefca8723bdf4ee70", +) + +maven_jar( + name = "commons-io", + artifact = "commons-io:commons-io:2.19.0", + sha1 = "1f8d4a99ba72b77aa69101175efc79b0c7dcdd7e", +) + +maven_jar( + name = "tukaani-xz", + artifact = "org.tukaani:xz:1.10", + sha1 = "1be8166f89e035a56c6bfc67dbc423996fe577e2", +) + +maven_jar( + name = "args4j", + artifact = "args4j:args4j:2.37", + sha1 = "244f60c057d72a785227c0562d3560f42a7ea54b", +) + +maven_jar( + name = "junit", + artifact = "junit:junit:4.13.2", + sha1 = "8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12", +) + +maven_jar( + name = "hamcrest", + artifact = "org.hamcrest:hamcrest:2.2", + sha1 = "1820c0968dba3a11a1b30669bb1f01978a91dedc", +) + +maven_jar( + name = "mockito", + artifact = "org.mockito:mockito-core:5.18.0", + sha1 = "ab47dbbf954ffa2501f29000600742098617272d", +) + +maven_jar( + name = "assertj-core", + artifact = "org.assertj:assertj-core:3.27.3", + sha1 = "31f5d58a202bd5df4993fb10fa2cffd610c20d6f", +) + +BYTE_BUDDY_VERSION = "1.17.6" + +maven_jar( + name = "bytebuddy", + artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, + sha1 = "8c70cbc6950b2ae5291a98d5003e06406d633803", +) + +maven_jar( + name = "bytebuddy-agent", + artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, + sha1 = "17b32fd9f57deef02842f7f05abc4ad8127fe34e", +) + +maven_jar( + name = "objenesis", + artifact = "org.objenesis:objenesis:3.4", + sha1 = "675cbe121a68019235d27f6c34b4f0ac30e07418", +) + +maven_jar( + name = "gson", + artifact = "com.google.code.gson:gson:2.13.1", + sha1 = "853ce06c11316b33a8eae5e9095da096a9528b8f", +) + +JETTY_VER = "12.0.23" + +maven_jar( + name = "jetty-servlet", + artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, + sha1 = "0cfb3fd22fe5f298437932ae2b595c8bdbd393f0", +) + +maven_jar( + name = "jetty-security", + artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, + sha1 = "c6e862c78ce45dca1374d157e92eedc4450aa141", +) + +maven_jar( + name = "jetty-server", + artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, + sha1 = "c8618ac7741fd278dba2ff77c3cf5229e2235356", +) + +maven_jar( + name = "jetty-session", + artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, + sha1 = "a8fb8b2d7c85a6d7d7fc317cb8c7ecd3b31e5e27", +) + +maven_jar( + name = "jetty-http", + artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, + sha1 = "d4d3aa4670df0ec8a9b3abe15e14bf340f7e044e", +) + +maven_jar( + name = "jetty-io", + artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, + sha1 = "a9175176e1ace74311f91d9a5f491efc387b4e90", +) + +maven_jar( + name = "jetty-util", + artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, + sha1 = "aa47d314a3af553d9797ec0a89ab60c0b069fea2", +) + +maven_jar( + name = "jetty-util-ajax", + artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, + sha1 = "bb9da9974fcb8029ba3538e35ca9efbfe4e19fa8", +) + +BOUNCYCASTLE_VER = "1.81" + +maven_jar( + name = "bcpg", + artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, + sha1 = "7cd50193dd6a080a203716d993f7a246c8d94291", +) + +maven_jar( + name = "bcprov", + artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, + sha1 = "d17c094daef57dbd80af71687a475aa6df7cbe54", +) + +maven_jar( + name = "bcutil", + artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, + sha1 = "e2dd79395ab435094142b6aba219f35adcba0f01", +) + +maven_jar( + name = "bcpkix", + artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, + sha1 = "819fd6f5d170c8b8bf8c5acc73816e9c36574042", +) diff --git a/lib/BUILD b/lib/BUILD index cd96abd0b8..551383b79d 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -6,7 +6,7 @@ java_library( "//org.eclipse.jgit.pgm:__pkg__", "//org.eclipse.jgit.pgm.test:__pkg__", ], - exports = ["@jgit_deps//:args4j_args4j"], + exports = ["@args4j//jar"], ) java_library( @@ -16,7 +16,7 @@ java_library( "//org.eclipse.jgit.pgm.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_apache_commons_commons_compress"], + exports = ["@commons-compress//jar"], ) java_library( @@ -26,7 +26,7 @@ java_library( "//org.eclipse.jgit.pgm.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_apache_commons_commons_lang3"], + exports = ["@commons-lang3//jar"], ) java_library( @@ -36,7 +36,7 @@ java_library( "//org.eclipse.jgit.pgm.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:commons_io_commons_io"], + exports = ["@commons-io//jar"], ) java_library( @@ -45,13 +45,13 @@ java_library( "//org.eclipse.jgit:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:commons_codec_commons_codec"], + exports = ["@commons-codec//jar"], ) java_library( name = "commons-logging", visibility = ["//visibility:public"], - exports = ["@jgit_deps//:commons_logging_commons_logging"], + exports = ["@commons-logging//jar"], ) java_library( @@ -60,7 +60,7 @@ java_library( "//org.eclipse.jgit.lfs:__pkg__", "//org.eclipse.jgit.lfs.server:__pkg__", ], - exports = ["@jgit_deps//:com_google_code_gson_gson"], + exports = ["@gson//jar"], ) java_library( @@ -70,7 +70,7 @@ java_library( "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], - exports = ["@jgit_deps//:org_apache_httpcomponents_httpclient"], + exports = ["@httpclient//jar"], ) java_library( @@ -82,7 +82,7 @@ java_library( "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], - exports = ["@jgit_deps//:org_apache_httpcomponents_httpcore"], + exports = ["@httpcore//jar"], ) java_library( @@ -94,7 +94,7 @@ java_library( "//org.eclipse.jgit.ssh.apache.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_apache_sshd_sshd_osgi"], + exports = ["@sshd-osgi//jar"], ) java_library( @@ -105,7 +105,7 @@ java_library( "//org.eclipse.jgit.ssh.apache.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_apache_sshd_sshd_sftp"], + exports = ["@sshd-sftp//jar"], ) java_library( @@ -113,7 +113,7 @@ java_library( visibility = [ "//org.eclipse.jgit.ssh.apache.agent:__pkg__", ], - exports = ["@jgit_deps//:net_java_dev_jna_jna"], + exports = ["@jna//jar"], ) java_library( @@ -121,20 +121,20 @@ java_library( visibility = [ "//org.eclipse.jgit.ssh.apache.agent:__pkg__", ], - exports = ["@jgit_deps//:net_java_dev_jna_jna_platform"], + exports = ["@jna-platform//jar"], ) java_library( name = "javaewah", visibility = ["//visibility:public"], - exports = ["@jgit_deps//:com_googlecode_javaewah_JavaEWAH"], + exports = ["@javaewah//jar"], ) java_library( name = "jetty-http", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_eclipse_jetty_jetty_http"], + exports = ["@jetty-http//jar"], runtime_deps = [":commons-codec"], ) @@ -142,28 +142,28 @@ java_library( name = "jetty-io", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_eclipse_jetty_jetty_io"], + 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 = ["@jgit_deps//:org_eclipse_jetty_jetty_security"], + exports = ["@jetty-security//jar"], ) java_library( name = "jetty-session", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_eclipse_jetty_jetty_session"], + exports = ["@jetty-session//jar"], ) java_library( name = "jetty-server", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_eclipse_jetty_jetty_server"], + exports = ["@jetty-server//jar"], ) java_library( @@ -171,8 +171,8 @@ java_library( # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], exports = [ - "@jgit_deps//:org_eclipse_jetty_ee10_jetty_ee10_servlet", - "@jgit_deps//:org_eclipse_jetty_jetty_util_ajax", + "@jetty-servlet//jar", + "@jetty-util-ajax//jar", ], ) @@ -180,7 +180,28 @@ java_library( name = "jetty-util", # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_eclipse_jetty_jetty_util"], + exports = ["@jetty-util//jar"], +) + +java_library( + name = "jetty-ee10-nested", + # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. + visibility = ["//visibility:public"], + exports = ["@jetty-ee10-nested//jar"], +) + +java_library( + name = "jetty-ee10-security", + # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. + visibility = ["//visibility:public"], + exports = ["@jetty-ee10-security//jar"], +) + +java_library( + name = "jetty-ee10-servlet", + # TODO: This should be testonly but org.eclipse.jgit.pgm depends on it. + visibility = ["//visibility:public"], + exports = ["@jetty-ee10-servlet//jar"], ) java_library( @@ -190,7 +211,7 @@ java_library( "//org.eclipse.jgit.ssh.jsch:__pkg__", "//org.eclipse.jgit.ssh.jsch.test:__pkg__", ], - exports = ["@jgit_deps//:com_jcraft_jsch"], + exports = ["@jsch//jar"], ) java_library( @@ -202,7 +223,7 @@ java_library( "//org.eclipse.jgit.ssh.apache.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_bouncycastle_bcpg_jdk18on"], + exports = ["@bcpg//jar"], ) java_library( @@ -215,7 +236,7 @@ java_library( "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_bouncycastle_bcprov_jdk18on"], + exports = ["@bcprov//jar"], ) java_library( @@ -228,7 +249,7 @@ java_library( "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_bouncycastle_bcutil_jdk18on"], + exports = ["@bcutil//jar"], ) java_library( @@ -240,7 +261,7 @@ java_library( "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:org_bouncycastle_bcpkix_jdk18on"], + exports = ["@bcpkix//jar"], ) java_library( @@ -249,7 +270,7 @@ java_library( "//org.eclipse.jgit.ssh.jsch:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], - exports = ["@jgit_deps//:com_jcraft_jzlib"], + exports = ["@jzlib//jar"], ) java_library( @@ -257,12 +278,12 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@jgit_deps//:net_bytebuddy_byte_buddy_agent", - "@jgit_deps//:net_bytebuddy_byte_buddy", - "@jgit_deps//:org_hamcrest_hamcrest", - "@jgit_deps//:junit_junit", - "@jgit_deps//:org_mockito_mockito_core", - "@jgit_deps//:org_objenesis_objenesis", + "@bytebuddy-agent//jar", + "@bytebuddy//jar", + "@hamcrest//jar", + "@junit//jar", + "@mockito//jar", + "@objenesis//jar", ], ) @@ -271,10 +292,10 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@jgit_deps//:net_bytebuddy_byte_buddy_agent", - "@jgit_deps//:net_bytebuddy_byte_buddy", - "@jgit_deps//:org_mockito_mockito_core", - "@jgit_deps//:org_objenesis_objenesis", + "@bytebuddy-agent//jar", + "@bytebuddy//jar", + "@mockito//jar", + "@objenesis//jar", ], ) @@ -283,7 +304,7 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@jgit_deps//:org_assertj_assertj_core", + "@assertj-core//jar", ], ) @@ -298,24 +319,24 @@ java_library( "//org.eclipse.jgit.lfs.server.test:__pkg__", "//org.eclipse.jgit.pgm:__pkg__", ], - exports = ["@jgit_deps//:jakarta_servlet_jakarta_servlet_api_6_1_0"], + exports = ["@servlet-api//jar"], ) java_library( name = "slf4j-api", visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_slf4j_slf4j_api"], + exports = ["@log-api//jar"], ) java_library( name = "slf4j-simple", visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_slf4j_slf4j_simple"], + exports = ["@slf4j-simple//jar"], ) java_library( name = "xz", testonly = 1, visibility = ["//visibility:public"], - exports = ["@jgit_deps//:org_tukaani_xz"], + exports = ["@tukaani-xz//jar"], ) diff --git a/lib/jmh/BUILD b/lib/jmh/BUILD index 1bba1a5cb1..b15e66c2b9 100644 --- a/lib/jmh/BUILD +++ b/lib/jmh/BUILD @@ -4,9 +4,9 @@ java_library( name = "jmh", visibility = ["//visibility:public"], exports = [ - "@jgit_deps//:org_openjdk_jmh_jmh_generator_annprocess", - "@jgit_deps//:org_openjdk_jmh_jmh_core", - "@jgit_deps//:net_sf_jopt_simple_jopt_simple", - "@jgit_deps//:org_apache_commons_commons_math3", + "@jmh-annotations//jar", + "@jmh-core//jar", + "@jopt//jar", + "@math3//jar", ], ) diff --git a/tools/bazlets.bzl b/tools/bazlets.bzl new file mode 100644 index 0000000000..f089af473a --- /dev/null +++ b/tools/bazlets.bzl @@ -0,0 +1,18 @@ +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") + +NAME = "com_googlesource_gerrit_bazlets" + +def load_bazlets( + commit, + local_path = None): + if not local_path: + git_repository( + name = NAME, + remote = "https://gerrit.googlesource.com/bazlets", + commit = commit, + ) + else: + native.local_repository( + name = NAME, + path = local_path, + ) -- cgit v1.2.3