Skip to content

Commit 1c5177c

Browse files
authored
Merge pull request #805 from ascopes/task/java-25
Build on Java 25 in CI
2 parents 4cf77cc + 08f8434 commit 1c5177c

7 files changed

Lines changed: 106 additions & 45 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
uses: actions/setup-java@v5
2929
with:
3030
cache: maven
31-
distribution: temurin
32-
java-version: 24
31+
distribution: zulu
32+
java-version: 25
3333

3434
- name: Validate shell scripts
3535
uses: ludeeus/action-shellcheck@master
@@ -108,9 +108,9 @@ jobs:
108108
java-version: 21
109109
maven-version: "${{ needs.validate.outputs.default_maven_version }}"
110110

111-
- title: Linux x86_64, mvn ${{ needs.validate.outputs.default_maven_version }}, jdk24
111+
- title: Linux x86_64, mvn ${{ needs.validate.outputs.default_maven_version }}, jdk25
112112
os-name: ubuntu-24.04
113-
java-version: 24
113+
java-version: 25
114114
maven-version: "${{ needs.validate.outputs.default_maven_version }}"
115115

116116
- title: Linux x86_64, mvn 3.8.8, jdk11
@@ -132,7 +132,7 @@ jobs:
132132
with:
133133
cache: maven
134134
java-version: ${{ matrix.java-version }}
135-
distribution: 'temurin'
135+
distribution: zulu
136136

137137
- name: Configure runner
138138
shell: bash
@@ -182,8 +182,8 @@ jobs:
182182
uses: actions/setup-java@v5
183183
with:
184184
cache: maven
185-
distribution: temurin
186-
java-version: 24
185+
distribution: zulu
186+
java-version: 25
187187

188188
- name: Build site
189189
shell: bash

.github/workflows/deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/setup-java@v5
5151
with:
5252
distribution: zulu
53-
java-version: 24
53+
java-version: 25
5454

5555
- name: Compute release version
5656
id: determine_version_to_release
@@ -87,7 +87,7 @@ jobs:
8787
uses: actions/setup-java@v5
8888
with:
8989
distribution: temurin
90-
java-version: 24
90+
java-version: zulu
9191
server-id: central
9292
server-username: CENTRAL_USERNAME
9393
server-password: CENTRAL_TOKEN
@@ -172,8 +172,8 @@ jobs:
172172
- name: Initialize Java
173173
uses: actions/setup-java@v5
174174
with:
175-
distribution: temurin
176-
java-version: 24
175+
distribution: zulu
176+
java-version: 25
177177

178178
- name: Generate site
179179
run: |-

.github/workflows/security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
cache: maven
2323
distribution: temurin
24-
java-version: 24
24+
java-version: zulu
2525

2626
- name: Submit dependency snapshot
2727
uses: advanced-security/maven-dependency-submission-action@v5

.mvn/jvm.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-XX:+TieredCompilation -XX:TieredStopAtLevel=1
1+
-XX:+TieredCompilation
2+
-XX:TieredStopAtLevel=1
Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
193
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

mvnw

Lines changed: 43 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mvnw.cmd

Lines changed: 48 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)