Skip to content

Commit dd04b63

Browse files
committed
Upgrade CI to JDK 25
1 parent 454bbaf commit dd04b63

File tree

7 files changed

+8
-11
lines changed

7 files changed

+8
-11
lines changed

.github/workflows/ci-4.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- os: ubuntu-latest
1111
jdk: 8
1212
- os: ubuntu-latest
13-
jdk: 21
13+
jdk: 25
1414
- os: windows-latest
1515
jdk: 8
1616
uses: ./.github/workflows/ci.yml

.github/workflows/ci-matrix-5.x.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- os: ubuntu-latest
1414
jdk: 11
1515
- os: ubuntu-latest
16-
jdk: 21
16+
jdk: 25
1717
- os: windows-latest
1818
jdk: 11
1919
uses: ./.github/workflows/ci.yml

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
java-version: |
2727
8
2828
11
29-
21
29+
25
3030
distribution: temurin
3131
- name: Set JAVA_HOME
3232
run: echo "JAVA_HOME=$JAVA_HOME_${{ inputs.jdk }}_X64" >> $GITHUB_ENV

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/setup-java@v4
2525
with:
2626
java-version: |
27-
21
27+
25
2828
${{ inputs.jdk }}
2929
distribution: temurin
3030
- name: Get project version

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<properties>
2323
<pac4j.version>1.6.0</pac4j.version>
24-
<mockito.version>5.13.0</mockito.version>
24+
<mockito.version>5.20.0</mockito.version>
2525
<!-- When changing this version, make sure to update vertx-infinispan for dependency convergence -->
2626
<caffeine.version>3.2.1</caffeine.version>
2727
</properties>

vertx-template-engines/vertx-web-templ-jte/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<toolchain>
5050
<type>jdk</type>
5151
<provides>
52-
<id>Java17</id>
53-
<version>17</version>
52+
<id>Java25</id>
53+
<version>25</version>
5454
</provides>
5555
<configuration>
5656
<jdkHome>/PATH/TO/JDK/17</jdkHome>
@@ -81,7 +81,7 @@
8181
<configuration>
8282
<toolchains>
8383
<jdk>
84-
<version>21</version>
84+
<version>25</version>
8585
</jdk>
8686
</toolchains>
8787
</configuration>

vertx-web-validation/src/test/java/io/vertx/ext/web/validation/tests/RequestParametersTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
import java.util.HashMap;
1212
import java.util.Map;
1313

14-
import static org.junit.Assert.assertEquals;
15-
import static org.junit.Assert.assertNull;
16-
1714
public class RequestParametersTest {
1815

1916
@Test

0 commit comments

Comments
 (0)