-
Notifications
You must be signed in to change notification settings - Fork 141
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
junit: Do not depend on
junit-jupiter-engine
The user has to add and control this dependency themselves if they want to use JUnit 5. Even if we added it, Maven resolution mechanics mean that we do not control the version anyway. This fixes an issue introduced by 1ca007d. See junit-team/junit5#3441 (comment) Also require fixing an issue in rules_jvm_external that results in neverlink deps not appearing on the javadoc classpath.
- Loading branch information
Showing
3 changed files
with
42 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
third_party/rules_jvm_external-add-neverlink-deps-to-javadoc-classpath.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
From 920048a2b213e2c7cb6ce679ffa5a414054339f6 Mon Sep 17 00:00:00 2001 | ||
From: Fabian Meumertzheim <[email protected]> | ||
Date: Fri, 1 Sep 2023 22:12:42 +0200 | ||
Subject: [PATCH] Add compile-only deps to javadocs classpath | ||
|
||
javadoc may have to inspect compile-only dependencies. | ||
|
||
Also removes a line that only added elements to a depset that are | ||
already contained in this depset. | ||
--- | ||
private/rules/javadoc.bzl | 9 ++++++--- | ||
1 file changed, 6 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/private/rules/javadoc.bzl b/private/rules/javadoc.bzl | ||
index 325aced1..3261248a 100644 | ||
--- a/private/rules/javadoc.bzl | ||
+++ b/private/rules/javadoc.bzl | ||
@@ -21,9 +21,12 @@ def _javadoc_impl(ctx): | ||
|
||
jar_file = ctx.actions.declare_file("%s.jar" % ctx.attr.name) | ||
|
||
- # Gather additional files to add to the classpath | ||
- additional_deps = depset(transitive = [dep[JavaInfo].transitive_runtime_jars for dep in ctx.attr.deps]) | ||
- classpath = depset(transitive = [dep[JavaInfo].transitive_runtime_jars for dep in ctx.attr.deps] + [additional_deps]) | ||
+ # javadoc may need to inspect compile-time dependencies (neverlink) | ||
+ # of the runtime classpath. | ||
+ classpath = depset( | ||
+ transitive = [dep[JavaInfo].transitive_runtime_jars for dep in ctx.attr.deps] + | ||
+ [dep[JavaInfo].transitive_compile_time_jars for dep in ctx.attr.deps], | ||
+ ) | ||
|
||
# javadoc options and javac options overlap, but we cannot | ||
# necessarily rely on those to derive the javadoc options we need |