From 8ecd4093c494fc5182d42369ce337bd7d44aa8b7 Mon Sep 17 00:00:00 2001 From: Felix Klauke Date: Mon, 11 Jul 2022 11:06:00 +0200 Subject: [PATCH] Depend solely on the jwt dependency Remove userId from baggage due to PII (#2157) Rnemae jose dependency config name --- buildSrc/src/main/java/Config.kt | 3 ++- sentry-spring-boot-starter/build.gradle.kts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index d8dc6eabbd..fdb3c18061 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -5,6 +5,7 @@ object Config { val kotlinStdLib = "stdlib-jdk8" val springBootVersion = "2.6.8" + val springSecurityVersion = "5.6.5" val kotlinCompatibleLanguageVersion = "1.4" val composeVersion = "1.1.1" @@ -73,7 +74,7 @@ object Config { val springBootStarterAop = "org.springframework.boot:spring-boot-starter-aop:$springBootVersion" val springBootStarterSecurity = "org.springframework.boot:spring-boot-starter-security:$springBootVersion" val springBootStarterJdbc = "org.springframework.boot:spring-boot-starter-jdbc:$springBootVersion" - val springBootStartOauth2ResourceServer = "org.springframework.boot:spring-boot-starter-oauth2-resource-server:$springBootVersion" + val springSecurityOauth2Jose = "org.springframework.security:spring-security-oauth2-jose:$springSecurityVersion" val springWeb = "org.springframework:spring-webmvc" val springWebflux = "org.springframework:spring-webflux" diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts index a76ead65a3..84040d7f07 100644 --- a/sentry-spring-boot-starter/build.gradle.kts +++ b/sentry-spring-boot-starter/build.gradle.kts @@ -42,7 +42,7 @@ dependencies { compileOnly(Config.Libs.servletApi) compileOnly(Config.Libs.springBootStarterAop) compileOnly(Config.Libs.springBootStarterSecurity) - compileOnly(Config.Libs.springBootStartOauth2ResourceServer) + compileOnly(Config.Libs.springSecurityOauth2Jose) compileOnly(Config.Libs.reactorCore) annotationProcessor(Config.AnnotationProcessors.springBootAutoConfigure)