From 01d048bf372ed5a04a5c0235578269eb97a840b0 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 22 May 2024 13:00:23 -0400 Subject: [PATCH 1/4] Upgrade to logback-classic 1.5.6 Note that logback-classic is only used for testing. JAVA-5482 --- build.gradle | 5 +++-- driver-benchmarks/build.gradle | 2 +- driver-workload-executor/build.gradle | 2 +- graalvm-native-image-app/build.gradle | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index aa0dd05ed38..d8b22c712a0 100644 --- a/build.gradle +++ b/build.gradle @@ -58,6 +58,7 @@ ext { mongoCryptVersion = '1.8.0' projectReactorVersion = '2022.0.0' junitBomVersion = '5.8.2' + logbackVersion = "1.5.6" gitVersion = getGitVersion() } @@ -125,7 +126,7 @@ configure(scalaProjects) { testImplementation('org.scalatest:scalatest-shouldmatchers_%%:3.2.9') testImplementation('org.scalatestplus:junit-4-13_%%:3.2.9.0') testImplementation('org.scalatestplus:mockito-3-12_%%:3.2.10.0') - testImplementation('ch.qos.logback:logback-classic:1.1.3') + testImplementation('ch.qos.logback:logback-classic:1.5.6') testImplementation('org.reflections:reflections:0.9.10') } @@ -265,7 +266,7 @@ configure(javaCodeCheckedProjects) { testImplementation 'cglib:cglib-nodep:2.2.2' testImplementation 'org.objenesis:objenesis:1.3' testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'ch.qos.logback:logback-classic:1.1.1' + testImplementation 'ch.qos.logback:logback-classic:1.5.6' testImplementation project(':util:spock') //Adding categories to classpath } diff --git a/driver-benchmarks/build.gradle b/driver-benchmarks/build.gradle index c843c40b56b..31b1ae3bc76 100644 --- a/driver-benchmarks/build.gradle +++ b/driver-benchmarks/build.gradle @@ -31,7 +31,7 @@ sourceSets { dependencies { api project(':driver-sync') - implementation 'ch.qos.logback:logback-classic:1.2.11' + implementation 'ch.qos.logback:logback-classic:$logbackVersion' } javadoc { diff --git a/driver-workload-executor/build.gradle b/driver-workload-executor/build.gradle index ac13859c672..0fe82121513 100644 --- a/driver-workload-executor/build.gradle +++ b/driver-workload-executor/build.gradle @@ -43,7 +43,7 @@ dependencies { implementation project(':driver-sync') implementation project(':driver-core').sourceSets.test.output implementation project(':driver-sync').sourceSets.test.output - implementation 'ch.qos.logback:logback-classic:1.2.11' + implementation 'ch.qos.logback:logback-classic:$logbackVersion' implementation(platform("org.junit:junit-bom:$junitBomVersion")) implementation('org.junit.jupiter:junit-jupiter') implementation('org.junit.vintage:junit-vintage-engine') diff --git a/graalvm-native-image-app/build.gradle b/graalvm-native-image-app/build.gradle index abb5ffda3a2..3fc76c5dd15 100644 --- a/graalvm-native-image-app/build.gradle +++ b/graalvm-native-image-app/build.gradle @@ -89,7 +89,7 @@ dependencies { implementation project(':driver-reactive-streams').sourceSets.test.output implementation "org.mongodb:mongodb-crypt:$mongoCryptVersion" implementation 'org.slf4j:slf4j-api:2.0.12' - implementation 'ch.qos.logback:logback-classic:1.5.3' + implementation 'ch.qos.logback:logback-classic:1.5.6' implementation platform("io.projectreactor:reactor-bom:$projectReactorVersion") implementation 'io.projectreactor:reactor-core' } From ef161f94d49223d0109963a4818e09d083f9bfd0 Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 22 May 2024 18:32:15 -0400 Subject: [PATCH 2/4] 1.3.13 because Java 8 --- build.gradle | 2 +- driver-workload-executor/build.gradle | 2 +- graalvm-native-image-app/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d8b22c712a0..71ffc9f7424 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ ext { mongoCryptVersion = '1.8.0' projectReactorVersion = '2022.0.0' junitBomVersion = '5.8.2' - logbackVersion = "1.5.6" + logbackVersion = "1.3.14" gitVersion = getGitVersion() } diff --git a/driver-workload-executor/build.gradle b/driver-workload-executor/build.gradle index 0fe82121513..9844e31ab0f 100644 --- a/driver-workload-executor/build.gradle +++ b/driver-workload-executor/build.gradle @@ -43,7 +43,7 @@ dependencies { implementation project(':driver-sync') implementation project(':driver-core').sourceSets.test.output implementation project(':driver-sync').sourceSets.test.output - implementation 'ch.qos.logback:logback-classic:$logbackVersion' + implementation 'ch.qos.logback:logback-classic:1.3.14' implementation(platform("org.junit:junit-bom:$junitBomVersion")) implementation('org.junit.jupiter:junit-jupiter') implementation('org.junit.vintage:junit-vintage-engine') diff --git a/graalvm-native-image-app/build.gradle b/graalvm-native-image-app/build.gradle index 3fc76c5dd15..1d5ea689c4d 100644 --- a/graalvm-native-image-app/build.gradle +++ b/graalvm-native-image-app/build.gradle @@ -89,7 +89,7 @@ dependencies { implementation project(':driver-reactive-streams').sourceSets.test.output implementation "org.mongodb:mongodb-crypt:$mongoCryptVersion" implementation 'org.slf4j:slf4j-api:2.0.12' - implementation 'ch.qos.logback:logback-classic:1.5.6' + implementation 'ch.qos.logback:logback-classic:1.3.14' implementation platform("io.projectreactor:reactor-bom:$projectReactorVersion") implementation 'io.projectreactor:reactor-core' } From 2825fcd930df89b29fcf6efd82afecc8a9a52a9d Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 22 May 2024 19:25:42 -0400 Subject: [PATCH 3/4] Double quotes FTW --- build.gradle | 6 +++--- driver-workload-executor/build.gradle | 2 +- graalvm-native-image-app/build.gradle | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 71ffc9f7424..762ca55be34 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ ext { mongoCryptVersion = '1.8.0' projectReactorVersion = '2022.0.0' junitBomVersion = '5.8.2' - logbackVersion = "1.3.14" + logbackVersion = '1.3.14' gitVersion = getGitVersion() } @@ -126,7 +126,7 @@ configure(scalaProjects) { testImplementation('org.scalatest:scalatest-shouldmatchers_%%:3.2.9') testImplementation('org.scalatestplus:junit-4-13_%%:3.2.9.0') testImplementation('org.scalatestplus:mockito-3-12_%%:3.2.10.0') - testImplementation('ch.qos.logback:logback-classic:1.5.6') + testImplementation("ch.qos.logback:logback-classic:$logbackVersion") testImplementation('org.reflections:reflections:0.9.10') } @@ -266,7 +266,7 @@ configure(javaCodeCheckedProjects) { testImplementation 'cglib:cglib-nodep:2.2.2' testImplementation 'org.objenesis:objenesis:1.3' testImplementation 'org.hamcrest:hamcrest-all:1.3' - testImplementation 'ch.qos.logback:logback-classic:1.5.6' + testImplementation "ch.qos.logback:logback-classic:$logbackVersion" testImplementation project(':util:spock') //Adding categories to classpath } diff --git a/driver-workload-executor/build.gradle b/driver-workload-executor/build.gradle index 9844e31ab0f..7c48e444dc2 100644 --- a/driver-workload-executor/build.gradle +++ b/driver-workload-executor/build.gradle @@ -43,7 +43,7 @@ dependencies { implementation project(':driver-sync') implementation project(':driver-core').sourceSets.test.output implementation project(':driver-sync').sourceSets.test.output - implementation 'ch.qos.logback:logback-classic:1.3.14' + implementation "ch.qos.logback:logback-classic:$logbackVersion" implementation(platform("org.junit:junit-bom:$junitBomVersion")) implementation('org.junit.jupiter:junit-jupiter') implementation('org.junit.vintage:junit-vintage-engine') diff --git a/graalvm-native-image-app/build.gradle b/graalvm-native-image-app/build.gradle index 1d5ea689c4d..c34d8623b15 100644 --- a/graalvm-native-image-app/build.gradle +++ b/graalvm-native-image-app/build.gradle @@ -89,7 +89,7 @@ dependencies { implementation project(':driver-reactive-streams').sourceSets.test.output implementation "org.mongodb:mongodb-crypt:$mongoCryptVersion" implementation 'org.slf4j:slf4j-api:2.0.12' - implementation 'ch.qos.logback:logback-classic:1.3.14' + implementation "ch.qos.logback:logback-classic:$logbackVersion" implementation platform("io.projectreactor:reactor-bom:$projectReactorVersion") implementation 'io.projectreactor:reactor-core' } From be0fe562d30d4c4a4b4e3bfdff4494aa6d66ab7f Mon Sep 17 00:00:00 2001 From: Jeff Yemin Date: Wed, 22 May 2024 20:25:36 -0400 Subject: [PATCH 4/4] Missed one --- driver-benchmarks/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/driver-benchmarks/build.gradle b/driver-benchmarks/build.gradle index 31b1ae3bc76..960674011eb 100644 --- a/driver-benchmarks/build.gradle +++ b/driver-benchmarks/build.gradle @@ -31,7 +31,7 @@ sourceSets { dependencies { api project(':driver-sync') - implementation 'ch.qos.logback:logback-classic:$logbackVersion' + implementation "ch.qos.logback:logback-classic:$logbackVersion" } javadoc {