Remove direct Guava dependency

atlassian · Jun 13, 2024 · bf3a8cd · bf3a8cd
1 parent e0d9d2c
commit bf3a8cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,7 @@ configurations.all {
         failOnVersionConflict()
         eachDependency {
             when (requested.module.toString()) {
-                "com.google.guava:guava" -> useVersion("23.6-jre")
+                "com.google.guava:guava" -> useVersion("25.0-jre") // conflict between infrastructure, virtual-users and jira-actions
                 "org.apache.httpcomponents:httpclient" -> useVersion("4.5.13")
                 "com.fasterxml.jackson.core:jackson-core" -> useVersion("2.9.4")
                 "org.slf4j:slf4j-api" -> useVersion("1.8.0-alpha2")
@@ -58,7 +58,6 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.glassfish:javax.json:1.1")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.4")
-    implementation("com.google.guava:guava:23.6-jre")
     implementation("com.atlassian.performance.tools:concurrency:[1.2.0, 2.0.0)")
     listOf("api", "core", "slf4j-impl").forEach { implementation("org.apache.logging.log4j:log4j-$it:$log4jVersion") }
 

diff --git a/gradle.lockfile b/gradle.lockfile
@@ -33,7 +33,7 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=apiDependenciesMetadata,compileC
 com.google.code.findbugs:jsr305:1.3.9=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.google.code.gson:gson:2.8.2=runtimeClasspath,testRuntimeClasspath
 com.google.errorprone:error_prone_annotations:2.1.3=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
-com.google.guava:guava:23.6-jre=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
+com.google.guava:guava:25.0-jre=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:1.1=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath
 com.googlecode.javaewah:JavaEWAH:1.1.6=runtimeClasspath,testRuntimeClasspath
 com.hierynomus:sshj:0.23.0=apiDependenciesMetadata,compileClasspath,implementationDependenciesMetadata,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath