From 2abb5d7da861052bfe349101e04b4f818673fc9b Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Tue, 25 May 2021 12:10:25 +0200 Subject: [PATCH 1/8] Generate Sentry BOM Fixes #1484 --- sentry-bom/build.gradle.kts | 20 ++++++++++++++++++++ settings.gradle.kts | 1 + 2 files changed, 21 insertions(+) create mode 100644 sentry-bom/build.gradle.kts diff --git a/sentry-bom/build.gradle.kts b/sentry-bom/build.gradle.kts new file mode 100644 index 00000000000..2f53a00f831 --- /dev/null +++ b/sentry-bom/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + `java-platform` // used to build Maven BOM + `maven-publish` +} + +dependencies { + project.parent!!.subprojects + .filter { !it.name.startsWith("sentry-samples") && it.name != project.name && it.name != "sentry-test-support" } + .forEach { + constraints.add("api", "${it.group}:${it.name}:${it.version}") + } +} + +publishing { + publications { + create("maven") { + from(components["javaPlatform"]) + } + } +} diff --git a/settings.gradle.kts b/settings.gradle.kts index b9eeab38d9b..c14fa8660df 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,6 +16,7 @@ include( "sentry-apache-http-client-5", "sentry-spring", "sentry-spring-boot-starter", + "sentry-bom", "sentry-samples:sentry-samples-android", "sentry-samples:sentry-samples-console", "sentry-samples:sentry-samples-jul", From f7f6d503abe22b1f553764ab13a6a9af2a5dae2b Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Tue, 25 May 2021 12:11:45 +0200 Subject: [PATCH 2/8] Changelog. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83c246756c4..3ce35ea08e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * Feat: OkHttp callback for Customising the Span (#1478) * Feat: Add breadcrumb in Spring RestTemplate integration (#1481) * Fix: Cloning Stack (#1483) +* Feat: Generate Sentry BOM (#1486) # 5.0.0-beta.4 From 801170c6869c88eb2abf2097e4bf98dc0d1c986d Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Fri, 28 May 2021 11:11:21 +0200 Subject: [PATCH 3/8] fix --- sentry-bom/build.gradle.kts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sentry-bom/build.gradle.kts b/sentry-bom/build.gradle.kts index 2f53a00f831..9704afbc6e9 100644 --- a/sentry-bom/build.gradle.kts +++ b/sentry-bom/build.gradle.kts @@ -4,10 +4,14 @@ plugins { } dependencies { - project.parent!!.subprojects - .filter { !it.name.startsWith("sentry-samples") && it.name != project.name && it.name != "sentry-test-support" } - .forEach { - constraints.add("api", "${it.group}:${it.name}:${it.version}") + constraints { + project.rootProject.subprojects + .filter { !it.name.startsWith("sentry-samples") && + it.name != project.name && + it.name != "sentry-test-support" } + .forEach { + api(it) + } } } From 91741f36c14abb2df1a7b01152e3bac6125feb84 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Fri, 28 May 2021 11:22:23 +0200 Subject: [PATCH 4/8] fix format --- sentry-bom/build.gradle.kts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sentry-bom/build.gradle.kts b/sentry-bom/build.gradle.kts index 9704afbc6e9..943d8c1987c 100644 --- a/sentry-bom/build.gradle.kts +++ b/sentry-bom/build.gradle.kts @@ -6,9 +6,11 @@ plugins { dependencies { constraints { project.rootProject.subprojects - .filter { !it.name.startsWith("sentry-samples") && - it.name != project.name && - it.name != "sentry-test-support" } + .filter { + !it.name.startsWith("sentry-samples") && + it.name != project.name && + it.name != "sentry-test-support" + } .forEach { api(it) } From bf425d511746782ee51a9ac475fa353997d6f34e Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Wed, 23 Jun 2021 17:31:14 +0200 Subject: [PATCH 5/8] Generate different maven command to release a bom module. --- scripts/release.kts | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/scripts/release.kts b/scripts/release.kts index 0b1c80b37c3..51ac1a04a40 100644 --- a/scripts/release.kts +++ b/scripts/release.kts @@ -49,6 +49,7 @@ File(path) .forEach { folder -> val path = folder.path val module = folder.name + val pomFile = "$path/pom-default.xml" val file: String @@ -56,22 +57,34 @@ File(path) .listFiles { it -> it.name.contains("release") && it.extension == "aar" } .firstOrNull() - if (androidFile != null) { - file = androidFile.path + val bomFile = folder + .listFiles { it -> it.extension == "jar" } + .isEmpty() + + if (bomFile) { + val command = "./mvnw gpg:sign-and-deploy-file " + + "-Dfile=$pomFile " + + "-DpomFile=$pomFile " + + "-DrepositoryId=$repositoryId " + + "-Durl=$repositoryUrl " + + "--settings $settingsPath" + println(command) } else { - file = "$path/$module.jar" - } + if (androidFile != null) { + file = androidFile.path + } else { + file = "$path/$module.jar" + } - val javadocFile = "$path/$module-javadoc.jar" - val sourcesFile = "$path/$module-sources.jar" - val pomFile = "$path/pom-default.xml" + val javadocFile = "$path/$module-javadoc.jar" + val sourcesFile = "$path/$module-sources.jar" - // requires GnuPG installed to sign files - // using 'gpg:sign-and-deploy-file' because 'deploy:deploy-file' does not upload - // .asc files. - // TODO: find out where to set keyId, password and secretKeyRingFile if you have - // more than one. - val command = "./mvnw gpg:sign-and-deploy-file " + + // requires GnuPG installed to sign files + // using 'gpg:sign-and-deploy-file' because 'deploy:deploy-file' does not upload + // .asc files. + // TODO: find out where to set keyId, password and secretKeyRingFile if you have + // more than one. + val command = "./mvnw gpg:sign-and-deploy-file " + "-Dfile=$file " + "-Dfiles=$javadocFile,$sourcesFile " + "-Dclassifiers=sources,javadoc " + @@ -80,7 +93,8 @@ File(path) "-DrepositoryId=$repositoryId " + "-Durl=$repositoryUrl " + "--settings $settingsPath" - println(command) + println(command) + } } /** From dad436d0497c3fa6477cead86892b37c1794e822 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Wed, 23 Jun 2021 17:37:10 +0200 Subject: [PATCH 6/8] Bring back accidentally removed changelog entry. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b159008b08..c8c75bb57b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ Thank you: * Feat: OkHttp callback for Customising the Span (#1478) * Feat: Add breadcrumb in Spring RestTemplate integration (#1481) * Fix: Cloning Stack (#1483) +* Feat: Add coroutines support (#1479) ## 5.0.0-beta.4 From 1693577f3f9d4888908d3c476ac8df8e2e8deb69 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Thu, 24 Jun 2021 10:23:45 +0200 Subject: [PATCH 7/8] Changelog. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8c75bb57b7..359d8676d4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Fix: Handling missing Spring Security on classpath on Java 8 (#1552) * Feat: Support transaction waiting for children to finish. (#1535) * Feat: Capture logged marker in log4j2 and logback appenders (#1551) +* Feat: Generate Sentry BOM (#1486) ## 5.1.0-beta.1 @@ -51,7 +52,6 @@ Thank you: ## 5.0.0-beta.6 -* Feat: Generate Sentry BOM (#1486) * Feat: Add secondary constructor to SentryOkHttpInterceptor (#1491) * Feat: Add option to enable debug mode in Log4j2 integration (#1492) * Ref: Replace clone() with copy constructor (#1496) From 0f56092880cf08c4d06ab7bd43dc10abf67cde14 Mon Sep 17 00:00:00 2001 From: Manoel Aranda Neto Date: Wed, 28 Jul 2021 13:07:45 +0200 Subject: [PATCH 8/8] release: 5.1.0-beta.8 --- CHANGELOG.md | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 220625ffb9b..b1c5072fde9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## 5.1.0-beta.8 * Feat: Generate Sentry BOM (#1486) diff --git a/gradle.properties b/gradle.properties index d5d81ad0032..303afea30bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ android.useAndroidX=true # Release information buildVersionCode=20077 -versionName=5.1.0-beta.8-SNAPSHOT +versionName=5.1.0-beta.8 # disable renderscript, it's enabled by default android.defaults.buildfeatures.renderscript=false