From 7f81d72b990b7d8d73e6ff88fb613008037c296b Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Wed, 23 Oct 2024 11:15:39 -0400 Subject: [PATCH] Add JDK-23 to the build matrix Signed-off-by: Andriy Redko --- .github/workflows/notifications-test-and-build-workflow.yml | 4 ++-- .github/workflows/security-notifications-test-workflow.yml | 2 +- notifications/build-tools/merged-coverage.gradle | 2 +- notifications/build.gradle | 2 +- notifications/core/build.gradle | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/notifications-test-and-build-workflow.yml b/.github/workflows/notifications-test-and-build-workflow.yml index 19bd98b4..aa31d570 100644 --- a/.github/workflows/notifications-test-and-build-workflow.yml +++ b/.github/workflows/notifications-test-and-build-workflow.yml @@ -22,7 +22,7 @@ jobs: # This setting says that all jobs should finish, even if one fails fail-fast: false matrix: - java: [21] + java: [21, 23] # Job name name: Build Notifications with JDK ${{ matrix.java }} on linux @@ -85,7 +85,7 @@ jobs: # This setting says that all jobs should finish, even if one fails fail-fast: false matrix: - java: [21] + java: [21, 23] os: [ windows-latest, macos-latest ] include: - os: windows-latest diff --git a/.github/workflows/security-notifications-test-workflow.yml b/.github/workflows/security-notifications-test-workflow.yml index 2db46e1e..90a640d0 100644 --- a/.github/workflows/security-notifications-test-workflow.yml +++ b/.github/workflows/security-notifications-test-workflow.yml @@ -16,7 +16,7 @@ jobs: # This setting says that all jobs should finish, even if one fails fail-fast: false matrix: - java: [21] + java: [21, 23] runs-on: ubuntu-latest diff --git a/notifications/build-tools/merged-coverage.gradle b/notifications/build-tools/merged-coverage.gradle index 601a3ff6..6df2690e 100644 --- a/notifications/build-tools/merged-coverage.gradle +++ b/notifications/build-tools/merged-coverage.gradle @@ -5,7 +5,7 @@ allprojects { plugins.withId('jacoco') { - jacoco.toolVersion = '0.8.11' + jacoco.toolVersion = '0.8.12' // For some reason this dependency isn't getting setup automatically by the jacoco plugin tasks.withType(JacocoReport) { dependsOn tasks.withType(Test) diff --git a/notifications/build.gradle b/notifications/build.gradle index 8c30d841..4583ce3c 100644 --- a/notifications/build.gradle +++ b/notifications/build.gradle @@ -40,7 +40,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0" - classpath "org.jacoco:org.jacoco.agent:0.8.11" + classpath "org.jacoco:org.jacoco.agent:0.8.12" } configurations { diff --git a/notifications/core/build.gradle b/notifications/core/build.gradle index 58288864..b742b065 100644 --- a/notifications/core/build.gradle +++ b/notifications/core/build.gradle @@ -149,7 +149,7 @@ dependencies { 'org.assertj:assertj-core:3.16.1', 'org.junit.jupiter:junit-jupiter-api:5.6.2', "org.junit.jupiter:junit-jupiter-params:5.6.2", - "org.easymock:easymock:5.2.0", + "org.easymock:easymock:5.4.0", "org.apache.logging.log4j:log4j-core:${versions.log4j}", 'org.mockito:mockito-junit-jupiter:3.10.0', 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0',