Skip to content

Commit

Permalink
ci: update workflows to Java 21 (#3191)
Browse files Browse the repository at this point in the history
This also makes the Javadoc stylesheet compatible with
Java 21 and updates highlight.js from 11.5.1 to 11.9.0.

Co-authored-by: martinfrancois <f.martin@fastmail.com>
Co-authored-by: georgebax <georgebax@users.noreply.github.com>
Co-authored-by: grigala <grigalaa@gmail.com>
Co-authored-by: Stefano Cordio <stefano.cordio@gmail.com>
  • Loading branch information
4 people committed Dec 24, 2023
1 parent e91cb7b commit 5ea3760
Show file tree
Hide file tree
Showing 12 changed files with 1,300 additions and 489 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/binary-compatibility.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: '21'
cache: 'maven'

- name: Checkout `${{ github.base_ref }}` into subfolder
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: '21'
cache: 'maven'

- name: Compare with the latest release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cross-version.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [21, 22, 23]
java: [22, 23]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dependency-graph.yml
Expand Up @@ -17,8 +17,8 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: maven
distribution: 'zulu'
java-version: '21'
cache: 'maven'
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@v3
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: '21'
cache: 'maven'
- name: Test
run: ./mvnw $MAVEN_ARGS verify
Expand All @@ -38,8 +38,8 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
cache: maven
java-version: '21'
cache: 'maven'
- name: Generate Javadoc
run: ./mvnw $MAVEN_ARGS -DskipTests package javadoc:javadoc

Expand All @@ -57,7 +57,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: '21'
cache: 'maven'
- name: Test with Sonar
run: >
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pitest-receive-pr.yml
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: '21'
cache: 'maven'
- name: run pitest
# pitest has been bound to a profile called pitest for normal running
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pitest-updated-pr.yml
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: '21'
- name: Download artifact
uses: dawidd6/action-download-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 17
java-version: '21'
server-id: ossrh
server-username: OSSRH_USERNAME
server-password: OSSRH_TOKEN
Expand Down
2 changes: 1 addition & 1 deletion assertj-core/pom.xml
Expand Up @@ -453,7 +453,7 @@
<bottom><![CDATA[
Copyright &#169; {currentYear} {organizationName}. All rights reserved.
<link rel="stylesheet" href="./assertj-javadoc.css"">
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.5.1/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
<script>hljs.highlightAll();</script>
]]></bottom>
</configuration>
Expand Down
Expand Up @@ -53,7 +53,7 @@ protected AbstractStringAssert(String actual, Class<?> selfType) {
* assertThat(&quot;abc&quot;).isLessThan(&quot;bcd&quot;)
* .isLessThan(&quot;b&quot;)
* .isLessThan(&quot;abca&quot;)
* .usingComparator(CASE_INSENSITIVE)
* .usingComparator(String.CASE_INSENSITIVE_ORDER)
* .isLessThan(&quot;BCD&quot;);
*
* // assertions fail
Expand Down Expand Up @@ -84,7 +84,7 @@ public SELF isLessThan(String other) {
* .isLessThanOrEqualTo(&quot;abc&quot;)
* .isLessThanOrEqualTo(&quot;b&quot;)
* .isLessThanOrEqualTo(&quot;abca&quot;)
* .usingComparator(CASE_INSENSITIVE)
* .usingComparator(String.CASE_INSENSITIVE_ORDER)
* .isLessThanOrEqualTo(&quot;ABC&quot;);
*
* // assertions fail
Expand Down Expand Up @@ -113,7 +113,7 @@ public SELF isLessThanOrEqualTo(String other) {
* assertThat(&quot;xyz&quot;).isGreaterThan(&quot;abc&quot;)
* .isGreaterThan(&quot;xy&quot;)
* .isGreaterThan(&quot;ABC&quot;);
* assertThat(&quot;XYZ&quot;).usingComparator(CASE_INSENSITIVE)
* assertThat(&quot;XYZ&quot;).usingComparator(String.CASE_INSENSITIVE_ORDER)
* .isGreaterThan(&quot;abc&quot;);
*
* // assertions fail
Expand Down Expand Up @@ -144,7 +144,7 @@ public SELF isGreaterThan(String other) {
* .isGreaterThanOrEqualTo(&quot;xyz&quot;)
* .isGreaterThanOrEqualTo(&quot;xy&quot;)
* .isGreaterThanOrEqualTo(&quot;ABC&quot;);
* assertThat(&quot;XYZ&quot;).usingComparator(CASE_INSENSITIVE)
* assertThat(&quot;XYZ&quot;).usingComparator(String.CASE_INSENSITIVE_ORDER)
* .isGreaterThanOrEqualTo(&quot;abc&quot;);
*
* // assertions fail
Expand Down Expand Up @@ -175,7 +175,7 @@ public SELF isGreaterThanOrEqualTo(String other) {
* .isBetween(&quot;aa&quot;, &quot;ab&quot;)
* .isBetween(&quot;ab&quot;, &quot;ab&quot;)
* .isBetween(&quot;a&quot;, &quot;c&quot;)
* .usingComparator(CASE_INSENSITIVE)
* .usingComparator(String.CASE_INSENSITIVE_ORDER)
* .isBetween("AA", "AC");
*
* // assertions fail
Expand Down Expand Up @@ -206,7 +206,7 @@ public SELF isBetween(String startInclusive, String endInclusive) {
* <pre><code class='java'> // assertions succeed
* assertThat(&quot;ab&quot;).isStrictlyBetween(&quot;aa&quot;, &quot;ac&quot;)
* .isStrictlyBetween(&quot;a&quot;, &quot;c&quot;)
* .usingComparator(CASE_INSENSITIVE)
* .usingComparator(String.CASE_INSENSITIVE_ORDER)
* .isStrictlyBetween("AA", "AC");
*
* // assertions fail
Expand Down Expand Up @@ -314,7 +314,7 @@ public AbstractByteArrayAssert<?> decodedAsBase64() {
* <p>
* Examples :
* <pre><code class='java'> // assertions succeed
* assertThat(&quot;abc&quot;).usingComparator(CASE_INSENSITIVE)
* assertThat(&quot;abc&quot;).usingComparator(String.CASE_INSENSITIVE_ORDER)
* .isEqualTo(&quot;Abc&quot;)
* .isEqualTo(&quot;ABC&quot;);
*
Expand All @@ -339,7 +339,7 @@ public SELF usingComparator(Comparator<? super String> customComparator) {
* <p>
* Examples :
* <pre><code class='java'> // assertions succeed
* assertThat(&quot;abc&quot;).usingComparator(CASE_INSENSITIVE, &quot;String case insensitive comparator&quot;)
* assertThat(&quot;abc&quot;).usingComparator(String.CASE_INSENSITIVE_ORDER, &quot;String case insensitive comparator&quot;)
* .isEqualTo(&quot;Abc&quot;)
* .isEqualTo(&quot;ABC&quot;);
*
Expand Down

0 comments on commit 5ea3760

Please sign in to comment.