Skip to content

Commit e6c479a

Browse files
Use one and modern Mockito version in whole project (#2271)
1 parent 5a8e1ee commit e6c479a

File tree

9 files changed

+14
-12
lines changed

9 files changed

+14
-12
lines changed

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ goPluginVersion=231.8109.175
2525
junit5Version=5.8.2
2626
junit4Version=4.13.2
2727
junit4PlatformVersion=1.9.0
28-
mockitoVersion=3.5.13
28+
mockitoVersion=5.2.0
29+
mockitoInlineVersion=5.2.0
2930
ksmtVersion=0.4.3
3031
sootVersion=4.4.0-FORK-2
3132
kotlinVersion=1.8.0
@@ -59,7 +60,6 @@ kryoVersion=5.4.0
5960
kryoSerializersVersion=0.45
6061
asmVersion=9.2
6162
testNgVersion=7.6.0
62-
mockitoInlineVersion=4.0.0
6363
kamlVersion = 0.51.0
6464
jacksonVersion = 2.12.3
6565
slf4jVersion=1.7.36

utbot-framework-test/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion
2424
implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion
2525
// we need this for construction mocks from composite models
26-
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
26+
implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
2727

2828
// To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section
2929
// testImplementation group: 'junit', name: 'junit', version: '4.13.1'

utbot-framework/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ dependencies {
3030
implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion
3131
implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion
3232
// we need this for construction mocks from composite models
33-
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
33+
implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
3434

3535
// To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section
3636
//implementation group: 'junit', name: 'junit', version: '4.13.1'

utbot-instrumentation/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ val kryoVersion: String by rootProject
55
val kryoSerializersVersion: String by rootProject
66
val kotlinLoggingVersion: String by rootProject
77
val rdVersion: String by rootProject
8+
val mockitoVersion: String by rootProject
9+
val mockitoInlineVersion: String by rootProject
810
val springBootVersion: String by rootProject
911

1012
plugins {
@@ -57,8 +59,8 @@ dependencies {
5759
implementation("net.java.dev.jna:jna-platform:5.5.0")
5860

5961
// TODO: this is necessary for inline classes mocking in UtExecutionInstrumentation
60-
implementation("org.mockito:mockito-core:4.2.0")
61-
implementation("org.mockito:mockito-inline:4.2.0")
62+
implementation("org.mockito:mockito-core:$mockitoVersion")
63+
implementation("org.mockito:mockito-inline:$mockitoInlineVersion")
6264

6365
compileOnly("org.springframework.boot:spring-boot:$springBootVersion")
6466
fetchSpringCommonsJar(project(":utbot-spring-commons", configuration = "springCommonsJar"))

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/ExternalLibraryDescriptors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fun jUnit5ParametrizedTestsLibraryDescriptor(versionInProject: Version?): Extern
3636
}
3737

3838
fun mockitoCoreLibraryDescriptor(versionInProject: Version?): ExternalLibraryDescriptor {
39-
val preferredVersion = if (versionInProject?.hasNumericOrEmptyPatch() == true) versionInProject?.plainText else "4.2.0"
39+
val preferredVersion = if (versionInProject?.hasNumericOrEmptyPatch() == true) versionInProject?.plainText else "5.2.0"
4040
return ExternalLibraryDescriptor(
4141
"org.mockito", "mockito-core",
4242
"3.5.0", null, preferredVersion

utbot-junit-contest/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ dependencies {
5757
implementation group: 'org.jsoup', name: 'jsoup', version: '1.6.2'
5858
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
5959
// need for tests
60-
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
61-
implementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'
60+
implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
61+
implementation group: 'org.mockito', name: 'mockito-inline', version: mockitoInlineVersion
6262
implementation 'junit:junit:4.13.2'
6363
testImplementation fileTree(dir: 'src/main/resources/projects/', include: '*/*.jar')
6464
testImplementation files('src/main/resources/evosuite/evosuite-1.2.0.jar')

utbot-sample/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
implementation group: 'org.jetbrains', name: 'annotations', version: '16.0.2'
77
implementation group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1'
88
implementation 'org.projectlombok:lombok:1.18.20'
9-
testImplementation 'org.mockito:mockito-core:4.2.0'
9+
testImplementation group: 'org.mockito', name:'mockito-core', version: mockitoVersion
1010
annotationProcessor 'org.projectlombok:lombok:1.18.20'
1111
implementation(project(":utbot-api"))
1212
implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'

utbot-summary/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ dependencies {
1515
implementation(group = "com.github.haifengl", name = "smile-core", version = "2.6.0")
1616
implementation(group = "io.github.microutils", name = "kotlin-logging", version = kotlinLoggingVersion)
1717
implementation("com.github.javaparser:javaparser-core:3.22.1")
18-
testImplementation("org.mockito:mockito-core:4.2.0")
18+
testImplementation("org.mockito:mockito-core:$mockitoVersion")
1919
testImplementation("org.junit.jupiter:junit-jupiter:$junit5Version")
2020
}

utbot-testing/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838
implementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacocoVersion
3939
implementation group: 'org.apache.commons', name: 'commons-text', version: apacheCommonsTextVersion
4040
// we need this for construction mocks from composite models
41-
implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
41+
implementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
4242

4343
// To use JUnit4, comment out JUnit5 and uncomment JUnit4 dependencies here. Please also check "test" section
4444
// testImplementation group: 'junit', name: 'junit', version: '4.13.1'

0 commit comments

Comments
 (0)