Skip to content

Commit f660842

Browse files
ibauersachsibauersachs
committed
Update dependencies, support Java 25 builds
1 parent 34ba40e commit f660842

8 files changed

Lines changed: 87 additions & 67 deletions

File tree

‎.github/actions/download-artifact/action.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ runs:
1616
steps:
1717
- name: Download artifacts
1818
if: github.event_name != 'workflow_run'
19-
uses: actions/download-artifact@v4
19+
uses: actions/download-artifact@v7
2020
with:
2121
pattern: ${{ inputs.name }}
2222
path: ${{ inputs.path }}
2323
merge-multiple: true
2424

2525
- name: Download artifacts
2626
if: github.event_name == 'workflow_run'
27-
uses: dawidd6/action-download-artifact@v7
27+
#v12
28+
uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392
2829
with:
2930
workflow: ${{ github.event.workflow_run.name }}
3031
run_id: ${{ github.event.workflow_run.id }}

‎.github/actions/prepare-analysis/action.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ runs:
3838
echo "check_name<<EOF"$'\n'"${check_name}EOF" >> $GITHUB_OUTPUT
3939
4040
- name: Publish Test Report
41-
uses: mikepenz/action-junit-report@v4
41+
#v6.1.0
42+
uses: mikepenz/action-junit-report@a294a61c909bd8a4b563024a2faa28897fd53ebc
4243
with:
4344
commit: ${{ github.event.workflow_run.head_sha }}
4445
report_paths: ${{ steps.junit_paths.outputs.report_paths }}
@@ -48,15 +49,15 @@ runs:
4849
detailed_summary: true
4950

5051
- name: Set up JDK
51-
uses: actions/setup-java@v4
52+
uses: actions/setup-java@v5
5253
with:
5354
java-version: ${{ env.BUILD_JAVA_VERSION }}
5455
distribution: temurin
5556
cache: ${{ inputs.cache }}
5657

5758
- name: Cache SonarCloud packages
5859
if: inputs.cache
59-
uses: actions/cache@v4
60+
uses: actions/cache@v5
6061
with:
6162
path: ~/.sonar/cache
6263
key: ${{ runner.os }}-sonar

‎.github/actions/upload-artifact/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ runs:
3838
shell: bash
3939

4040
- name: Upload artifacts
41-
uses: actions/upload-artifact@v4
41+
uses: actions/upload-artifact@v6
4242
with:
4343
if-no-files-found: ${{ inputs.if-no-files-found }}
4444
name: ${{ inputs.name }}

‎.github/workflows/analyze.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
checks: write
1414

1515
env:
16-
BUILD_JAVA_VERSION: '21'
16+
BUILD_JAVA_VERSION: '25'
1717

1818
jobs:
1919
analyze:
@@ -24,7 +24,8 @@ jobs:
2424
steps:
2525
- name: Download PR number artifact
2626
id: get_pr_number
27-
uses: dawidd6/action-download-artifact@v6
27+
#v12
28+
uses: dawidd6/action-download-artifact@0bd50d53a6d7fb5cb921e607957e9cc12b4ce392
2829
with:
2930
workflow: ${{ github.event.workflow_run.name }}
3031
run_id: ${{ github.event.workflow_run.id }}
@@ -39,7 +40,8 @@ jobs:
3940
- name: Request PR data from GitHub API
4041
id: get_pr_data
4142
if: steps.get_pr_number.outputs.found_artifact
42-
uses: octokit/[email protected]
43+
#v2.4.0
44+
uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d
4345
env:
4446
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4547
with:
@@ -48,20 +50,17 @@ jobs:
4850
number: ${{ steps.pr_number.outputs.pr_number }}
4951

5052
- name: Checkout PR
51-
uses: actions/checkout@v4
53+
uses: actions/checkout@v6
5254
with:
5355
repository: ${{ github.event.workflow_run.head_repository.full_name }}
5456
ref: ${{ github.event.workflow_run.head_sha }}
5557
persist-credentials: false
58+
path: pr
5659
# for Sonar
5760
fetch-depth: 0
5861

59-
- name: Make sure 'base' doesn't exist
60-
shell: bash
61-
run: rm -rf base
62-
6362
- name: Checkout base
64-
uses: actions/checkout@v4
63+
uses: actions/checkout@v6
6564
with:
6665
repository: ${{ github.event.repository.full_name }}
6766
ref: ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}
@@ -80,8 +79,10 @@ jobs:
8079
WF_BRANCH: ${{ fromJson(steps.get_pr_data.outputs.data).head.ref }}
8180
WF_BASE: ${{ fromJson(steps.get_pr_data.outputs.data).base.ref }}
8281
run: |
83-
cp -f base/pom.xml .
82+
cp -f base/pom.xml pr/
83+
cd pr
8484
mvn -B \
85+
-f pom.xml \
8586
-Dsonar.scm.revision='${WF_REVISION}' \
8687
-Dsonar.pullrequest.key='${WF_PRKEY}' \
8788
-Dsonar.pullrequest.branch='${WF_BRANCH}' \

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- 'release/**'
1212

1313
env:
14-
BUILD_JAVA_VERSION: '21'
14+
BUILD_JAVA_VERSION: '25'
1515

1616
jobs:
1717
test:
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: [ ubuntu-latest, windows-latest ]
24-
java: [ '8', '11', '17', '21' ]
24+
java: [ '8', '11', '17', '21', '25' ]
2525
arch: [ 'x64' ]
2626
include:
2727
- os: windows-latest
@@ -32,12 +32,12 @@ jobs:
3232

3333
steps:
3434
- name: Checkout
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636
with:
3737
persist-credentials: false
3838

3939
- name: Set up JDK ${{ matrix.java }}
40-
uses: actions/setup-java@v4
40+
uses: actions/setup-java@v5
4141
with:
4242
java-version: ${{ matrix.java }}
4343
architecture: ${{ matrix.arch }}
@@ -47,7 +47,7 @@ jobs:
4747
- name: Build with Maven
4848
shell: bash
4949
run: |
50-
TEST_EXCLUSIONS=$([ '${{ matrix.java }}' == '21' ] && echo "" || echo "concurrency" )
50+
TEST_EXCLUSIONS=$([ '${{ matrix.java }}' == '25' ] && echo "" || echo "concurrency" )
5151
mvn verify \
5252
-B \
5353
-Dsurefire.rerunFailingTestsCount=2 \
@@ -102,12 +102,12 @@ jobs:
102102
needs: test
103103
steps:
104104
- name: Checkout
105-
uses: actions/checkout@v4
105+
uses: actions/checkout@v6
106106
with:
107107
persist-credentials: false
108108

109109
- name: Set up JDK
110-
uses: actions/setup-java@v4
110+
uses: actions/setup-java@v5
111111
with:
112112
java-version: ${{ env.BUILD_JAVA_VERSION }}
113113
distribution: temurin
@@ -140,7 +140,7 @@ jobs:
140140

141141
- name: Archive PR number
142142
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login != 'dnsjava'
143-
uses: actions/upload-artifact@v4
143+
uses: actions/upload-artifact@v6
144144
with:
145145
name: pr_number
146146
path: pr_number.txt
@@ -152,7 +152,7 @@ jobs:
152152
if: github.event_name == 'push' || github.event.pull_request.head.repo.owner.login == 'dnsjava'
153153
steps:
154154
- name: Checkout
155-
uses: actions/checkout@v4
155+
uses: actions/checkout@v6
156156
with:
157157
persist-credentials: false
158158
# for Sonar
@@ -164,7 +164,8 @@ jobs:
164164
cache: maven
165165

166166
- name: Run codecov
167-
uses: codecov/codecov-action@v5
167+
#v5.5.2
168+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de
168169

169170
# doesn't work with PRs from forks, see
170171
# https://portal.productboard.com/sonarsource/1-sonarcloud/c/50-sonarcloud-analyzes-external-pull-request
@@ -181,12 +182,12 @@ jobs:
181182
runs-on: ubuntu-latest
182183
steps:
183184
- name: Checkout
184-
uses: actions/checkout@v4
185+
uses: actions/checkout@v6
185186
with:
186187
persist-credentials: false
187188

188189
- name: Set up JDK ${{ env.BUILD_JAVA_VERSION }}
189-
uses: actions/setup-java@v4
190+
uses: actions/setup-java@v5
190191
with:
191192
java-version: ${{ env.BUILD_JAVA_VERSION }}
192193
architecture: 'x64'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ jobs:
2525

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v6
2929
with:
3030
persist-credentials: false
3131

3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@v3
34+
uses: github/codeql-action/init@v4
3535
with:
3636
languages: java
3737

38-
- name: Set up JDK 21
39-
uses: actions/setup-java@v4
38+
- name: Set up JDK 25
39+
uses: actions/setup-java@v5
4040
with:
41-
java-version: 21
41+
java-version: 25
4242
distribution: temurin
4343
check-latest: true
4444
cache: maven
@@ -58,4 +58,4 @@ jobs:
5858
test-compile
5959
6060
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@v3
61+
uses: github/codeql-action/analyze@v4

‎README.adoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ on the classpath
283283
* The link:USAGE.md[command line tools] were moved to the `org.xbill.DNS.tools`
284284
package
285285

286-
* On Windows, https://github.com/java-native-access/jna[JNA] should be on the classpath for the search path and proper DNS server finding
286+
* On Windows, https://github.com/java-native-access/jna[JNA] should be on the classpath for the search path and proper DNS server finding.
287+
As of Java 24, note that additional JVM config is required, see https://javadoc.io/doc/net.java.dev.jna/jna/latest/index.html#special-considerations-for-jdk24--heading[Special considerations for JDK24+].
287288

288289
* The `Resolver` API for custom resolvers has changed to use
289290
`CompletionStage<Message>` for asynchronous resolving.

0 commit comments

Comments
 (0)