Skip to content

Commit 2a57ad0

Browse files
committed
build: fix build warning + mockito agent setup on Java 21
1 parent f15c37d commit 2a57ad0

File tree

3 files changed

+5
-10
lines changed

3 files changed

+5
-10
lines changed

jooby/src/main/java/io/jooby/SneakyThrows.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,6 @@ Consumer8<V1, V2, V3, V4, V5, V6, V7, V8> throwingConsumer(
12171217
public static boolean isFatal(Throwable x) {
12181218
return x instanceof InterruptedException
12191219
|| x instanceof LinkageError
1220-
|| x instanceof ThreadDeath
12211220
|| x instanceof VirtualMachineError;
12221221
}
12231222

modules/jooby-run/src/main/java/io/jooby/run/JoobyRun.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ private void printErr(Throwable source) {
155155
private boolean isFatal(Throwable cause) {
156156
return cause instanceof InterruptedException
157157
|| cause instanceof LinkageError
158-
|| cause instanceof ThreadDeath
159158
|| cause instanceof VirtualMachineError;
160159
}
161160

pom.xml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
<!-- Parser and Renderer -->
6060
<freemarker.version>2.3.34</freemarker.version>
61-
<handlebars.version>4.4.0</handlebars.version>
61+
<handlebars.version>4.5.0</handlebars.version>
6262
<jstachio.version>1.3.7</jstachio.version>
6363
<pebble.version>3.2.4</pebble.version>
6464
<jackson.version>2.19.2</jackson.version>
@@ -152,6 +152,9 @@
152152
<rest-assured.version>5.5.5</rest-assured.version>
153153
<assertj-core.version>3.27.3</assertj-core.version>
154154
<mockito.version>5.18.0</mockito.version>
155+
<maven.m2.repo>${user.home}${file.separator}.m2${file.separator}repository</maven.m2.repo>
156+
<mockito.agent>org${file.separator}mockito${file.separator}mockito-core${file.separator}${mockito.version}${file.separator}mockito-core-${mockito.version}.jar</mockito.agent>
157+
<argLine>-javaagent:${maven.m2.repo}${file.separator}${mockito.agent}</argLine>
155158
<guava.version>33.4.8-jre</guava.version>
156159

157160
<compile-testing.version>0.21.0</compile-testing.version>
@@ -170,7 +173,6 @@
170173
<maven-tiles-plugin.version>2.41</maven-tiles-plugin.version>
171174
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
172175
<maven-core.version>3.9.11</maven-core.version>
173-
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
174176
<maven-enforcer-plugin.version>3.6.1</maven-enforcer-plugin.version>
175177
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
176178
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
@@ -1249,12 +1251,6 @@
12491251

12501252
<pluginManagement>
12511253
<plugins>
1252-
<!-- jooby maven plugin -->
1253-
<plugin>
1254-
<groupId>io.jooby</groupId>
1255-
<artifactId>jooby-maven-plugin</artifactId>
1256-
<version>${jooby.version}</version>
1257-
</plugin>
12581254
<!-- kotlin -->
12591255
<plugin>
12601256
<groupId>org.jetbrains.kotlin</groupId>
@@ -1404,6 +1400,7 @@
14041400
<systemPropertyVariables>
14051401
<jooby.maven.build>true</jooby.maven.build>
14061402
</systemPropertyVariables>
1403+
<argLine>@{argLine}</argLine>
14071404
</configuration>
14081405
</plugin>
14091406
</plugins>

0 commit comments

Comments
 (0)