cherry-pick vinnybod/fix-issue-1498

Author: vinnybod

private/rules/maven_utils.bzl

@@ -101,10 +101,6 @@ def generate_pom(
         "{classifier}": unpacked_coordinates.classifier or "jar",
     }
 
-    for key in exclusions:
-        if key not in versioned_dep_coordinates and key not in unversioned_dep_coordinates:
-            fail("Key %s in exclusions does not occur in versioned_dep_coordinates or unversioned_dep_coordinates" % key)
-
     if parent:
         # We only want the groupId, artifactID, and version
         unpacked_parent = _unpack_coordinates(parent)

tests/integration/pom_file/BUILD

@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 load("@aspect_bazel_lib//lib:diff_test.bzl", "diff_test")
 load("//:defs.bzl", "artifact", "java_export")
 
@@ -234,6 +235,50 @@ diff_test(
     file2 = "pom-with-maven-defined-exclusions.golden.xml",
 )
 
+####
+# Test for transitive dependency with maven.artifact() exclusions
+####
+
+# Scenario 1: java_export -> java_export -> guava (with exclusions)
+# The intermediate java_export should have guava with exclusions in ITS pom.
+# The top-level java_export should only have the intermediate library in its pom.
+
+java_export(
+    name = "intermediate-library-export",
+    srcs = ["OtherLibrary.java"],
+    maven_coordinates = "com.example:intermediate:1.0.0",
+    deps = [
+        "@pom_exclusion_testing_coursier//:com_google_guava_guava",
+    ],
+)
+
+# Verify that the intermediate library's POM has guava WITH exclusions
+diff_test(
+    name = "validate-intermediate-library-pom",
+    file1 = ":intermediate-library-export-pom",
+    file2 = "pom-intermediate-library.golden.xml",
+)
+
+java_export(
+    name = "pom-transitive-dep-with-exclusions",
+    srcs = ["PomExample.java"],
+    maven_coordinates = "com.example:app:1.0.0",
+    deps = [
+        ":intermediate-library-export",
+    ],
+)
+
+# Verify that the top-level POM only has the intermediate library (not guava)
+diff_test(
+    name = "validate-pom-transitive-dep-with-exclusions",
+    file1 = ":pom-transitive-dep-with-exclusions-pom",
+    file2 = "pom-transitive-dep-with-exclusions.golden.xml",
+)
+
+# Scenario 2: java_export -> java_library (no maven_coordinates) -> guava
+# The java_library is bundled into the java_export, so guava becomes a
+# direct dependency of the java_export's POM (with exclusions).
+
 java_library(
     name = "other-library",
     srcs = ["OtherLibrary.java"],
@@ -242,13 +287,18 @@ java_library(
     ],
 )
 
-# This is to ensure that the guava dependency appears in the pom.xml with the correct exclusions,
-# even though it is not directly on the java_export, it is on the java_library dep.
 java_export(
-    name = "pom-transitive-exclusion",
+    name = "pom-bundled-dep-with-exclusions",
     srcs = ["PomExample.java"],
     maven_coordinates = "com.example:app:1.0.0",
     deps = [
         ":other-library",
     ],
 )
+
+# Verify that guava (with exclusions) appears in the POM since the helper is bundled
+diff_test(
+    name = "validate-pom-bundled-dep-with-exclusions",
+    file1 = ":pom-bundled-dep-with-exclusions-pom",
+    file2 = "pom-with-maven-defined-exclusions.golden.xml",
+)

tests/integration/pom_file/pom-intermediate-library.golden.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>intermediate</artifactId>
+    <version>1.0.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.errorprone</groupId>
+                    <artifactId>error_prone_annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>

tests/integration/pom_file/pom-transitive-dep-with-exclusions.golden.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.example</groupId>
+    <artifactId>app</artifactId>
+    <version>1.0.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.example</groupId>
+            <artifactId>intermediate</artifactId>
+            <version>1.0.0</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>