Revert to using mockito-core instead of mockito-inline due to inc…

…ompatibility with IBM JDK 8 (see eclipse-openj9/openj9#3410 and mockito/mockito#801)
heiko-holz · Dec 3, 2021 · 1fe96a3 · 1fe96a3
1 parent c4fa29f
commit 1fe96a3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/components/inspectit-ocelot-eum-server/build.gradle b/components/inspectit-ocelot-eum-server/build.gradle
@@ -113,7 +113,7 @@ dependencies {
             'org.springframework:spring-test:5.1.3.RELEASE',
             'org.apache.httpcomponents:httpclient:4.5.6',
             'commons-io:commons-io:2.6',
-            'org.mockito:mockito-inline:4.1.0',
+            "org.mockito:mockito-core:${mockitoVersion}",
             'org.junit.jupiter:junit-jupiter-api:5.3.1',
             'org.awaitility:awaitility:3.1.5',
             'org.mockito:mockito-junit-jupiter:2.23.0',

diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,5 @@ org.gradle.jvmargs=-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/circle
 # Ensure to adapt the netty version (inspectit-ocelot-core/build.gradle) when changing the OpenCensus version
 openCensusVersion=0.22.1.ocelot.1
 springVersion=2.1.1.RELEASE
-prometheusClientVersion=0.6.0
+prometheusClientVersion=0.6.0
+mockitoVersion=4.1.0
diff --git a/inspectit-ocelot-core/build.gradle b/inspectit-ocelot-core/build.gradle
@@ -88,7 +88,7 @@ dependencies {
             "io.opencensus:opencensus-impl:${openCensusVersion}",
             'org.springframework:spring-test:5.1.3.RELEASE',
             'org.apache.httpcomponents:httpclient:4.5.6',
-            'org.mockito:mockito-inline:4.1.0',
+            "org.mockito:mockito-core:${mockitoVersion}",
             'org.assertj:assertj-core:3.11.1',
             'org.assertj:assertj-guava:3.2.1',
             'org.awaitility:awaitility:3.1.5',