Skip to content

Commit ff25965

Browse files
committed
ci: add support for Java 25 in CI configuration
1 parent 5a94a8d commit ff25965

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
continue-on-error: true # allow jobs to complete even if some fail
1616
strategy:
1717
matrix:
18-
java: [8, 11, 17, 21]
18+
java: [8, 11, 17, 21, 25]
1919
max-parallel: 4
2020
name: JDK ${{ matrix.java }} | Project
2121
steps:
@@ -47,12 +47,13 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
build-java: [8, 11, 17, 21]
50+
build-java: [8, 11, 17, 21, 25]
5151
run:
5252
- { java: 8, gradle: '7.6.4' } # AGP Java 8 => Gradle 7.6.4 (MavenPlugin legacy)
5353
- { java: 11, gradle: '7.6.4' }
54-
- { java: 17, gradle: '8.9' }
55-
- { java: 21, gradle: '8.9' }
54+
- { java: 17, gradle: '8.9' }
55+
- { java: 21, gradle: '8.9' }
56+
- { java: 25, gradle: '9.1.0' }
5657
name: JDK ${{ matrix.build-java }} | Example Gradle (Android) | run on Java ${{ matrix.run.java }}
5758
steps:
5859
- uses: actions/checkout@v3
@@ -87,9 +88,14 @@ jobs:
8788
strategy:
8889
fail-fast: false
8990
matrix:
90-
build-java: [8, 11, 17, 21]
91-
run-java: [8, 11, 17, 21]
92-
name: JDK ${{ matrix.build-java }} | Example Gradle (Java) | run on Java ${{ matrix.run-java }}
91+
build-java: [8, 11, 17, 21, 25]
92+
run:
93+
- { java: 8, gradle: '8.9' }
94+
- { java: 11, gradle: '8.9' }
95+
- { java: 17, gradle: '8.9' }
96+
- { java: 21, gradle: '8.9' }
97+
- { java: 25, gradle: '9.1.0' }
98+
name: JDK ${{ matrix.build-java }} | Example Gradle (Java) | run on Java ${{ matrix.run.java }}
9399
steps:
94100
- uses: actions/checkout@v3
95101

@@ -102,12 +108,12 @@ jobs:
102108
- uses: actions/setup-java@v3
103109
with:
104110
distribution: 'temurin'
105-
java-version: ${{ matrix.run-java }}
111+
java-version: ${{ matrix.run.java }}
106112

107113
- name: Setup Gradle
108114
uses: gradle/actions/setup-gradle@v4
109115
with:
110-
gradle-version: 8.9
116+
gradle-version: ${{ matrix.run.gradle }}
111117

112118
- name: Build Gradle example (Java)
113119
working-directory: jsonschema2pojo-gradle-plugin/example/java
@@ -120,8 +126,8 @@ jobs:
120126
strategy:
121127
fail-fast: false
122128
matrix:
123-
build-java: [8]
124-
run-java: [8, 11, 17, 21]
129+
build-java: [8, 11, 17, 21, 25]
130+
run-java: [8, 11, 17, 21, 25]
125131
name: JDK ${{ matrix.build-java }} | Example Maven | run on Java ${{ matrix.run-java }}
126132
steps:
127133
- uses: actions/checkout@v3

jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/DynamicPropertiesIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void shouldSetStringField() throws Throwable {
4747

4848
@Test
4949
// jdk21 cannot build 1.7 target
50-
@DisabledForJreRange(max = JAVA_21)
50+
@DisabledForJreRange(min = JAVA_21)
5151
public void shouldSetStringFieldJava7() throws Throwable {
5252
setDeclaredPropertyTest(
5353
config("includeDynamicAccessors", true, "includeDynamicGetters", true,

pom.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@
8787
<artifactId>maven-deploy-plugin</artifactId>
8888
<version>3.1.2</version>
8989
</plugin>
90-
<plugin>
91-
<artifactId>maven-enforcer-plugin</artifactId>
92-
<version>3.2.1</version>
93-
</plugin>
9490
<plugin>
9591
<artifactId>maven-failsafe-plugin</artifactId>
9692
<version>3.5.3</version>
@@ -130,7 +126,7 @@
130126
</plugin>
131127
<plugin>
132128
<artifactId>maven-javadoc-plugin</artifactId>
133-
<version>2.10.4</version>
129+
<version>3.12.0</version>
134130
</plugin>
135131
<plugin>
136132
<artifactId>maven-plugin-plugin</artifactId>
@@ -220,6 +216,9 @@
220216
</plugin>
221217
<plugin>
222218
<artifactId>maven-enforcer-plugin</artifactId>
219+
<!-- The version needs to be specified here, not in pluginManagement,
220+
because the plugin is declared in the parent’s <build> section. -->
221+
<version>3.2.1</version>
223222
<executions>
224223
<execution>
225224
<id>enforce-maven</id>
@@ -419,7 +418,7 @@
419418
<dependency>
420419
<groupId>org.junit</groupId>
421420
<artifactId>junit-bom</artifactId>
422-
<version>5.13.2</version>
421+
<version>5.13.4</version>
423422
<type>pom</type>
424423
<scope>import</scope>
425424
</dependency>

0 commit comments

Comments
 (0)