Merge branch 'main' into feat/add-before-send-transaction

getsentry · Nov 28, 2022 · c83f2ba · c83f2ba
2 parents c4c253e + b85d8aa
commit c83f2ba
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 
 ### Dependencies
 
+- Update Spring Boot Jakarta to Spring Boot 3.0.0 ([#2389](https://github.com/getsentry/sentry-java/pull/2389))
 - Bump Spring Boot to 2.7.5 ([#2383](https://github.com/getsentry/sentry-java/pull/2383))
 
 ## 6.8.0

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -5,7 +5,7 @@ object Config {
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.5"
-    val springBoot3Version = "3.0.0-RC2"
+    val springBoot3Version = "3.0.0"
     val kotlinCompatibleLanguageVersion = "1.4"
 
     val composeVersion = "1.1.1"

diff --git a/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-jakarta/build.gradle.kts
@@ -15,10 +15,6 @@ java.targetCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
-    maven {
-        url = uri("https://repo.spring.io/plugins-snapshot")
-    }
-    maven { url = uri("https://repo.spring.io/milestone") }
 }
 
 val jakartaTransform by configurations.creating

diff --git a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
@@ -19,10 +19,6 @@ java.targetCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
-    maven {
-        url = uri("https://repo.spring.io/plugins-snapshot")
-    }
-    maven { url = uri("https://repo.spring.io/milestone") }
 }
 
 dependencyManagement {

diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts
@@ -16,7 +16,6 @@ plugins {
 
 repositories {
     mavenCentral()
-    maven { url = uri("https://repo.spring.io/milestone") }
 }
 
 the<DependencyManagementExtension>().apply {

diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts
@@ -17,7 +17,6 @@ plugins {
 
 repositories {
     mavenCentral()
-    maven { url = uri("https://repo.spring.io/milestone") }
 }
 
 the<DependencyManagementExtension>().apply {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,7 +2,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 pluginManagement {
     repositories {
-        maven { url = uri("https://repo.spring.io/milestone") }
         mavenCentral()
         gradlePluginPortal()
     }