Merge branch 'main' of https://github.com/getsentry/sentry-java

Author: marandaneto

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Unreleased
 
 * Fix: Enrich Transactions with Context Data (#1469)
+* Bump: Apache HttpClient to 5.0.4 (#1476)
 
 # 5.0.0-beta.3
 

buildSrc/src/main/java/Config.kt

@@ -74,9 +74,7 @@ object Config {
         val aspectj = "org.aspectj:aspectjweaver"
         val servletApi = "javax.servlet:javax.servlet-api"
 
-        val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.3"
-        val apacheHttpCore = "org.apache.httpcomponents.core5:httpcore5:5.0.3"
-        val apacheHttpCoreH2 = "org.apache.httpcomponents.core5:httpcore5-h2:5.0.3"
+        val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.4"
 
         private val retrofit2Version = "2.9.0"
         private val retrofit2Group = "com.squareup.retrofit2"

sentry-apache-http-client-5/build.gradle.kts

@@ -22,8 +22,6 @@ tasks.withType<KotlinCompile>().configureEach {
 dependencies {
     api(project(":sentry"))
     api(Config.Libs.apacheHttpClient)
-    api(Config.Libs.apacheHttpCore)
-    api(Config.Libs.apacheHttpCoreH2)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)