Skip to content

Commit

Permalink
Merge #3913 into 3.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
chemicL committed Nov 8, 2024
2 parents 4997127 + 5e01710 commit 2fd0f5e
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ jobs:
fetch-depth: 0 #needed by spotless
- name: Setup JDK 11
if: contains('main', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -70,18 +70,18 @@ jobs:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4
- name: Setup JDK 11
if: contains('main', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup Java 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@ jobs:
shell: bash
- name: Setup Java 9
if: contains('3.6.x', matrix.branch)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup Java 11
if: contains('main', matrix.branch)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup Java 21
if: contains('main 3.6.x', matrix.branch)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,18 @@ jobs:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4
- name: Setup JDK 11
if: contains('main', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Install asciidoctor-pdf / rouge
run: gem install asciidoctor-pdf rouge
- name: Setup java 21 for antora
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4
with:
distribution: 'temurin'
java-version: '21'
Expand All @@ -103,18 +103,18 @@ jobs:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4
- name: Setup JDK 11
if: contains('main', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -141,18 +141,18 @@ jobs:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4
- name: Setup JDK 11
if: contains('main', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -181,18 +181,18 @@ jobs:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # tag=v4
- name: Setup JDK 11
if: contains('main', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup JDK 21
if: contains('main 3.6.x', github.base_ref)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup JDK 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ jobs:
shell: bash
- name: Setup Java 9
if: contains('3.6.x', matrix.branch)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup Java 11
if: contains('main', matrix.branch)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 11
- name: Setup Java 21
if: contains('main 3.6.x', matrix.branch)
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 21
- name: Setup Java 8
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # tag=v3
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down

0 comments on commit 2fd0f5e

Please sign in to comment.