From b99c5205f36f9be946b4a445ca3f971113cbc702 Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Tue, 31 Jan 2023 08:52:37 +0100
Subject: [PATCH 1/2] Fix Sentry BOM containing wrong artifacts

---
 sentry-bom/build.gradle.kts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/sentry-bom/build.gradle.kts b/sentry-bom/build.gradle.kts
index 5be72d9abb..9f0a0ff117 100644
--- a/sentry-bom/build.gradle.kts
+++ b/sentry-bom/build.gradle.kts
@@ -9,10 +9,21 @@ dependencies {
             .filter {
                 !it.name.startsWith("sentry-samples") &&
                     it.name != project.name &&
-                    it.name != "sentry-test-support"
+                    !it.name.contains("test", ignoreCase = true) &&
+                    it.name != "sentry-compose-helper"
             }
-            .forEach {
-                api(it)
+            .forEach { project ->
+                evaluationDependsOn(project.path)
+                project.publishing.publications
+                    .mapNotNull { it as? MavenPublication }
+                    .filter {
+                        !it.artifactId.endsWith("-kotlinMultiplatform") &&
+                            !it.artifactId.endsWith("-metadata")
+                    }
+                    .forEach {
+                        val dependency = "${it.groupId}:${it.artifactId}:${it.version}"
+                        api(dependency)
+                    }
             }
     }
 }

From b970e9eaf27895247a095816e753d6d5693d4a43 Mon Sep 17 00:00:00 2001
From: Roman Zavarnitsyn <rom4ek93@gmail.com>
Date: Tue, 31 Jan 2023 09:00:52 +0100
Subject: [PATCH 2/2] Changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d335ce1acb..934195a436 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Fix `sentry-bom` containing incorrect artifacts ([#2504](https://github.com/getsentry/sentry-java/pull/2504))
+
 ### Dependencies
 
 - Bump Native SDK from v0.5.3 to v0.5.4 ([#2500](https://github.com/getsentry/sentry-java/pull/2500))