Skip to content

Commit ce156f2

Browse files
authored
fix: remove google-cloud-bigtable-deps-bom from gapic-libraries-bom (#13209)
b/513135317
1 parent ce9c504 commit ce156f2

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

gapic-libraries-bom/pom.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -301,13 +301,6 @@
301301
<type>pom</type>
302302
<scope>import</scope>
303303
</dependency>
304-
<dependency>
305-
<groupId>com.google.cloud</groupId>
306-
<artifactId>google-cloud-bigtable-deps-bom</artifactId>
307-
<version>2.78.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-deps:current} -->
308-
<type>pom</type>
309-
<scope>import</scope>
310-
</dependency>
311304
<dependency>
312305
<groupId>com.google.cloud</groupId>
313306
<artifactId>google-cloud-billing-bom</artifactId>
@@ -1536,4 +1529,4 @@
15361529
</dependency>
15371530
</dependencies>
15381531
</dependencyManagement>
1539-
</project>
1532+
</project>

sdk-platform-java/hermetic_build/library_generation/utils/pom_generator.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def __search_for_bom_artifact(
9494
) -> List[BomConfig]:
9595
repo = Path(repository_path).resolve()
9696
module_exclusions = ["gapic-libraries-bom"]
97+
sub_module_exclusions = ["google-cloud-bigtable-deps-bom"]
9798
group_id_inclusions = [
9899
"com.google.cloud",
99100
"com.google.analytics",
@@ -104,7 +105,11 @@ def __search_for_bom_artifact(
104105
if module.is_file() or module.name in module_exclusions:
105106
continue
106107
for sub_module in module.iterdir():
107-
if sub_module.is_dir() and sub_module.name.endswith("-bom"):
108+
if (
109+
sub_module.is_dir()
110+
and sub_module.name.endswith("-bom")
111+
and sub_module.name not in sub_module_exclusions
112+
):
108113
root = etree.parse(f"{sub_module}/pom.xml").getroot()
109114
group_id = root.find(f"{project_tag}{group_id_tag}").text
110115
if group_id not in group_id_inclusions:

0 commit comments

Comments
 (0)