Skip to content

Commit bad4f4c

Browse files
Merge pull request #1540 from innoprej:build/quote-mockito-javaagent
PiperOrigin-RevId: 1000002188
2 parents 0b1303e + a9bb99e commit bad4f4c

8 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎a2a/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<junit4.version>4.13.2</junit4.version>
2727
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely on
2828
runtime self-attachment, which newer JDKs block. -->
29-
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
29+
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
3030
</properties>
3131

3232
<dependencies>

‎contrib/firestore-session-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
3333
on runtime self-attachment, which newer JDKs block. -->
34-
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
34+
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
3535
</properties>
3636

3737
<dependencies>

‎contrib/langchain4j/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
3333
on runtime self-attachment, which newer JDKs block. -->
34-
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
34+
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
3535
</properties>
3636

3737
<dependencyManagement>

‎contrib/planners/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<properties>
3232
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
3333
on runtime self-attachment, which newer JDKs block. -->
34-
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
34+
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
3535
</properties>
3636

3737
<dependencies>

‎contrib/spring-ai/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<testcontainers.version>1.21.3</testcontainers.version>
3434
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
3535
on runtime self-attachment, which newer JDKs block. -->
36-
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
36+
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
3737
</properties>
3838

3939
<dependencyManagement>

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<properties>
3131
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely on
3232
runtime self-attachment, which newer JDKs block. -->
33-
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
33+
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
3434
</properties>
3535

3636
<dependencies>

‎dev/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<properties>
2929
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely on
3030
runtime self-attachment, which newer JDKs block. -->
31-
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
31+
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
3232
</properties>
3333

3434
<dependencyManagement>

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
<!-- Prepended to the surefire JVM args. Empty by default; any module whose tests resolve
8787
mockito-core (directly or transitively) must set it to
8888
"-javaagent:${org.mockito:mockito-core:jar}" so the inline mock maker loads as a
89-
startup agent instead of self-attaching at runtime, which newer JDKs block. -->
89+
startup agent instead of self-attaching at runtime, which newer JDKs block. Keep the
90+
quotes: they make a jar path with spaces a single JVM argument. -->
9091
<mockito.javaagent.arg/>
9192
<surefire.argLine>${mockito.javaagent.arg} @{jacoco.agent.argLine} --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED -Dio.netty.tryReflectionSetAccessible=true</surefire.argLine>
9293
</properties>

0 commit comments

Comments
 (0)