Skip to content

Commit 91b2d96

Browse files
authored
Merge pull request #770 from nscuro/java17
2 parents a9dad8a + b776584 commit 91b2d96

6 files changed

Lines changed: 11 additions & 12 deletions

File tree

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
timeout-minutes: 30
1818
steps:
1919
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag=v6.0.1
20-
- name: Set up JDK 8
20+
- name: Set up JDK
2121
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # tag=v5.1.0
2222
with:
2323
distribution: temurin
24-
java-version: 8
24+
java-version: '25'
2525
- name: Build with Maven
2626
run: mvn -B --no-transfer-progress package
2727
- name: Deploy documentation

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Test
1616
strategy:
1717
matrix:
18-
java-version: [ 8, 11, 17, 21 ]
18+
java-version: [ 17, 21, 25 ]
1919
runs-on: ubuntu-latest
2020
timeout-minutes: 5
2121
steps:
@@ -33,7 +33,7 @@ jobs:
3333
# PRs from forks do not get access to repository secrets.
3434
# https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
3535
- name: Publish test coverage
36-
if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'CycloneDX' && matrix.java-version == '21' }}
36+
if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'CycloneDX' && matrix.java-version == '25' }}
3737
uses: codacy/codacy-coverage-reporter-action@89d6c85cfafaec52c72b6c5e8b2878d33104c699 # tag=v1.3.0
3838
with:
3939
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}

.github/workflows/pr-test-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Download PR test coverage report
2121
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag=v7.0.0
2222
with:
23-
name: pr-test-coverage-report-java-21
23+
name: pr-test-coverage-report-java-25
2424
github-token: ${{ secrets.GITHUB_TOKEN }}
2525
run-id: ${{ github.event.workflow_run.id }}
2626
- name: Report Coverage to Codacy

.github/workflows/publish-snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag=v6.0.1
17-
- name: Set up JDK 8
17+
- name: Set up JDK
1818
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # tag=v5.1.0
1919
with:
20-
java-version: '8'
20+
java-version: '25'
2121
distribution: 'temurin'
2222
server-id: central
2323
server-username: MAVEN_CENTRAL_USERNAME

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
- name: Checkout code
2323
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # tag=v6.0.1
2424

25-
- name: Set up JDK 8
25+
- name: Set up JDK
2626
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # tag=v5.1.0
2727
with:
28-
java-version: '8'
28+
java-version: '25'
2929
distribution: 'temurin'
3030
server-id: central
3131
server-username: MAVEN_CENTRAL_USERNAME

pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
</developers>
7373

7474
<properties>
75-
<maven.compiler.source>1.8</maven.compiler.source>
76-
<maven.compiler.target>1.8</maven.compiler.target>
75+
<maven.compiler.release>17</maven.compiler.release>
7776
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7877
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7978
<!-- Maven Plugin Versions -->
@@ -346,7 +345,7 @@
346345
<configuration>
347346
<rules>
348347
<requireJavaVersion>
349-
<version>1.8.0</version>
348+
<version>[25,26)</version>
350349
</requireJavaVersion>
351350
</rules>
352351
</configuration>

0 commit comments

Comments
 (0)