diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3a985aa91..661092573 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,25 +11,25 @@ jobs: fetch-depth: 0 - name: Gradle wrapper validation uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 20 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: 20 - distribution: 'temurin' + java-version: 21 + distribution: 'zulu' cache: 'gradle' - - run: echo "JDK20=$JAVA_HOME" >> $GITHUB_ENV + - run: echo "JDK21=$JAVA_HOME" >> $GITHUB_ENV - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 - distribution: 'temurin' + distribution: 'zulu' cache: 'gradle' - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV - name: Set up JDK 8 uses: actions/setup-java@v3 with: java-version: 8 - distribution: 'temurin' + distribution: 'zulu' cache: 'gradle' - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 904f0ebe9..b3348575b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,25 +14,25 @@ jobs: - uses: actions/checkout@v3 - name: Gradle wrapper validation uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 20 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: 20 - distribution: 'temurin' + java-version: 21 + distribution: 'zulu' cache: 'gradle' - - run: echo "JDK20=$JAVA_HOME" >> $GITHUB_ENV + - run: echo "JDK21=$JAVA_HOME" >> $GITHUB_ENV - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 - distribution: 'temurin' + distribution: 'zulu' cache: 'gradle' - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV - name: Set up JDK 8 uses: actions/setup-java@v3 with: java-version: 8 - distribution: 'temurin' + distribution: 'zulu' cache: 'gradle' - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV - name: Build candidate diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index bcb134360..6d4a40ca6 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -16,25 +16,25 @@ jobs: fetch-depth: 0 - name: Gradle wrapper validation uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK 20 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: 20 - distribution: 'temurin' + java-version: 21 + distribution: 'zulu' cache: 'gradle' - - run: echo "JDK20=$JAVA_HOME" >> $GITHUB_ENV + - run: echo "JDK21=$JAVA_HOME" >> $GITHUB_ENV - name: Set up JDK 17 uses: actions/setup-java@v3 with: java-version: 17 - distribution: 'temurin' + distribution: 'zulu' cache: 'gradle' - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV - name: Set up JDK 8 uses: actions/setup-java@v3 with: java-version: 8 - distribution: 'temurin' + distribution: 'zulu' cache: 'gradle' - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV - name: Build diff --git a/build.gradle b/build.gradle index 0939a375b..9730f77ca 100755 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ subprojects { useJUnitPlatform() } - [17, 20].each { additionalJDK -> + [17, 21].each { additionalJDK -> def additionalTestTask = tasks.register("testJDK$additionalJDK", Test) { description = "Runs tests against JDK $additionalJDK." group = 'verification'