diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2019-11-26 17:41:04 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2019-11-26 17:41:10 +0900 |
| commit | da06f23c9289445effde55b506c55c49ffdb31eb (patch) | |
| tree | 35134e81e1b2c1329af77ce63799a234ec8d6676 | |
| parent | 4dd85d9bf32361c512c3ffa165e6adfc176a30c3 (diff) | |
| parent | 7554bdfad5be0eff0b95dcfcec11a2cb19883b18 (diff) | |
| download | jgit-da06f23c9289445effde55b506c55c49ffdb31eb.tar.gz jgit-da06f23c9289445effde55b506c55c49ffdb31eb.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Bazel: Use java_plugin and java_binary from @rules_java in jmh.bzl
Bazel: Add missing newlines at end of BUILD files
Change-Id: Ic1dc84a6c4a1cf430d329627642583fd6e0d0eaa
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| -rw-r--r-- | lib/jmh/BUILD | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit.benchmarks/BUILD | 2 | ||||
| -rw-r--r-- | tools/bzl/jmh.bzl | 8 |
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 + ) |