[bazel] Make sure maven artifacts use generated modules

Author: shs96c

java/private/export.bzl

@@ -61,6 +61,14 @@ def java_export(
        tags = tags,
     )
 
+    native.filegroup(
+        name = "%s-maven-module" % name,
+        srcs = [
+            ":%s-module" % name,
+        ],
+        output_group = "module_jar",
+    )
+
     javadoc(
         name = "%s-docs" % name,
         deps = [
@@ -79,7 +87,7 @@ def java_export(
         coordinates = maven_coordinates,
         pom = "%s-pom" % name,
         javadocs = "%s-docs" % name,
-        artifact_jar = ":%s-maven-artifact" % name,
+        artifact_jar = ":%s-maven-module" % name,
         source_jar = ":%s-maven-source" % name,
         visibility = visibility,
     )

java/private/module.bzl

@@ -173,6 +173,11 @@ def _java_module_impl(ctx):
             name = name,
             module_path = depset(direct = [module_jar], transitive = [info.module_path for info in all_infos]),
         ),
+        OutputGroupInfo(
+            module_jar = [module_jar],
+            module_source = [src_jar],
+            _source_jars = [src_jar],
+        ),
         java_info,
     ]