Propagate .jdeps for java_import

java/common/rules/impl/bazel_java_import_impl.bzl

@@ -117,14 +117,21 @@ def bazel_java_import_rule(
 
     jdeps_artifact = None
     merged_java_info = java_common.merge(all_deps)
+
+    # import_deps_check is always run to generate the jdeps proto for downstream compile actions,
+    # but may be silenced.
     if not skip_incomplete_deps_check and "incomplete-deps" not in ctx.attr.tags:
-        jdeps_artifact = import_deps_check(
-            ctx,
-            collected_jars,
-            merged_java_info.compile_jars,
-            merged_java_info.transitive_compile_time_jars,
-            "java_import",
-        )
+        checking_mode = "error"
+    else:
+        checking_mode = "silence"
+    jdeps_artifact = import_deps_check(
+        ctx,
+        collected_jars,
+        merged_java_info.compile_jars,
+        merged_java_info.transitive_compile_time_jars,
+        "java_import",
+        checking_mode = checking_mode,
+    )
 
     compilation_to_runtime_jar_map = _process_with_ijars_if_needed(collected_jars, ctx)
     runtime_deps_list = [runtime_dep[JavaInfo] for runtime_dep in runtime_deps if JavaInfo in runtime_dep]
@@ -134,6 +141,7 @@ def bazel_java_import_rule(
         java_infos.append(JavaInfo(
             output_jar = jar,
             compile_jar = compilation_to_runtime_jar_map[jar],
+            compile_jdeps = jdeps_artifact,
             deps = all_deps,
             runtime_deps = runtime_deps_list,
             neverlink = neverlink,

java/common/rules/impl/import_deps_check.bzl

@@ -23,7 +23,8 @@ def import_deps_check(
         jars_to_check,
         declared_deps,
         transitive_deps,
-        rule_class):
+        rule_class,
+        checking_mode = "error"):
     """
     Creates actions that checks import deps for java rules.
 
@@ -33,6 +34,7 @@ def import_deps_check(
       declared_deps: (list[File]) A list of direct dependencies.
       transitive_deps: (list[File]) A list of transitive dependencies.
       rule_class: (String) Rule class.
+      checking_mode: (String) One of "error", "warning" or "silence".
 
     Returns:
       (File) Output file of the created action.
@@ -53,9 +55,11 @@ def import_deps_check(
         before_each = "--classpath_entry",
     )
     args.add_all(java_toolchain.bootclasspath, before_each = "--bootclasspath_entry")
-    args.add("--checking_mode=error")
+    args.add(checking_mode, format = "--checking_mode=%s")
     args.add("--jdeps_output", jdeps_output)
-    args.add("--rule_label", ctx.label)
+
+    # ctx.label can start with an @ and must not be understood as a flagfile.
+    args.add(ctx.label, format = "--rule_label=%s")
 
     semantics.update_args_for_import_deps(ctx, args)
     inputs = depset(

test/java/common/rules/java_import_tests.bzl

@@ -178,6 +178,59 @@ def _test_deps_impl(env, targets):
         "{package}/depjar.jar",
     ])
 
+# Regression test for https://github.com/bazelbuild/rules_java/issues/362: an import with deps
+# records a jdeps proto as its compile_jdeps so that reduced classpaths of downstream compilations
+# are not missing its transitive dependencies.
+def _test_compile_jdeps_propagated_for_deps(name):
+    util.helper_target(
+        java_import,
+        name = name + "/import-jar",
+        jars = ["import.jar"],
+        deps = [name + "/depjar"],
+    )
+    util.helper_target(
+        java_import,
+        name = name + "/incomplete-jar",
+        jars = ["incomplete.jar"],
+        deps = [name + "/depjar"],
+        tags = ["incomplete-deps"],
+    )
+    util.helper_target(
+        java_import,
+        name = name + "/depjar",
+        jars = ["depjar.jar"],
+    )
+
+    analysis_test(
+        name = name,
+        impl = _test_compile_jdeps_propagated_for_deps_impl,
+        targets = {
+            "with_deps": name + "/import-jar",
+            "without_deps": name + "/depjar",
+        },
+        # Requires the rules_java Starlark implementation to be used.
+        attr_values = {"tags": ["min_bazel_9"]},
+    )
+
+def _test_compile_jdeps_propagated_for_deps_impl(env, targets):
+    with_deps = [
+        f.basename
+        for f in targets.with_deps[JavaInfo]._compile_time_java_dependencies.to_list()
+    ]
+    env.expect.that_collection(with_deps).contains_exactly(["jdeps.proto"])
+
+    incomplete_deps = [
+        f.basename
+        for f in targets.without_deps[JavaInfo]._compile_time_java_dependencies.to_list()
+    ]
+    env.expect.that_collection(incomplete_deps).contains_exactly(["jdeps.proto"])
+
+    without_deps = [
+        f.basename
+        for f in targets.without_deps[JavaInfo]._compile_time_java_dependencies.to_list()
+    ]
+    env.expect.that_collection(without_deps).contains_exactly(["jdeps.proto"])
+
 # Regression test for b/262751943.
 def _test_commandline_contains_target_label(name):
     util.helper_target(
@@ -959,6 +1012,7 @@ def java_import_tests(name):
             _test_simple,
             _test_with_java_library,
             _test_deps,
+            _test_compile_jdeps_propagated_for_deps,
             _test_commandline_contains_target_label,
             _test_java_library_allows_import_in_deps,
             _test_module_flags,

toolchains/default_java_toolchain.bzl

@@ -76,6 +76,7 @@ _DEFAULT_JAVA_LANGUAGE_VERSION = "11"
 
 # Default java_toolchain parameters
 _BASE_TOOLCHAIN_CONFIGURATION = dict(
+    deps_checker = Label("@remote_java_tools//:ImportDepsChecker"),
     forcibly_disable_header_compilation = False,
     genclass = Label("@remote_java_tools//:GenClass"),
     header_compiler = Label("@remote_java_tools//:TurbineDirect"),