Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse2019-11-26 03:42:10 -0500
committerDavid Pursehouse2019-11-26 03:42:14 -0500
commit839359425d619db31584955f4e0fb0d19ed4cfb8 (patch)
tree685d4da1e4decfd5f7255e484b62888f2ef4d47d
parent5c40f12e20d339653f6d6964990c3eff11fa491c (diff)
parentda06f23c9289445effde55b506c55c49ffdb31eb (diff)
downloadjgit-stable-5.3.tar.gz
jgit-stable-5.3.tar.xz
jgit-stable-5.3.zip
Merge branch 'stable-5.2' into stable-5.3stable-5.3
* stable-5.2: Bazel: Use java_plugin and java_binary from @rules_java in jmh.bzl Bazel: Add missing newlines at end of BUILD files Change-Id: Ie5e66f2e26c057c81101b0d110f91ea479eb362d Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
-rw-r--r--lib/jmh/BUILD2
-rw-r--r--org.eclipse.jgit.benchmarks/BUILD2
-rw-r--r--tools/bzl/jmh.bzl8
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/jmh/BUILD b/lib/jmh/BUILD
index deb2a78def..b15e66c2b9 100644
--- a/lib/jmh/BUILD
+++ b/lib/jmh/BUILD
@@ -9,4 +9,4 @@ java_library(
"@jopt//jar",
"@math3//jar",
],
-) \ No newline at end of file
+)
diff --git a/org.eclipse.jgit.benchmarks/BUILD b/org.eclipse.jgit.benchmarks/BUILD
index 3c6ff0e12b..7e331b101a 100644
--- a/org.eclipse.jgit.benchmarks/BUILD
+++ b/org.eclipse.jgit.benchmarks/BUILD
@@ -10,4 +10,4 @@ jmh_java_benchmarks(
deps = [
"//org.eclipse.jgit:jgit",
],
-) \ No newline at end of file
+)
diff --git a/tools/bzl/jmh.bzl b/tools/bzl/jmh.bzl
index eee9ed02c6..a51a42cf33 100644
--- a/tools/bzl/jmh.bzl
+++ b/tools/bzl/jmh.bzl
@@ -41,6 +41,8 @@
# Definitions to run jmh microbenchmarks
+load("@rules_java//java:defs.bzl", "java_binary", "java_plugin")
+
def jmh_java_benchmarks(name, srcs, deps = [], tags = [], plugins = [], **kwargs):
"""Builds runnable JMH benchmarks.
This rule builds a runnable target for one or more JMH benchmarks
@@ -48,14 +50,14 @@ def jmh_java_benchmarks(name, srcs, deps = [], tags = [], plugins = [], **kwargs
except for main_class.
"""
plugin_name = "_{}_jmh_annotation_processor".format(name)
- native.java_plugin(
+ java_plugin(
name = plugin_name,
deps = ["//lib/jmh:jmh"],
processor_class = "org.openjdk.jmh.generators.BenchmarkProcessor",
visibility = ["//visibility:private"],
tags = tags,
)
- native.java_binary(
+ java_binary(
name = name,
srcs = srcs,
main_class = "org.openjdk.jmh.Main",
@@ -63,4 +65,4 @@ def jmh_java_benchmarks(name, srcs, deps = [], tags = [], plugins = [], **kwargs
plugins = plugins + [plugin_name],
tags = tags,
**kwargs
- ) \ No newline at end of file
+ )

Back to the top