From 81ecae61c62b09fb991e4b549b86c9925899908c Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Wed, 12 Oct 2022 16:32:41 +0200
Subject: [PATCH] Filter java_export source jar based on deploy_env

The project jar has entries coming from the deploy_env filtered out.
This commit ensures that the same filtering applies to source jars.
---
 private/rules/maven_project_jar.bzl           |  4 ++-
 tests/integration/java_export/BUILD           | 28 +++++++++++++++++++
 .../java_export/check-deploy-env-sources.sh   | 24 ++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100755 tests/integration/java_export/check-deploy-env-sources.sh

diff --git a/private/rules/maven_project_jar.bzl b/private/rules/maven_project_jar.bzl
index f9ac932e..909a619e 100644
--- a/private/rules/maven_project_jar.bzl
+++ b/private/rules/maven_project_jar.bzl
@@ -39,7 +39,9 @@ def _maven_project_jar_impl(ctx):
         ctx,
         ctx.executable._merge_jars,
         depset(artifact_srcs),
-        depset(transitive = [ji.transitive_source_jars for ji in info.dep_infos.to_list()]),
+        depset(transitive =
+                   [ji.transitive_source_jars for ji in info.dep_infos.to_list()] +
+                   [jar[JavaInfo].transitive_source_jars for jar in ctx.attr.deploy_env]),
         src_jar,
     )
 
diff --git a/tests/integration/java_export/BUILD b/tests/integration/java_export/BUILD
index 0a09c760..079d924d 100644
--- a/tests/integration/java_export/BUILD
+++ b/tests/integration/java_export/BUILD
@@ -116,3 +116,31 @@ sh_test(
         "@bazel_tools//tools/bash/runfiles",
     ],
 )
+
+filegroup(
+    name = "deploy-env-sources",
+    srcs = [":deploy-env-project"],
+    output_group = "maven_source",
+)
+
+genrule(
+    name = "list-deploy-env-sources",
+    srcs = [
+        ":deploy-env-sources",
+    ],
+    outs = ["sources.txt"],
+    cmd = "for SRC in $(SRCS); do jar tf $$SRC >> $@; done",
+)
+
+sh_test(
+    name = "check-deploy-env-sources",
+    srcs = [
+        "check-deploy-env-sources.sh",
+    ],
+    data = [
+        ":sources.txt",
+    ],
+    deps = [
+        "@bazel_tools//tools/bash/runfiles",
+    ],
+)
diff --git a/tests/integration/java_export/check-deploy-env-sources.sh b/tests/integration/java_export/check-deploy-env-sources.sh
new file mode 100755
index 00000000..a406d847
--- /dev/null
+++ b/tests/integration/java_export/check-deploy-env-sources.sh
@@ -0,0 +1,24 @@
+# --- begin runfiles.bash initialization v2 ---
+# Copy-pasted from the Bazel Bash runfiles library v2.
+set -uo pipefail; f=bazel_tools/tools/bash/runfiles/runfiles.bash
+source "${RUNFILES_DIR:-/dev/null}/$f" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "${RUNFILES_MANIFEST_FILE:-/dev/null}" | cut -f2- -d' ')" 2>/dev/null || \
+  source "$0.runfiles/$f" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "$0.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+  source "$(grep -sm1 "^$f " "$0.exe.runfiles_manifest" | cut -f2- -d' ')" 2>/dev/null || \
+  { echo>&2 "ERROR: cannot find $f"; exit 1; }; f=; set -e
+# --- end runfiles.bash initialization v2 ---
+
+set -euox pipefail
+
+sources_file=$(rlocation rules_jvm_external/tests/integration/java_export/sources.txt)
+
+if grep -q Dependency.java "$sources_file"; then
+  echo "Unexpectedly found dependency source file in jar"
+  exit 1
+fi
+
+if ! grep -q Main.java "$sources_file"; then
+  echo "Missing main source file from jar"
+  exit 1
+fi