Skip to content

build: quote the Mockito -javaagent path in surefire argLine #1540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
innoprej wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −8
Open

build: quote the Mockito -javaagent path in surefire argLine #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion a2a/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<junit4.version>4.13.2</junit4.version>
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely on
runtime self-attachment, which newer JDKs block. -->
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contrib/firestore-session-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<properties>
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
on runtime self-attachment, which newer JDKs block. -->
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contrib/langchain4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<properties>
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
on runtime self-attachment, which newer JDKs block. -->
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion contrib/planners/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<properties>
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
on runtime self-attachment, which newer JDKs block. -->
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contrib/spring-ai/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<testcontainers.version>1.21.3</testcontainers.version>
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely
on runtime self-attachment, which newer JDKs block. -->
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<properties>
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely on
runtime self-attachment, which newer JDKs block. -->
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion dev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<properties>
<!-- Load mockito-core as a startup -javaagent so the inline mock maker does not rely on
runtime self-attachment, which newer JDKs block. -->
<mockito.javaagent.arg>-javaagent:${org.mockito:mockito-core:jar}</mockito.javaagent.arg>
<mockito.javaagent.arg>"-javaagent:${org.mockito:mockito-core:jar}"</mockito.javaagent.arg>
</properties>

<dependencyManagement>
Expand Down
3 changes: 2 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@
<!-- Prepended to the surefire JVM args. Empty by default; any module whose tests resolve
mockito-core (directly or transitively) must set it to
"-javaagent:${org.mockito:mockito-core:jar}" so the inline mock maker loads as a
startup agent instead of self-attaching at runtime, which newer JDKs block. -->
startup agent instead of self-attaching at runtime, which newer JDKs block. Keep the
quotes: they make a jar path with spaces a single JVM argument. -->
<mockito.javaagent.arg/>
<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>
</properties>
Expand Down
Loading