Skip to content

Commit a401405

Browse files
authored
Upgrade mockito (elastic#121849) (elastic#121931)
1 parent 6d52a3d commit a401405

File tree

5 files changed

+24
-16
lines changed

5 files changed

+24
-16
lines changed

client/test/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ dependencies {
2828
api "org.hamcrest:hamcrest:${versions.hamcrest}"
2929

3030
// mockito
31-
api 'org.mockito:mockito-core:5.11.0'
32-
api 'org.mockito:mockito-subclass:5.11.0'
33-
api 'net.bytebuddy:byte-buddy:1.14.12'
31+
api 'org.mockito:mockito-core:5.15.2'
32+
api 'org.mockito:mockito-subclass:5.15.2'
33+
api 'net.bytebuddy:byte-buddy:1.15.11'
3434
api 'org.objenesis:objenesis:3.3'
3535
}
3636

gradle/build.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apache-compress = "org.apache.commons:commons-compress:1.26.1"
1111
apache-rat = "org.apache.rat:apache-rat:0.11"
1212
asm = { group = "org.ow2.asm", name="asm", version.ref="asm" }
1313
asm-tree = { group = "org.ow2.asm", name="asm-tree", version.ref="asm" }
14-
bytebuddy = "net.bytebuddy:byte-buddy:1.14.12"
14+
bytebuddy = "net.bytebuddy:byte-buddy:1.15.11"
1515
checkstyle = "com.puppycrawl.tools:checkstyle:10.3"
1616
commons-codec = "commons-codec:commons-codec:1.11"
1717
commmons-io = "commons-io:commons-io:2.2"

gradle/verification-metadata.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,9 +1724,9 @@
17241724
<sha256 value="1d31696445697720527091754369082a6651bd49781b6005deb94e56753406f9" origin="Generated by Gradle"/>
17251725
</artifact>
17261726
</component>
1727-
<component group="net.bytebuddy" name="byte-buddy" version="1.14.12">
1728-
<artifact name="byte-buddy-1.14.12.jar">
1729-
<sha256 value="970636134d61c183b19f8f58fa631e30d2f2abca344b37848a393cac7863dd70" origin="Generated by Gradle"/>
1727+
<component group="net.bytebuddy" name="byte-buddy" version="1.15.11">
1728+
<artifact name="byte-buddy-1.15.11.jar">
1729+
<sha256 value="fa08998aae1e7bdae83bde0712c50e8444d71c0e0c196bb2247ade8d4ad0eb90" origin="Generated by Gradle"/>
17301730
</artifact>
17311731
</component>
17321732
<component group="net.java.dev.jets3t" name="jets3t" version="0.9.0">
@@ -4118,14 +4118,14 @@
41184118
<sha256 value="f97483ba0944b9fa133aa29638764ddbeadb51ec3dbc02074c58fa2caecd07fa" origin="Generated by Gradle"/>
41194119
</artifact>
41204120
</component>
4121-
<component group="org.mockito" name="mockito-core" version="5.11.0">
4122-
<artifact name="mockito-core-5.11.0.jar">
4123-
<sha256 value="f076c96b1f49b8d9bc42e46b0969aaf5684c40c8b5b679d400e5d880073a0e00" origin="Generated by Gradle"/>
4121+
<component group="org.mockito" name="mockito-core" version="5.15.2">
4122+
<artifact name="mockito-core-5.15.2.jar">
4123+
<sha256 value="bf48b7372d9491d5ec8aebb4cdd187d15663931599c0fbe7410166ce0e1e58ff" origin="Generated by Gradle"/>
41244124
</artifact>
41254125
</component>
4126-
<component group="org.mockito" name="mockito-subclass" version="5.11.0">
4127-
<artifact name="mockito-subclass-5.11.0.jar">
4128-
<sha256 value="61e65116bf6178cd3a5f1cecc0d73d68395e7c175d07a7f9478650f55b36fb1d" origin="Generated by Gradle"/>
4126+
<component group="org.mockito" name="mockito-subclass" version="5.15.2">
4127+
<artifact name="mockito-subclass-5.15.2.jar">
4128+
<sha256 value="bf332f658d5437446525911449da3474be170053735bf870ac2caaeaffc2fd34" origin="Generated by Gradle"/>
41294129
</artifact>
41304130
</component>
41314131
<component group="org.mortbay.jetty" name="jetty" version="6.1.26">

server/src/main/resources/org/elasticsearch/bootstrap/test-framework.policy

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ grant codeBase "${codebase.mockito-core}" {
2323
permission java.lang.RuntimePermission "accessDeclaredMembers";
2424
permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
2525
permission java.lang.RuntimePermission "getClassLoader";
26+
// needed when calling bytebuddy
27+
permission java.lang.RuntimePermission "createClassLoader";
28+
permission java.lang.RuntimePermission "net.bytebuddy.createJavaDispatcher";
29+
permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.utility";
30+
permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.dynamic.loading";
31+
permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.description.type";
32+
permission java.lang.reflect.ReflectPermission "newProxyInPackage.net.bytebuddy.description.method";
2633
};
2734

2835
grant codeBase "${codebase.byte-buddy}" {

test/framework/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ dependencies {
2525
api "commons-codec:commons-codec:${versions.commonscodec}"
2626

2727
// mockito
28-
api 'org.mockito:mockito-core:5.11.0'
29-
api 'org.mockito:mockito-subclass:5.11.0'
30-
api 'net.bytebuddy:byte-buddy:1.14.12'
28+
api 'org.mockito:mockito-core:5.15.2'
29+
api 'org.mockito:mockito-subclass:5.15.2'
30+
api 'net.bytebuddy:byte-buddy:1.15.11'
3131
api 'org.objenesis:objenesis:3.3'
3232

3333
api "org.elasticsearch:mocksocket:${versions.mocksocket}"
@@ -64,6 +64,7 @@ tasks.named("thirdPartyAudit").configure {
6464
'org.apache.log4j.Priority',
6565

6666
// mockito
67+
'net.bytebuddy.agent.Installer',
6768
'net.bytebuddy.agent.ByteBuddyAgent',
6869
'org.mockito.internal.creation.bytebuddy.inject.MockMethodDispatcher',
6970
'org.opentest4j.AssertionFailedError',

0 commit comments

Comments
 (0)